diff --git a/Blenderfiles/torch.blend b/Blenderfiles/torch.blend index 5803e11..a7572c4 100644 Binary files a/Blenderfiles/torch.blend and b/Blenderfiles/torch.blend differ diff --git a/Levels/Geometry/torch.obj b/Levels/Geometry/torch.obj index a7ce613..febdf6d 100644 --- a/Levels/Geometry/torch.obj +++ b/Levels/Geometry/torch.obj @@ -65,7 +65,6 @@ v -0.033313 -1.000000 -0.080425 v -0.073289 1.000000 -0.176935 v -0.016983 -1.000000 -0.085379 v -0.037362 1.000000 -0.187833 -vt 0.173159 0.324353 vt 0.355490 0.133897 vt 0.388961 0.169345 vt 0.188374 0.340465 @@ -74,7 +73,6 @@ vt 0.201889 0.358028 vt 0.444379 0.249421 vt 0.213565 0.376862 vt 0.465761 0.293235 -vt 0.223285 0.396777 vt 0.482621 0.338980 vt 0.230950 0.417570 vt 0.494787 0.386190 @@ -82,25 +80,21 @@ vt 0.236481 0.439028 vt 0.502136 0.434385 vt 0.239822 0.460935 vt 0.504593 0.483075 -vt 0.240940 0.483066 vt 0.502132 0.531764 vt 0.239822 0.505197 vt 0.494779 0.579957 vt 0.236481 0.527103 vt 0.482609 0.627165 -vt 0.230950 0.548561 vt 0.465746 0.672906 vt 0.223286 0.569353 vt 0.444361 0.716715 vt 0.213567 0.589266 vt 0.418672 0.758148 -vt 0.201891 0.608099 vt 0.388940 0.796782 vt 0.188377 0.625660 vt 0.355468 0.832224 vt 0.173163 0.641770 vt 0.318596 0.864115 -vt 0.156403 0.656266 vt 0.278700 0.892129 vt 0.138269 0.669000 vt 0.236185 0.915982 @@ -115,7 +109,6 @@ vt 0.048890 0.965612 vt 0.033810 0.702402 vt 0.000142 0.965943 vt 0.011651 0.702553 -vt 0.011637 0.263556 vt 0.000142 0.000142 vt 0.048895 0.000476 vt 0.033797 0.263708 @@ -129,21 +122,37 @@ vt 0.236203 0.050124 vt 0.118937 0.286274 vt 0.278720 0.073982 vt 0.138263 0.297119 -vt 0.635136 0.466957 +vt 0.514387 0.175443 +vt 0.533044 0.130402 +vt 0.990347 0.319823 +vt 0.318618 0.102002 +vt 0.173159 0.324353 +vt 0.156399 0.309855 +vt 0.704754 0.679615 +vt 0.545660 0.695284 +vt 0.689084 0.520522 +vt 0.223285 0.396777 +vt 0.240940 0.483066 +vt 0.230950 0.548561 +vt 0.201891 0.608099 +vt 0.156403 0.656266 +vt 0.011637 0.263556 +vt 0.776743 0.495124 +vt 0.727992 0.495124 vt 0.594601 0.439872 -vt 0.560128 0.405399 +vt 0.680177 0.009653 +vt 0.727992 0.000142 +vt 0.776744 0.000142 vt 0.533043 0.364864 vt 0.514387 0.319824 vt 0.504876 0.272009 vt 0.504876 0.223258 -vt 0.514387 0.175443 -vt 0.533044 0.130402 +vt 0.560128 0.405399 vt 0.560129 0.089866 vt 0.594602 0.055394 -vt 0.635137 0.028309 -vt 0.680177 0.009653 -vt 0.727992 0.000142 -vt 0.776744 0.000142 +vt 0.869598 0.466956 +vt 0.910133 0.439871 +vt 0.971691 0.364863 vt 0.824559 0.009653 vt 0.869599 0.028309 vt 0.910135 0.055395 @@ -152,49 +161,40 @@ vt 0.971691 0.130402 vt 0.990347 0.175442 vt 0.999858 0.223257 vt 0.999858 0.272009 -vt 0.990347 0.319823 -vt 0.971691 0.364863 vt 0.944606 0.405398 -vt 0.910133 0.439871 -vt 0.869598 0.466956 vt 0.824557 0.485613 -vt 0.776743 0.495124 -vt 0.727992 0.495124 vt 0.680177 0.485613 -vt 0.156399 0.309855 -vt 0.318618 0.102002 +vt 0.635136 0.466957 +vt 0.635137 0.028309 +vt 0.529991 0.536192 vt 0.545660 0.520522 vt 0.564085 0.508211 vt 0.584558 0.499731 vt 0.606292 0.495408 -vt 0.628452 0.495407 vt 0.650186 0.499730 vt 0.670659 0.508211 -vt 0.689084 0.520522 +vt 0.628452 0.495407 vt 0.704753 0.536191 vt 0.717065 0.554616 -vt 0.725545 0.575089 vt 0.729868 0.596823 -vt 0.729868 0.618983 +vt 0.725545 0.575089 vt 0.725545 0.640717 +vt 0.729868 0.618983 vt 0.717065 0.661190 -vt 0.704754 0.679615 vt 0.689084 0.695284 vt 0.670659 0.707596 -vt 0.650185 0.716076 vt 0.628452 0.720399 vt 0.606292 0.720399 vt 0.584558 0.716076 vt 0.564085 0.707595 -vt 0.545660 0.695284 vt 0.529990 0.679615 vt 0.517679 0.661190 vt 0.509199 0.640717 -vt 0.504876 0.618983 vt 0.504876 0.596824 +vt 0.650185 0.716076 vt 0.509199 0.575090 vt 0.517679 0.554617 -vt 0.529991 0.536192 +vt 0.504876 0.618983 vn 0.097900 -0.051900 -0.993800 vn 0.289900 -0.051900 -0.955700 vn 0.470800 -0.051900 -0.880700 @@ -229,38 +229,130 @@ vn 0.000000 1.000000 0.000000 vn -0.097900 -0.051900 -0.993800 vn -0.289900 -0.051900 -0.955700 vn 0.000000 -1.000000 0.000000 +vn -0.955700 -0.051900 -0.289900 +vn 0.000000 -1.000000 -0.000100 s off -f 1/1/1 2/2/1 4/3/1 3/4/1 -f 3/4/2 4/3/2 6/5/2 5/6/2 -f 5/6/3 6/5/3 8/7/3 7/8/3 -f 7/8/4 8/7/4 10/9/4 9/10/4 -f 9/10/5 10/9/5 12/11/5 11/12/5 -f 11/12/6 12/11/6 14/13/6 13/14/6 -f 13/14/7 14/13/7 16/15/7 15/16/7 -f 15/16/8 16/15/8 18/17/8 17/18/8 -f 17/18/9 18/17/9 20/19/9 19/20/9 -f 19/20/10 20/19/10 22/21/10 21/22/10 -f 21/22/11 22/21/11 24/23/11 23/24/11 -f 23/24/12 24/23/12 26/25/12 25/26/12 -f 25/26/13 26/25/13 28/27/13 27/28/13 -f 27/28/14 28/27/14 30/29/14 29/30/14 -f 29/30/15 30/29/15 32/31/15 31/32/15 -f 31/32/16 32/31/16 34/33/16 33/34/16 -f 33/34/17 34/33/17 36/35/17 35/36/17 -f 35/36/18 36/35/18 38/37/18 37/38/18 -f 37/38/19 38/37/19 40/39/19 39/40/19 -f 39/40/20 40/39/20 42/41/20 41/42/20 -f 41/42/21 42/41/21 44/43/21 43/44/21 -f 43/44/22 44/43/22 46/45/22 45/46/22 -f 45/46/23 46/45/23 48/47/23 47/48/23 -f 47/48/24 48/47/24 50/49/24 49/50/24 -f 49/51/25 50/52/25 52/53/25 51/54/25 -f 51/54/26 52/53/26 54/55/26 53/56/26 -f 53/56/27 54/55/27 56/57/27 55/58/27 -f 55/58/28 56/57/28 58/59/28 57/60/28 -f 57/60/29 58/59/29 60/61/29 59/62/29 -f 59/62/30 60/61/30 62/63/30 61/64/30 -f 4/65/31 2/66/31 64/67/31 62/68/31 60/69/31 58/70/31 56/71/31 54/72/31 52/73/31 50/74/31 48/75/31 46/76/31 44/77/31 42/78/31 40/79/31 38/80/31 36/81/31 34/82/31 32/83/31 30/84/31 28/85/31 26/86/31 24/87/31 22/88/31 20/89/31 18/90/31 16/91/31 14/92/31 12/93/31 10/94/31 8/95/31 6/96/31 -f 63/97/32 64/98/32 2/2/32 1/1/32 -f 61/64/33 62/63/33 64/98/33 63/97/33 -f 1/99/34 3/100/34 5/101/34 7/102/34 9/103/34 11/104/34 13/105/34 15/106/34 17/107/34 19/108/34 21/109/34 23/110/34 25/111/34 27/112/34 29/113/34 31/114/34 33/115/34 35/116/34 37/117/34 39/118/34 41/119/34 43/120/34 45/121/34 47/122/34 49/123/34 51/124/34 53/125/34 55/126/34 57/127/34 59/128/34 61/129/34 63/130/34 +f 2/1/1 4/2/1 3/3/1 +f 4/2/2 6/4/2 5/5/2 +f 6/4/3 8/6/3 7/7/3 +f 7/7/4 8/6/4 10/8/4 +f 10/8/5 12/9/5 11/10/5 +f 12/9/6 14/11/6 13/12/6 +f 14/11/7 16/13/7 15/14/7 +f 15/14/8 16/13/8 18/15/8 +f 18/15/9 20/16/9 19/17/9 +f 19/17/10 20/16/10 22/18/10 +f 21/19/11 22/18/11 24/20/11 +f 24/20/12 26/21/12 25/22/12 +f 26/21/13 28/23/13 27/24/13 +f 27/24/14 28/23/14 30/25/14 +f 30/25/15 32/26/15 31/27/15 +f 32/26/16 34/28/16 33/29/16 +f 33/29/17 34/28/17 36/30/17 +f 36/30/18 38/31/18 37/32/18 +f 38/31/19 40/33/19 39/34/19 +f 40/33/20 42/35/20 41/36/20 +f 42/35/21 44/37/21 43/38/21 +f 44/37/22 46/39/22 45/40/22 +f 46/39/23 48/41/23 47/42/23 +f 48/41/24 50/43/24 49/44/24 +f 50/45/25 52/46/25 51/47/25 +f 52/46/26 54/48/26 53/49/26 +f 54/48/27 56/50/27 55/51/27 +f 56/50/28 58/52/28 57/53/28 +f 58/52/29 60/54/29 59/55/29 +f 60/54/30 62/56/30 61/57/30 +f 54/58/31 52/59/31 22/60/31 +f 64/61/32 2/1/32 1/62/32 +f 62/56/33 64/61/33 63/63/33 +f 31/64/34 47/65/34 15/66/34 +f 1/62/1 2/1/1 3/3/1 +f 3/3/2 4/2/2 5/5/2 +f 5/5/3 6/4/3 7/7/3 +f 9/67/4 7/7/4 10/8/4 +f 9/67/5 10/8/5 11/10/5 +f 11/10/6 12/9/6 13/12/6 +f 13/12/7 14/11/7 15/14/7 +f 17/68/8 15/14/8 18/15/8 +f 17/68/9 18/15/9 19/17/9 +f 21/19/10 19/17/10 22/18/10 +f 23/69/11 21/19/11 24/20/11 +f 23/69/12 24/20/12 25/22/12 +f 25/22/13 26/21/13 27/24/13 +f 29/70/14 27/24/14 30/25/14 +f 29/70/15 30/25/15 31/27/15 +f 31/27/16 32/26/16 33/29/16 +f 35/71/17 33/29/17 36/30/17 +f 35/71/18 36/30/18 37/32/18 +f 37/32/19 38/31/19 39/34/19 +f 39/34/20 40/33/20 41/36/20 +f 41/36/21 42/35/21 43/38/21 +f 43/38/22 44/37/22 45/40/22 +f 45/40/23 46/39/23 47/42/23 +f 47/42/24 48/41/24 49/44/24 +f 49/72/25 50/45/25 51/47/25 +f 51/47/35 52/46/35 53/49/35 +f 53/49/27 54/48/27 55/51/27 +f 55/51/28 56/50/28 57/53/28 +f 57/53/29 58/52/29 59/55/29 +f 59/55/30 60/54/30 61/57/30 +f 10/73/31 8/74/31 2/75/31 +f 44/76/31 42/77/31 40/78/31 +f 62/79/31 60/80/31 58/81/31 +f 56/82/31 22/60/31 64/83/31 +f 50/84/31 48/85/31 52/59/31 +f 2/75/31 14/86/31 10/73/31 +f 16/87/31 22/60/31 20/88/31 +f 38/89/31 44/76/31 40/78/31 +f 38/89/31 36/90/31 34/91/31 +f 34/91/31 32/92/31 30/93/31 +f 30/93/31 28/94/31 26/95/31 +f 26/95/31 24/96/31 22/60/31 +f 18/97/31 16/87/31 20/88/31 +f 14/86/31 22/60/31 16/87/31 +f 14/86/31 12/98/31 10/73/31 +f 6/99/31 4/100/31 8/74/31 +f 22/60/31 38/89/31 34/91/31 +f 56/82/31 54/58/31 22/60/31 +f 46/101/31 44/76/31 48/85/31 +f 44/76/31 38/89/31 48/85/31 +f 30/93/31 22/60/31 34/91/31 +f 30/93/31 26/95/31 22/60/31 +f 52/59/31 48/85/31 38/89/31 +f 56/82/31 64/83/31 58/81/31 +f 64/83/31 62/79/31 58/81/31 +f 61/57/33 62/56/33 63/63/33 +f 52/59/31 38/89/31 22/60/31 +f 8/74/31 4/100/31 2/75/31 +f 63/63/32 64/61/32 1/62/32 +f 2/75/31 22/60/31 14/86/31 +f 22/60/31 2/75/31 64/83/31 +f 63/102/34 1/103/34 3/104/34 +f 3/104/34 5/105/34 7/106/34 +f 11/107/34 13/108/34 9/109/34 +f 15/66/34 7/106/34 13/108/34 +f 15/66/34 17/110/34 19/111/34 +f 23/112/34 15/66/34 21/113/34 +f 27/114/34 31/64/34 25/115/34 +f 27/114/36 29/116/36 31/64/36 +f 31/64/34 33/117/34 35/118/34 +f 39/119/34 41/120/34 43/121/34 +f 43/121/34 45/122/34 47/65/34 +f 47/65/34 49/123/34 51/124/34 +f 53/125/34 57/126/34 63/102/34 +f 35/118/34 37/127/34 31/64/34 +f 59/128/34 61/129/34 63/102/34 +f 63/102/34 3/104/34 7/106/34 +f 13/108/34 7/106/34 9/109/34 +f 31/64/34 23/112/34 25/115/34 +f 37/127/34 39/119/34 43/121/34 +f 37/127/34 47/65/34 31/64/34 +f 47/65/34 37/127/34 43/121/34 +f 53/125/34 55/130/34 57/126/34 +f 15/66/34 19/111/34 21/113/34 +f 63/102/34 7/106/34 15/66/34 +f 15/66/34 23/112/34 31/64/34 +f 47/65/34 51/124/34 53/125/34 +f 53/125/34 63/102/34 15/66/34 +f 57/126/34 59/128/34 63/102/34 +f 47/65/34 53/125/34 15/66/34 diff --git a/Levels/ObjectSetups/Level1.xml b/Levels/ObjectSetups/Level1.xml index 3884a17..49ad503 100644 --- a/Levels/ObjectSetups/Level1.xml +++ b/Levels/ObjectSetups/Level1.xml @@ -57,7 +57,7 @@ 5.500000 1 3 - 85 + 80 - 0.0