Merge remote-tracking branch 'origin/master'

Models/HRSV/HRSV.mtl

@@ -0,0 +1,28 @@
+newmtl PM3D_HRSV_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 PM3D_HRSV_1_defaultMat2
+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 PM3D_HRSV_2_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_HRSV_dDo02_d.png
+bump PM3D_HRSV_dDo02_n.png -bm 1
+Ni 1.00
+Ks 0.00 0.00 0.00
+map_Ks PM3D_HRSV_dDo02_s.png

Models/HRSV/HRSVTemp.mtl

@@ -1,6 +0,0 @@
-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/House/houseGarage.mtl

@@ -0,0 +1,15 @@
+newmtl blinn1SG
+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 garageTextureTest2.png
+Ni 1.00
+Ks 0.50 0.50 0.50
+newmtl initialShadingGroup
+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 houseTextureTest.png
+Ni 1.00

Models/House/houseGarage.obj

@@ -0,0 +1,327 @@
+# This file uses centimeters as units for non-parametric coordinates.
+
+mtllib houseGarage.mtl
+g default
+v 3.909766 0.019913 3.693869
+v 7.353560 0.019913 3.693869
+v 3.909766 2.724165 3.693869
+v 7.353560 2.724165 3.693869
+v 3.909766 2.724165 0.117769
+v 7.353560 2.724165 0.117769
+v 3.909766 0.019913 0.117769
+v 7.353560 0.019913 0.117769
+v 7.353560 2.371766 3.693869
+v 3.909766 2.371766 3.693869
+v 3.909766 2.371766 0.117769
+v 7.353560 2.371766 0.117769
+v 7.353560 2.371766 3.872193
+v 3.909766 2.371766 3.872193
+v 7.353560 2.724165 3.872193
+v 3.909766 2.724165 3.872193
+v 3.909766 2.724165 -0.421700
+v 7.353560 2.724165 -0.421700
+v 7.353560 2.371766 -0.421700
+v 3.909766 2.371766 -0.421700
+v 7.618584 2.371766 0.117769
+v 7.618584 2.371766 3.693869
+v 7.618584 2.724165 0.117769
+v 7.618584 2.724165 3.693869
+v 7.618584 2.724165 3.872193
+v 7.618584 2.371766 3.872193
+v 7.618584 2.371766 -0.421700
+v 7.618584 2.724165 -0.421700
+v 4.161769 2.119242 0.117769
+v 7.101557 2.119242 0.117769
+v 7.101557 0.053076 0.117769
+v 4.161769 0.053076 0.117769
+v 4.161769 2.119242 0.343603
+v 7.101557 2.119242 0.343603
+v 7.101557 0.053076 0.343603
+v 4.161769 0.053076 0.343603
+vt 0.300794 0.656294
+vt 0.300794 0.366782
+vt 0.498509 0.366782
+vt 0.498509 0.656294
+vt 0.001992 0.016803
+vt 0.291505 0.016803
+vt 0.291505 0.317438
+vt 0.001992 0.317438
+vt 0.001992 0.001811
+vt 0.291505 0.001811
+vt 0.313785 0.016803
+vt 0.313785 0.317438
+vt 0.291505 0.362790
+vt 0.001992 0.362790
+vt 0.313785 0.001811
+vt 0.313785 0.362790
+vt 0.631628 0.922149
+vt 0.384486 0.922197
+vt 0.384453 0.748499
+vt 0.631595 0.748451
+vt 0.708495 0.366781
+vt 0.998008 0.366781
+vt 0.998008 0.667417
+vt 0.708495 0.667417
+vt 0.504645 0.667417
+vt 0.504645 0.366781
+vt 0.702360 0.366781
+vt 0.702360 0.667417
+vt 0.358845 0.317438
+vt 0.358845 0.016803
+vt 0.556561 0.016803
+vt 0.556561 0.317438
+vt 0.586186 0.016803
+vt 0.586186 0.317438
+vt 0.556561 0.001811
+vt 0.586186 0.001811
+vt 0.586186 0.362790
+vt 0.556561 0.362790
+vt 0.912348 0.313604
+vt 0.912348 0.024091
+vt 0.941973 0.024091
+vt 0.941973 0.313604
+vt 0.912348 0.001811
+vt 0.941973 0.001811
+vt 0.949378 0.313604
+vt 0.949378 0.024091
+vt 0.979003 0.024091
+vt 0.979003 0.313604
+vt 0.949378 0.001811
+vt 0.979003 0.001811
+vt 0.321815 0.347799
+vt 0.321815 0.047163
+vt 0.351441 0.047163
+vt 0.351441 0.347799
+vt 0.321815 0.001811
+vt 0.351441 0.001811
+vt 0.351441 0.362790
+vt 0.321815 0.362790
+vt 0.592719 0.347799
+vt 0.882232 0.347799
+vt 0.882232 0.362790
+vt 0.592719 0.362790
+vt 0.904512 0.347799
+vt 0.904512 0.362790
+vt 0.882232 0.047163
+vt 0.904512 0.047163
+vt 0.882232 0.001811
+vt 0.904512 0.001811
+vt 0.592719 0.047163
+vt 0.592719 0.001811
+vt 0.096943 0.656294
+vt 0.096943 0.366782
+vt 0.118172 0.387967
+vt 0.118172 0.635109
+vt 0.294659 0.366782
+vt 0.291871 0.387967
+vt 0.294659 0.656294
+vt 0.291871 0.635109
+vt 0.071822 0.613923
+vt 0.071822 0.366781
+vt 0.090808 0.366781
+vt 0.090808 0.613923
+vt 0.391383 0.593074
+vt 0.391383 0.419376
+vt 0.410368 0.419376
+vt 0.410368 0.593074
+vt 0.065687 0.366781
+vt 0.065687 0.613923
+vt 0.046702 0.613923
+vt 0.046702 0.366781
+vt 0.435704 0.419376
+vt 0.435704 0.593074
+vt 0.416719 0.593074
+vt 0.416719 0.419376
+vn 0.000000 0.000000 1.000000
+vn 0.000000 0.000000 1.000000
+vn 0.000000 0.000000 1.000000
+vn 0.000000 0.000000 1.000000
+vn 0.000000 1.000000 0.000000
+vn 0.000000 1.000000 0.000000
+vn 0.000000 1.000000 0.000000
+vn 0.000000 1.000000 0.000000
+vn 0.000000 0.000000 -1.000000
+vn 0.000000 0.000000 -1.000000
+vn 0.000000 0.000000 -1.000000
+vn 0.000000 0.000000 -1.000000
+vn 0.000000 -1.000000 0.000000
+vn 0.000000 -1.000000 0.000000
+vn 0.000000 -1.000000 0.000000
+vn 0.000000 -1.000000 0.000000
+vn 1.000000 0.000000 0.000000
+vn 1.000000 0.000000 0.000000
+vn 1.000000 0.000000 0.000000
+vn 1.000000 0.000000 0.000000
+vn -1.000000 0.000000 0.000000
+vn -1.000000 0.000000 0.000000
+vn -1.000000 0.000000 0.000000
+vn -1.000000 0.000000 0.000000
+vn 0.000000 0.000000 1.000000
+vn 0.000000 0.000000 1.000000
+vn 0.000000 0.000000 1.000000
+vn 0.000000 0.000000 1.000000
+vn -1.000000 0.000000 0.000000
+vn -1.000000 0.000000 0.000000
+vn 0.000000 0.000000 -1.000000
+vn 0.000000 0.000000 -1.000000
+vn 0.000000 0.000000 -1.000000
+vn 0.000000 0.000000 -1.000000
+vn 1.000000 0.000000 0.000000
+vn 1.000000 0.000000 0.000000
+vn 1.000000 0.000000 0.000000
+vn 1.000000 0.000000 0.000000
+vn 0.000000 -1.000000 0.000000
+vn 0.000000 -1.000000 0.000000
+vn 0.000000 -1.000000 0.000000
+vn 0.000000 -1.000000 0.000000
+vn 1.000000 0.000000 0.000000
+vn 1.000000 0.000000 0.000000
+vn 0.000000 1.000000 0.000000
+vn 0.000000 1.000000 0.000000
+vn -1.000000 0.000000 0.000000
+vn -1.000000 0.000000 0.000000
+vn 0.000000 1.000000 0.000000
+vn 0.000000 1.000000 0.000000
+vn 1.000000 0.000000 0.000000
+vn 1.000000 0.000000 0.000000
+vn 0.000000 -1.000000 0.000000
+vn 0.000000 -1.000000 0.000000
+vn 0.000000 -1.000000 0.000000
+vn 0.000000 -1.000000 0.000000
+vn -1.000000 0.000000 0.000000
+vn -1.000000 0.000000 0.000000
+vn 0.000000 -1.000000 0.000000
+vn 0.000000 -1.000000 0.000000
+vn 0.000000 1.000000 0.000000
+vn 0.000000 1.000000 0.000000
+vn 0.000000 1.000000 0.000000
+vn 0.000000 0.000000 1.000000
+vn 0.000000 0.000000 1.000000
+vn 0.000000 -1.000000 0.000000
+vn 0.000000 -1.000000 0.000000
+vn 0.000000 0.000000 -1.000000
+vn 0.000000 0.000000 -1.000000
+vn 0.000000 1.000000 0.000000
+vn 0.000000 0.000000 -1.000000
+vn 0.000000 0.000000 -1.000000
+vn -0.000000 0.000000 -1.000000
+vn 0.000000 0.000000 -1.000000
+vn 0.000002 0.000000 -1.000000
+vn 0.000001 0.000000 -1.000000
+vn -0.000001 0.000000 -1.000000
+vn -0.000001 0.000000 -1.000000
+vn 0.000000 -1.000000 0.000000
+vn 0.000000 -1.000000 0.000000
+vn 0.000000 -1.000000 0.000000
+vn 0.000000 -1.000000 0.000000
+vn -1.000000 0.000000 0.000000
+vn -1.000000 0.000000 0.000000
+vn -1.000000 0.000000 0.000000
+vn -1.000000 0.000000 0.000000
+vn 0.000000 1.000000 0.000000
+vn 0.000000 1.000000 0.000000
+vn 0.000000 1.000000 0.000000
+vn 0.000000 1.000000 0.000000
+vn 1.000000 0.000000 0.000000
+vn 1.000000 0.000000 0.000000
+vn 1.000000 0.000000 0.000000
+vn 1.000000 0.000000 0.000000
+s 1
+g pCube2
+usemtl blinn1SG
+f 1/1/1 2/2/2 10/4/3
+f 10/4/3 2/2/2 9/3/4
+s 2
+f 3/5/5 4/6/6 5/8/7
+f 5/8/7 4/6/6 6/7/8
+s 3
+f 33/17/9 34/18/10 36/20/11
+f 36/20/11 34/18/10 35/19/12
+s 4
+f 7/21/13 8/22/14 1/24/15
+f 1/24/15 8/22/14 2/23/16
+s 5
+f 2/25/17 8/26/18 9/28/19
+f 9/28/19 8/26/18 12/27/20
+s 6
+f 7/29/21 1/30/22 11/32/23
+f 11/32/23 1/30/22 10/31/24
+s 7
+f 14/39/25 13/40/26 16/42/27
+f 16/42/27 13/40/26 15/41/28
+s 6
+f 11/32/23 10/31/24 5/34/29
+f 5/34/29 10/31/24 3/33/30
+s 8
+f 17/45/31 18/46/32 20/48/33
+f 20/48/33 18/46/32 19/47/34
+s 9
+f 22/51/35 21/52/36 24/54/37
+f 24/54/37 21/52/36 23/53/38
+s 10
+f 10/59/39 9/60/40 14/62/41
+f 14/62/41 9/60/40 13/61/42
+s 9
+f 22/51/35 24/54/37 26/58/43
+f 26/58/43 24/54/37 25/57/44
+s 2
+f 4/6/6 3/5/5 15/10/45
+f 15/10/45 3/5/5 16/9/46
+s 6
+f 3/33/30 10/31/24 16/36/47
+f 16/36/47 10/31/24 14/35/48
+s 2
+f 5/8/7 6/7/8 17/14/49
+f 17/14/49 6/7/8 18/13/50
+s 9
+f 23/53/38 21/52/36 28/56/51
+f 28/56/51 21/52/36 27/55/52
+s 10
+f 12/65/53 11/69/54 19/67/55
+f 19/67/55 11/69/54 20/70/56
+s 6
+f 11/32/23 5/34/29 20/38/57
+f 20/38/57 5/34/29 17/37/58
+s 10
+f 9/60/40 12/65/53 22/63/59
+f 22/63/59 12/65/53 21/66/60
+s 2
+f 6/7/8 4/6/6 23/12/61
+f 23/12/61 4/6/6 24/11/62
+f 4/6/6 15/10/45 24/11/62
+f 24/11/62 15/10/45 25/15/63
+s 7
+f 15/41/28 13/40/26 25/44/64
+f 25/44/64 13/40/26 26/43/65
+s 10
+f 13/61/42 9/60/40 26/64/66
+f 26/64/66 9/60/40 22/63/59
+f 12/65/53 19/67/55 21/66/60
+f 21/66/60 19/67/55 27/68/67
+s 8
+f 19/47/34 18/46/32 27/50/68
+f 27/50/68 18/46/32 28/49/69
+s 2
+f 18/13/50 6/7/8 28/16/70
+f 28/16/70 6/7/8 23/12/61
+s 13
+f 11/71/71 12/72/72 29/74/73
+f 29/74/73 12/72/72 30/73/74
+f 12/72/72 8/75/75 30/73/74
+f 30/73/74 8/75/75 31/76/76
+f 8/75/75 7/77/77 31/76/76
+f 31/76/76 7/77/77 32/78/78
+f 11/71/71 29/74/73 7/77/77
+f 7/77/77 29/74/73 32/78/78
+s 14
+f 29/79/79 30/80/80 33/82/81
+f 33/82/81 30/80/80 34/81/82
+s 15
+f 30/83/83 31/84/84 34/86/85
+f 34/86/85 31/84/84 35/85/86
+s 16
+f 31/87/87 32/88/88 35/90/89
+f 35/90/89 32/88/88 36/89/90
+s 17
+f 32/91/91 29/92/92 36/94/93
+f 36/94/93 29/92/92 33/93/94

Models/House/houseMain.mtl

@@ -0,0 +1,15 @@
+newmtl blinn1SG
+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 garageTextureTest.png
+Ni 1.00
+Ks 0.50 0.50 0.50
+newmtl initialShadingGroup
+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 houseTextureTest.png
+Ni 1.00

Models/SpawnRamp/LeftHatch/LeftHatch.mtl

@@ -1,26 +1,7 @@
-newmtl Suspension_blinn1SG2
-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 base_dDo_d.png
-Ni 1.00
-Ks 0.00 0.00 0.00
-map_Ks base_dDo_s.png
-Ns 0.06
-newmtl chassi_blinn1SG
-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 diffuseMap.png
-Ni 1.00
-Ks 0.00 0.00 0.00
-map_Ks specularMap.png
-Ns 0.06
-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
+newmtl LeftHatch_initialShadingGroup
+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 hatch.png
+Ni 1.00

Models/SpawnRamp/RightHatch/RightHatch.mtl

@@ -1,26 +1,7 @@
-newmtl Suspension_blinn1SG2
-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 base_dDo_d.png
-Ni 1.00
-Ks 0.00 0.00 0.00
-map_Ks base_dDo_s.png
-Ns 0.06
-newmtl chassi_blinn1SG
-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 diffuseMap.png
-Ni 1.00
-Ks 0.00 0.00 0.00
-map_Ks specularMap.png
-Ns 0.06
-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
+newmtl LeftHatch_initialShadingGroup
+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 hatch.png
+Ni 1.00

Models/Tank/tankBarrel.mtl

@@ -1,20 +1,12 @@
-newmtl PM3D_tankBarrel_2_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
+# Blender MTL File: 'None'
+# Material Count: 1
+
 newmtl blinn2SG
-illum 4
-Kd 0.00 0.00 0.00
-Ka 0.00 0.00 0.00
-Tf 1.00 1.00 1.00
+Ns 96.078431
+Ka 0.000000 0.000000 0.000000
+Kd 0.000000 0.000000 0.000000
+Ks 0.250000 0.250000 0.250000
+Ni 1.000000
+d 0.000000
+illum 2
 map_Kd PM3D_tankBarrel_dDo_d.png
-Ni 1.00
-Ks 0.50 0.50 0.50
-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

Models/Tank/tankBody.mtl

@@ -1,16 +1,13 @@
-newmtl blinn1SG
-illum 4
-Kd 0.00 0.00 0.00
-Ka 0.00 0.00 0.00
-Tf 1.00 1.00 1.00
+# Blender MTL File: 'None'
+# Material Count: 1
+
+newmtl blinn1SG.001
+Ns 96.078431
+Ka 0.000000 0.000000 0.000000
+Kd 0.000000 0.000000 0.000000
+Ks 0.000000 0.000000 0.000000
+Ni 1.000000
+d 0.000000
+illum 2
 map_Kd CL_PM3D_tankBodyyyy_dDo_d.png
-bump CL_PM3D_tankBodyyyy_dDo_n.png -bm 1
-Ni 1.00
-Ks 0.00 0.00 0.00
-map_Ks CL_PM3D_tankBodyyyy_dDo_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
+map_Bump CL_PM3D_tankBodyyyy_dDo_n.png -bm 1

Models/Tank/tankTop.mtl

@@ -1,16 +1,13 @@
+# Blender MTL File: 'None'
+# Material Count: 1
+
 newmtl blinn1SG
-illum 4
-Kd 0.00 0.00 0.00
-Ka 0.00 0.00 0.00
-Tf 1.00 1.00 1.00
+Ns 96.078431
+Ka 0.000000 0.000000 0.000000
+Kd 0.000000 0.000000 0.000000
+Ks 0.000000 0.000000 0.000000
+Ni 1.000000
+d 0.000000
+illum 2
 map_Kd PM3D_tankTOP_dDo02_d.png
-bump PM3D_tankTOP_dDo02_n.png -bm 1
-Ni 1.00
-Ks 0.00 0.00 0.00
-map_Ks PM3D_tankTOP_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
+map_Bump PM3D_tankTOP_dDo02_n.png -bm 1

Models/Tank/tankWheel.mtl

@@ -1,25 +1,13 @@
-newmtl PM3D_tankBarrel_2_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 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
+newmtl blinn1SG
 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
+map_Kd PM3D_tankWheel_dDo03_d.png
+bump PM3D_tankWheel_dDo03_n.png -bm 1
 Ni 1.00
 Ks 0.00 0.00 0.00
-map_Ks PM3D_tankWheel_dDo02_s.png
+map_Ks PM3D_tankWheel_dDo03_s.png
 newmtl defaultMat
 illum 4
 Kd 0.80 0.80 0.80

Models/Tank/tankWheel.obj

@@ -3100,7 +3100,7 @@ vn -0.219131 -0.971978 0.085087
 vn -0.219131 -0.971978 0.085087
 s off
 g polySurface1
-usemtl blinn3SG
+usemtl blinn1SG
 f 5/1/1 1/2/2 4/3/3
 f 4/4/4 1/5/5 3/6/6
 f 14/7/7 11/8/8 16/9/9