Merge branch 'dev'

JujuAdams · May 21, 2021 · deaf3fc · deaf3fc
2 parents 263ac7a + 54870b6
commit deaf3fc
Show file tree

Hide file tree

Showing 67 changed files with 1,788 additions and 520 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-<h1 align="center">dotobj 5.0.0</h1>
+<h1 align="center">dotobj 5.1.0</h1>
 
 <p align="center">.obj/.mtl loader, written in native GML, for GameMaker Studio 2.3 by <b>@jujuadams</b></p>
 

diff --git a/datafiles/planet.mtl b/datafiles/planet.mtl
@@ -0,0 +1,16 @@
+# 3ds Max Wavefront OBJ Exporter v0.97b - (c)2007 guruware
+# File Created: 20.05.2021 23:08:07
+
+newmtl 01___Default
+	Ns 10.0000
+	Ni 1.5000
+	d 1.0000
+	Tr 0.0000
+	Tf 1.0000 1.0000 1.0000 
+	illum 2
+	Ka 0.5882 0.5882 0.5882
+	Kd 0.5882 0.5882 0.5882
+	Ks 0.0000 0.0000 0.0000
+	Ke 0.0000 0.0000 0.0000
+	map_Ka textures\planet_tex_arid.png
+	map_Kd textures\planet_tex_arid.png