Merge branch 'master' of git://github.com/assimp/assimp

2012-12-21 16:24:05 +01:00
parent c1cd88e9de 84939d5aec
commit bae9db2f03
179 changed files with 20711 additions and 7693 deletions
--- a/test/models/OBJ/regr_3429812.mtl
+++ b/test/models/OBJ/regr_3429812.mtl
@@ -0,0 +1,8 @@
+newmtl Trim
+d 1
+Ns 0.75
+Ni 0
+Ka 0 0 0
+Kd 1 1 1
+Ks 0.85098 0.85098 0.85098
+Km 0.05
--- a/test/models/OBJ/regr_3429812.obj
+++ b/test/models/OBJ/regr_3429812.obj
@@ -0,0 +1,12 @@
+mtllib regr_3429812.mtl
+v 0.0498759 0.964456 0.0949991
+v 0.042335 0.96222 0.0980526
+v 0.0418548 0.961535 0.096869
+v 0.049267 0.963762 0.0939126
+usemtl Trim
+g rectangle
+f 4 3 2 1
+g triangle1
+f 4 3 2
+g triangle2
+f 4 2 1