Merge branch 'deferred_rendering'

Models/Jeep/Chassi/chassi.mtl

@@ -46,3 +46,4 @@ map_Kd diffuseMap.png
 Ni 1.00
 Ks 0.00 0.00 0.00
 map_Ks specularMap.png
+bump normalMap.png -bm 1

Models/Placeholders/PhysicsTest/Cube2.mtl

@@ -9,4 +9,4 @@ Ks 0.500000 0.500000 0.500000
 Ni 1.000000
 d 1.000000
 illum 2
-map_Kd planetexture.png
+map_Kd Asphalt.png

Models/Tree/Collision/Collision.obj

@@ -1,198 +1,93 @@
-# This file uses centimeters as units for non-parametric coordinates.
+# Blender v2.69 (sub 0) OBJ File: ''
-
+# www.blender.org
-mtllib Collision.mtl
+o Collision_pCylinder1.001
-g default
+v -0.215506 -2.500579 -0.148097
-v 0.072548 -0.045474 -0.239626
+v -0.081231 -1.003608 -0.241622
-v -0.215506 -0.045474 -0.148097
+v 0.072548 -2.500579 -0.239626
-v -0.215506 -0.045474 0.148097
+v 0.115231 -1.003608 -0.305457
-v 0.072548 -0.045474 0.239626
+v -0.081231 -1.003608 -0.035051
-v 0.250576 -0.045474 0.000000
+v -0.215506 -2.500579 0.148097
-v 0.115231 1.451497 -0.305457
+v 0.072548 -2.500579 0.239626
-v -0.081231 1.451497 -0.241622
+v 0.115231 -1.003608 0.028783
-v -0.081231 1.451497 -0.035051
+v 0.250576 -2.500579 -0.000000
-v 0.115231 1.451497 0.028783
+v 0.236651 -1.003608 -0.138337
-v 0.236651 1.451497 -0.138337
+v 0.246673 0.171135 -1.049801
-v 0.246673 2.626240 -1.049801
+v -0.936363 0.171135 -0.665410
-v -0.936363 2.626240 -0.665410
+v -0.936363 0.171135 0.578508
-v -0.936363 2.626240 0.578508
+v 0.246673 0.171135 0.962900
-v 0.246673 2.626240 0.962900
+v 0.977828 0.171135 -0.043451
-v 0.977828 2.626240 -0.043451
+v 0.389910 2.366250 -1.687788
-v 0.389910 4.821355 -1.687790
+v -1.543125 2.366250 -1.059706
-v -1.543125 4.821355 -1.059708
+v -1.543125 2.366250 0.972808
-v -1.543125 4.821355 0.972806
+v 0.389910 2.366248 1.600890
-v 0.389910 4.821355 1.600888
+v 1.584591 2.366250 -0.043449
-v 1.584591 4.821355 -0.043451
+v -0.144368 3.883935 -0.043449
-v -0.144368 6.339040 -0.043451
+vn -0.302671 -0.032362 -0.952546
-vt 0.425000 0.312500
+vn -0.308851 -0.032995 -0.950538
-vt 0.425000 0.437813
+vn -0.996001 0.089339 0.000000
-vt 0.375000 0.312500
+vn -0.299748 0.142301 0.943346
-vt 0.375000 0.437813
+vn -0.305914 0.141331 0.941511
-vt 0.475000 0.312500
+vn 0.801217 0.060995 0.595257
-vt 0.475000 0.437813
+vn 0.807474 0.061726 0.586665
-vt 0.525000 0.312500
+vn 0.801802 -0.047590 -0.595692
-vt 0.525000 0.437813
+vn 0.808050 -0.048857 -0.587084
-vt 0.575000 0.312500
+vn -0.268696 -0.493912 -0.826954
-vt 0.575000 0.437813
+vn -0.268693 -0.493913 -0.826954
-vt 0.625000 0.312500
+vn -0.808483 -0.588520 0.000000
-vt 0.625000 0.437813
+vn -0.250578 -0.585198 0.771203
-vt 0.375000 0.563127
+vn -0.250579 -0.585198 0.771203
-vt 0.425000 0.563127
+vn 0.706501 -0.487211 0.513304
-vt 0.475000 0.563127
+vn 0.706502 -0.487212 0.513302
-vt 0.525000 0.563127
+vn 0.734158 -0.420117 -0.533398
-vt 0.575000 0.563127
+vn 0.734159 -0.420117 -0.533397
-vt 0.625000 0.563127
+vn -0.299345 -0.248230 -0.921290
-vt 0.375000 0.688440
-vt 0.425000 0.688440
-vt 0.475000 0.688440
-vt 0.525000 0.688440
-vt 0.575000 0.688440
-vt 0.625000 0.688440
-vt 0.548284 0.992353
-vt 0.373591 0.935591
-vt 0.500000 0.837500
-vt 0.373591 0.751909
-vt 0.548284 0.695147
-vt 0.656250 0.843750
-vn -0.302671 -0.032363 -0.952545
-vn -0.283829 -0.393581 -0.874377
-vn -0.303042 -0.032401 -0.952426
-vn -0.303042 -0.032401 -0.952426
-vn -0.283829 -0.393581 -0.874377
-vn -0.296640 -0.280188 -0.912962
-vn -0.996001 0.089339 -0.000002
-vn -0.892723 -0.450605 0.000000
-vn -0.996001 0.089339 -0.000001
-vn -0.996001 0.089339 -0.000001
-vn -0.892723 -0.450605 0.000000
-vn -0.954678 -0.297639 0.000000
-vn -0.299747 0.142301 0.943346
-vn -0.300125 0.142242 0.943235
-vn -0.276943 -0.442004 0.853191
-vn -0.276943 -0.442004 0.853191
-vn -0.300125 0.142242 0.943235
-vn -0.298327 -0.260749 0.918156
-vn 0.801218 0.060995 0.595255
-vn 0.801594 0.061039 0.594745
-vn 0.752240 -0.367249 0.547050
-vn 0.752240 -0.367249 0.547050
-vn 0.801594 0.061039 0.594745
-vn 0.786457 -0.234508 0.571395
-vn 0.801803 -0.047590 -0.595690
-vn 0.802190 -0.047668 -0.595164
-vn 0.785699 -0.235649 -0.571967
-vn 0.785699 -0.235649 -0.571967
-vn 0.802190 -0.047668 -0.595164
-vn 0.759819 -0.343403 -0.552041
-vn -0.296640 -0.280188 -0.912962
-vn -0.283829 -0.393581 -0.874377
-vn -0.292470 -0.322841 -0.900131
-vn -0.292470 -0.322841 -0.900131
-vn -0.283829 -0.393581 -0.874377
-vn -0.294284 -0.305097 -0.905711
-vn -0.954678 -0.297639 0.000000
-vn -0.892723 -0.450605 0.000000
-vn -0.929528 -0.368751 0.000000
-vn -0.929528 -0.368751 0.000000
-vn -0.892723 -0.450605 0.000000
-vn -0.936353 -0.351059 0.000000
-vn -0.298327 -0.260749 0.918156
-vn -0.288675 -0.356824 0.888450
-vn -0.276943 -0.442004 0.853191
-vn -0.276943 -0.442004 0.853191
-vn -0.288675 -0.356824 0.888450
-vn -0.291107 -0.335494 0.895936
-vn 0.786457 -0.234508 0.571395
-vn 0.771870 -0.299540 0.560796
-vn 0.752240 -0.367249 0.547050
-vn 0.752240 -0.367249 0.547050
-vn 0.771870 -0.299540 0.560796
-vn 0.776466 -0.280804 0.564136
-vn 0.785699 -0.235649 -0.571967
-vn 0.759819 -0.343403 -0.552041
-vn 0.778275 -0.273049 -0.565449
-vn 0.778275 -0.273049 -0.565449
-vn 0.759819 -0.343403 -0.552041
-vn 0.779888 -0.265921 -0.566622
-vn -0.292470 -0.322841 -0.900131
-vn -0.294284 -0.305097 -0.905711
-vn -0.299345 -0.248231 -0.921289
-vn -0.299345 -0.248231 -0.921289
-vn -0.294284 -0.305097 -0.905711
-vn -0.299345 -0.248231 -0.921289
-vn -0.929528 -0.368751 0.000000
-vn -0.936353 -0.351059 0.000000
 vn -0.963856 -0.266424 0.000000
-vn -0.963856 -0.266424 0.000000
-vn -0.936353 -0.351059 0.000000
-vn -0.963856 -0.266424 0.000000
-vn -0.288675 -0.356824 0.888450
 vn -0.299345 -0.248231 0.921289
-vn -0.291107 -0.335494 0.895936
+vn -0.299346 -0.248231 0.921289
-vn -0.291107 -0.335494 0.895936
+vn 0.789517 -0.218235 0.573617
-vn -0.299345 -0.248231 0.921289
-vn -0.299345 -0.248231 0.921289
-vn 0.771870 -0.299540 0.560796
-vn 0.789517 -0.218234 0.573617
-vn 0.776466 -0.280804 0.564136
-vn 0.776466 -0.280804 0.564136
-vn 0.789517 -0.218234 0.573617
-vn 0.789517 -0.218234 0.573617
-vn 0.778275 -0.273049 -0.565449
-vn 0.779888 -0.265921 -0.566622
 vn 0.789517 -0.218234 -0.573617
-vn 0.789517 -0.218234 -0.573617
+vn -0.227230 0.677709 -0.699340
-vn 0.779888 -0.265921 -0.566622
+vn -0.735330 0.677709 0.000000
-vn 0.789517 -0.218234 -0.573617
+vn -0.227229 0.677709 0.699341
-vn 0.203857 0.751532 -0.627409
+vn 0.594895 0.677709 0.432217
-vn -0.533706 0.751532 -0.387760
+vn 0.594895 0.677709 -0.432216
-vn 0.000000 1.000000 0.000000
+vn 0.000000 -1.000000 0.000000
-vn -0.533706 0.751532 -0.387760
-vn -0.533706 0.751532 0.387760
-vn 0.000000 1.000000 0.000000
-vn -0.533706 0.751532 0.387760
-vn 0.203857 0.751532 0.627409
-vn 0.000000 1.000000 0.000000
-vn 0.203857 0.751532 0.627409
-vn 0.659697 0.751532 0.000000
-vn 0.000000 1.000000 0.000000
-vn 0.659697 0.751532 0.000000
-vn 0.203857 0.751532 -0.627409
-vn 0.000000 1.000000 0.000000
 s off
-g Collision_pCylinder1
+f 1//1 2//1 3//1
-usemtl Collision_initialShadingGroup4
+f 3//2 2//2 4//2
-f 2/1/1 7/2/2 1/3/3
+f 5//3 1//3 6//3
-f 1/3/4 7/2/5 6/4/6
+f 1//3 5//3 2//3
-f 3/5/7 8/6/8 2/1/9
+f 6//4 7//4 5//4
-f 2/1/10 8/6/11 7/2/12
+f 5//5 7//5 8//5
-f 3/5/13 4/7/14 8/6/15
+f 7//6 9//6 8//6
-f 8/6/16 4/7/17 9/8/18
+f 8//7 9//7 10//7
-f 4/7/19 5/9/20 9/8/21
+f 9//8 3//8 10//8
-f 9/8/22 5/9/23 10/10/24
+f 10//9 3//9 4//9
-f 5/9/25 1/11/26 10/10/27
+f 4//10 2//10 11//10
-f 10/10/28 1/11/29 6/12/30
+f 11//11 2//11 12//11
-f 6/4/31 7/2/32 11/13/33
+f 2//12 5//12 12//12
-f 11/13/34 7/2/35 12/14/36
+f 12//12 5//12 13//12
-f 7/2/37 8/6/38 12/14/39
+f 8//13 14//13 5//13
-f 12/14/40 8/6/41 13/15/42
+f 5//14 14//14 13//14
-f 9/8/43 14/16/44 8/6/45
+f 10//15 15//15 8//15
-f 8/6/46 14/16/47 13/15/48
+f 8//16 15//16 14//16
-f 10/10/49 15/17/50 9/8/51
+f 10//17 4//17 15//17
-f 9/8/52 15/17/53 14/16/54
+f 15//18 4//18 11//18
-f 10/10/55 6/12/56 15/17/57
+f 11//19 12//19 16//19
-f 15/17/58 6/12/59 11/18/60
+f 16//19 12//19 17//19
-f 11/13/61 12/14/62 16/19/63
+f 12//20 13//20 17//20
-f 16/19/64 12/14/65 17/20/66
+f 17//20 13//20 18//20
-f 12/14/67 13/15/68 17/20/69
+f 14//21 19//21 13//21
-f 17/20/70 13/15/71 18/21/72
+f 13//22 19//22 18//22
-f 14/16/73 19/22/74 13/15/75
+f 15//23 20//23 14//23
-f 13/15/76 19/22/77 18/21/78
+f 14//23 20//23 19//23
-f 15/17/79 20/23/80 14/16/81
+f 15//24 11//24 20//24
-f 14/16/82 20/23/83 19/22/84
+f 20//24 11//24 16//24
-f 15/17/85 11/18/86 20/23/87
+f 16//25 17//25 21//25
-f 20/23/88 11/18/89 16/24/90
+f 17//26 18//26 21//26
-f 16/25/91 17/26/92 21/27/93
+f 18//27 19//27 21//27
-f 17/26/94 18/28/95 21/27/96
+f 19//28 20//28 21//28
-f 18/28/97 19/29/98 21/27/99
+f 20//29 16//29 21//29
-f 19/29/100 20/30/101 21/27/102
+f 6//30 1//30 3//30
-f 20/30/103 16/25/104 21/27/105
+f 7//30 6//30 3//30
+f 9//30 7//30 3//30