Merge branch 'master' of shard.imon.nu:Assets

Models/Tank/tankBarrel.mtl

@@ -1,27 +1,20 @@
-newmtl blinn1SG
+newmtl PM3D_tankBarrel_2_defaultMat
 illum 4
-Kd 0.50 0.50 0.50
+Kd 0.80 0.80 0.80
-Ka 0.00 0.00 0.00
+Ka 0.40 0.40 0.40
 Tf 1.00 1.00 1.00
 Ni 1.00
-Ks 0.50 0.50 0.50
 newmtl blinn2SG
 illum 4
-Kd 0.50 0.50 0.50
+Kd 0.00 0.00 0.00
 Ka 0.00 0.00 0.00
 Tf 1.00 1.00 1.00
+map_Kd PM3D_tankBarrel_dDo_d.png
 Ni 1.00
 Ks 0.50 0.50 0.50
-newmtl blinn3SG
+newmtl defaultMat
 illum 4
-Kd 0.50 0.50 0.50
+Kd 0.80 0.80 0.80
-Ka 0.00 0.00 0.00
+Ka 0.40 0.40 0.40
-Tf 1.00 1.00 1.00
-Ni 1.00
-Ks 0.50 0.50 0.50
-newmtl initialShadingGroup
-illum 4
-Kd 0.50 0.50 0.50
-Ka 0.00 0.00 0.00
 Tf 1.00 1.00 1.00
 Ni 1.00

Models/Tank/tankBody.mtl

@@ -1,13 +1,16 @@
 newmtl blinn1SG
 illum 4
-Kd 0.50 0.50 0.50
+Kd 0.00 0.00 0.00
 Ka 0.00 0.00 0.00
 Tf 1.00 1.00 1.00
+map_Kd CL_PM3D_tankBodyyyy_dDo_d.png
+bump CL_PM3D_tankBodyyyy_dDo_n.png -bm 1
 Ni 1.00
-Ks 0.50 0.50 0.50
+Ks 0.00 0.00 0.00
-newmtl initialShadingGroup
+map_Ks CL_PM3D_tankBodyyyy_dDo_s.png
+newmtl defaultMat
 illum 4
-Kd 0.50 0.50 0.50
+Kd 0.80 0.80 0.80
-Ka 0.00 0.00 0.00
+Ka 0.40 0.40 0.40
 Tf 1.00 1.00 1.00
 Ni 1.00

Models/Tank/tankTop.mtl

@@ -1,20 +1,16 @@
 newmtl blinn1SG
 illum 4
-Kd 0.50 0.50 0.50
+Kd 0.00 0.00 0.00
 Ka 0.00 0.00 0.00
 Tf 1.00 1.00 1.00
+map_Kd PM3D_tankTOP_dDo02_d.png
+bump PM3D_tankTOP_dDo02_n.png -bm 1
 Ni 1.00
-Ks 0.50 0.50 0.50
+Ks 0.00 0.00 0.00
-newmtl blinn2SG
+map_Ks PM3D_tankTOP_dDo02_s.png
+newmtl defaultMat
 illum 4
-Kd 0.50 0.50 0.50
+Kd 0.80 0.80 0.80
-Ka 0.00 0.00 0.00
+Ka 0.40 0.40 0.40
-Tf 1.00 1.00 1.00
-Ni 1.00
-Ks 0.50 0.50 0.50
-newmtl initialShadingGroup
-illum 4
-Kd 0.50 0.50 0.50
-Ka 0.00 0.00 0.00
 Tf 1.00 1.00 1.00
 Ni 1.00

Models/Tank/tankWheel.mtl

@@ -1,7 +1,28 @@
-newmtl blinn1SG
+newmtl PM3D_tankBarrel_2_defaultMat
 illum 4
-Kd 0.50 0.50 0.50
+Kd 0.80 0.80 0.80
-Ka 0.00 0.00 0.00
+Ka 0.40 0.40 0.40
+Tf 1.00 1.00 1.00
+Ni 1.00
+newmtl PM3D_tankWheel_1_defaultMat
+illum 4
+Kd 0.80 0.80 0.80
+Ka 0.40 0.40 0.40
+Tf 1.00 1.00 1.00
+Ni 1.00
+newmtl blinn3SG
+illum 4
+Kd 0.00 0.00 0.00
+Ka 0.00 0.00 0.00
+Tf 1.00 1.00 1.00
+map_Kd PM3D_tankWheel_dDo02_d.png
+bump PM3D_tankWheel_dDo02_n.png -bm 1
+Ni 1.00
+Ks 0.00 0.00 0.00
+map_Ks PM3D_tankWheel_dDo02_s.png
+newmtl defaultMat
+illum 4
+Kd 0.80 0.80 0.80
+Ka 0.40 0.40 0.40
 Tf 1.00 1.00 1.00
 Ni 1.00
-Ks 0.50 0.50 0.50