model/obj, model/mtl: new types

https://www.iana.org/assignments/media-types/model/obj
https://www.iana.org/assignments/media-types/model/mtl
https://gitlab.freedesktop.org/xdg/shared-mime-info/-/issues/162

4 files changed, 105 insertions, 0 deletions

diff --git a/data/freedesktop.org.xml.in b/data/freedesktop.org.xml.in
index 48605c2b..67e64be2 100644
--- a/data/freedesktop.org.xml.in
+++ b/data/freedesktop.org.xml.in
@@ -5883,6 +5883,19 @@ command to generate the output files.
     <glob pattern="*.vrml"/>
     <glob pattern="*.wrl"/>
   </mime-type>
+  <mime-type type="model/obj">
+    <comment>OBJ 3D model</comment>
+    <sub-class-of type="text/plain"/>
+    <glob pattern="*.obj"/>
+  </mime-type>
+  <mime-type type="model/mtl">
+    <comment>OBJ 3D model material library</comment>
+    <sub-class-of type="text/plain"/>
+    <magic priority="50">
+      <match type="string" value="newmtl " offset="0:64"/>
+    </magic>
+    <glob pattern="*.mtl"/>
+  </mime-type>
   <mime-type type="multipart/alternative">
     <comment>message in several formats</comment>
   </mime-type>
diff --git a/tests/mime-detection/list b/tests/mime-detection/list
index 5c6f3bff..3cbfe16c 100644
--- a/tests/mime-detection/list
+++ b/tests/mime-detection/list
@@ -851,6 +851,9 @@ binary.stl model/stl oxo
 ascii.stl model/stl
 test.gcode text/x.gcode ox
 20mm_Box.gx text/x-gcode-gx
+# Converted from binary.stl with Blender
+test.obj model/obj xxx
+test.mtl model/mtl
 
 # Virtualization disk images
 disk.qcow2 application/x-qemu-disk
diff --git a/tests/mime-detection/test.mtl b/tests/mime-detection/test.mtl
new file mode 100644
index 00000000..ddc2d9ba
--- /dev/null
+++ b/tests/mime-detection/test.mtl
@@ -0,0 +1,20 @@
+# Blender MTL File: 'None'
+# Material Count: 2
+
+newmtl Material
+Ns 323.999994
+Ka 1.000000 1.000000 1.000000
+Kd 0.800000 0.800000 0.800000
+Ks 0.500000 0.500000 0.500000
+Ke 0.000000 0.000000 0.000000
+Ni 1.450000
+d 1.000000
+illum 2
+
+newmtl None
+Ns 500
+Ka 0.8 0.8 0.8
+Kd 0.8 0.8 0.8
+Ks 0.8 0.8 0.8
+d 1
+illum 2
diff --git a/tests/mime-detection/test.obj b/tests/mime-detection/test.obj
new file mode 100644
index 00000000..2e6cebd9
--- /dev/null
+++ b/tests/mime-detection/test.obj
@@ -0,0 +1,69 @@
+# Blender v2.82 (sub 7) OBJ File: ''
+# www.blender.org
+mtllib test.mtl
+o Cube
+v 1.000000 1.000000 -1.000000
+v 1.000000 -1.000000 -1.000000
+v 1.000000 1.000000 1.000000
+v 1.000000 -1.000000 1.000000
+v -1.000000 1.000000 -1.000000
+v -1.000000 -1.000000 -1.000000
+v -1.000000 1.000000 1.000000
+v -1.000000 -1.000000 1.000000
+vt 0.625000 0.500000
+vt 0.875000 0.500000
+vt 0.875000 0.750000
+vt 0.625000 0.750000
+vt 0.375000 0.750000
+vt 0.625000 1.000000
+vt 0.375000 1.000000
+vt 0.375000 0.000000
+vt 0.625000 0.000000
+vt 0.625000 0.250000
+vt 0.375000 0.250000
+vt 0.125000 0.500000
+vt 0.375000 0.500000
+vt 0.125000 0.750000
+vn 0.0000 1.0000 0.0000
+vn 0.0000 0.0000 1.0000
+vn -1.0000 0.0000 0.0000
+vn 0.0000 -1.0000 0.0000
+vn 1.0000 0.0000 0.0000
+vn 0.0000 0.0000 -1.0000
+usemtl Material
+s off
+f 1/1/1 5/2/1 7/3/1 3/4/1
+f 4/5/2 3/4/2 7/6/2 8/7/2
+f 8/8/3 7/9/3 5/10/3 6/11/3
+f 6/12/4 2/13/4 4/5/4 8/14/4
+f 2/13/5 1/1/5 3/4/5 4/5/5
+f 6/11/6 5/10/6 1/1/6 2/13/6
+o Binary
+v -1.968504 1.968504 -1.968504
+v -1.968504 1.968504 1.968504
+v 1.968504 1.968504 1.968504
+v 1.968504 1.968504 -1.968504
+v 1.968504 -1.968504 -1.968504
+v 1.968504 -1.968504 1.968504
+v -1.968504 -1.968504 1.968504
+v -1.968504 -1.968504 -1.968504
+vn 0.0000 1.0000 0.0000
+vn 0.0000 -1.0000 0.0000
+vn -1.0000 0.0000 0.0000
+vn 1.0000 0.0000 0.0000
+vn 0.0000 0.0000 1.0000
+vn 0.0000 0.0000 -1.0000
+usemtl None
+s off
+f 9//7 10//7 11//7
+f 11//7 12//7 9//7
+f 13//8 14//8 15//8
+f 15//8 16//8 13//8
+f 16//9 15//9 10//9
+f 10//9 9//9 16//9
+f 12//10 11//10 14//10
+f 14//10 13//10 12//10
+f 10//11 15//11 14//11
+f 14//11 11//11 10//11
+f 16//12 9//12 12//12
+f 12//12 13//12 16//12