# HG changeset patch # User John Tsiombikas # Date 1351275734 -10800 # Node ID 12a1dcfe91fa157870324493bbec68c283db534c # Parent d89b403f630b5ad17c8458a3c65570d4f59e358e gamma correct rendering diff -r d89b403f630b -r 12a1dcfe91fa prototype/data/deftile-lights.mtl --- a/prototype/data/deftile-lights.mtl Fri Oct 26 03:03:52 2012 +0300 +++ b/prototype/data/deftile-lights.mtl Fri Oct 26 21:22:14 2012 +0300 @@ -3,7 +3,7 @@ newmtl Material-light Ns 96.078431 Ka 0.000000 0.000000 0.000000 -Kd 1.000000 0.732136 0.437466 +Kd 1.000000 0.609276 0.278397 Ks 0.000000 0.000000 0.000000 Ni 1.000000 d 1.000000 diff -r d89b403f630b -r 12a1dcfe91fa prototype/data/deftile-lights.obj --- a/prototype/data/deftile-lights.obj Fri Oct 26 03:03:52 2012 +0300 +++ b/prototype/data/deftile-lights.obj Fri Oct 26 21:22:14 2012 +0300 @@ -28,40 +28,88 @@ v 0.394558 1.871289 0.843846 v 0.744090 0.677911 1.193378 v 0.394558 -0.515466 0.843846 +vn -0.357407 0.357407 0.862856 +vn -0.357407 -0.357407 0.862856 +vn -0.862856 0.357407 0.357407 +vn -0.862856 -0.357407 0.357407 +vn -0.862856 0.357407 -0.357407 +vn -0.862856 -0.357407 -0.357407 +vn -0.357407 0.357407 -0.862856 +vn -0.357407 -0.357407 -0.862856 +vn 0.357407 -0.357407 -0.862856 +vn 0.357407 0.357407 -0.862856 +vn 0.862856 0.357407 -0.357407 +vn 0.862856 -0.357407 -0.357406 +vn 0.862856 -0.357407 0.357407 +vn 0.862856 0.357407 0.357407 +vn -0.156558 -0.912487 0.377965 +vn -0.156558 0.912487 0.377964 +vn -0.377965 -0.912487 0.156558 +vn -0.377964 0.912487 0.156558 +vn -0.377964 -0.912487 -0.156558 +vn -0.377964 0.912487 -0.156558 +vn -0.156558 -0.912487 -0.377964 +vn -0.156558 0.912487 -0.377964 +vn 0.156558 -0.912487 -0.377964 +vn 0.156558 0.912487 -0.377964 +vn 0.377964 0.912487 -0.156558 +vn 0.377965 -0.912487 -0.156558 +vn 0.377964 -0.912487 0.156558 +vn 0.377964 0.912487 0.156558 +vn 0.156558 0.912487 0.377964 +vn 0.357406 0.357407 0.862856 +vn 0.357406 -0.357407 0.862856 +vn 0.156558 -0.912487 0.377965 usemtl Material-light s off -f 2 1 5 6 -f 6 7 3 2 -f 8 9 6 5 -f 9 10 7 6 -f 11 12 9 8 -f 12 13 10 9 -f 14 15 12 11 -f 15 16 13 12 -f 18 19 16 15 -f 17 18 15 14 -f 20 21 18 17 -f 21 22 19 18 -f 25 26 22 21 -f 24 25 21 20 -f 7 4 3 -f 5 1 23 -f 10 4 7 -f 23 8 5 -f 13 4 10 -f 23 11 8 -f 16 4 13 -f 23 14 11 -f 19 4 16 -f 23 17 14 -f 23 20 17 -f 22 4 19 -f 26 4 22 -f 23 24 20 -f 23 1 24 -f 1 2 25 24 -f 2 3 26 25 -f 3 4 26 +f 2//1 1//1 5//1 +f 2//1 5//1 6//1 +f 6//2 7//2 3//2 +f 6//2 3//2 2//2 +f 8//3 9//3 6//3 +f 8//3 6//3 5//3 +f 9//4 10//4 7//4 +f 9//4 7//4 6//4 +f 11//5 12//5 9//5 +f 11//5 9//5 8//5 +f 12//6 13//6 10//6 +f 12//6 10//6 9//6 +f 14//7 15//7 12//7 +f 14//7 12//7 11//7 +f 15//8 16//8 13//8 +f 15//8 13//8 12//8 +f 18//9 19//9 16//9 +f 18//9 16//9 15//9 +f 17//10 18//10 15//10 +f 17//10 15//10 14//10 +f 20//11 21//11 18//11 +f 20//11 18//11 17//11 +f 21//12 22//12 19//12 +f 21//12 19//12 18//12 +f 25//13 26//13 22//13 +f 25//13 22//13 21//13 +f 24//14 25//14 21//14 +f 24//14 21//14 20//14 +f 7//15 4//15 3//15 +f 5//16 1//16 23//16 +f 10//17 4//17 7//17 +f 23//18 8//18 5//18 +f 13//19 4//19 10//19 +f 23//20 11//20 8//20 +f 16//21 4//21 13//21 +f 23//22 14//22 11//22 +f 19//23 4//23 16//23 +f 23//24 17//24 14//24 +f 23//25 20//25 17//25 +f 22//26 4//26 19//26 +f 26//27 4//27 22//27 +f 23//28 24//28 20//28 +f 23//29 1//29 24//29 +f 1//30 2//30 25//30 +f 1//30 25//30 24//30 +f 2//31 3//31 26//31 +f 2//31 26//31 25//31 +f 3//32 4//32 26//32 o SOUTH_LIGHT_Sphere v 1.193378 1.871289 0.449287 v 1.687691 0.677911 0.449287 @@ -89,40 +137,63 @@ v 0.843846 1.871289 -0.394558 v 1.193378 0.677911 -0.744090 v 0.843846 -0.515466 -0.394558 +vn 0.357407 0.357407 0.862856 +vn 0.357407 -0.357407 0.862856 +vn -0.357407 0.357406 -0.862856 +vn 0.377965 -0.912487 0.156558 +vn -0.156558 -0.912487 -0.377965 +vn 0.862856 -0.357407 -0.357407 +vn 0.377964 -0.912487 -0.156558 usemtl Material-light s off -f 28 27 31 32 -f 32 33 29 28 -f 34 35 32 31 -f 35 36 33 32 -f 37 38 35 34 -f 38 39 36 35 -f 40 41 38 37 -f 41 42 39 38 -f 44 45 42 41 -f 43 44 41 40 -f 46 47 44 43 -f 47 48 45 44 -f 51 52 48 47 -f 50 51 47 46 -f 33 30 29 -f 31 27 49 -f 36 30 33 -f 49 34 31 -f 39 30 36 -f 49 37 34 -f 42 30 39 -f 49 40 37 -f 45 30 42 -f 49 43 40 -f 49 46 43 -f 48 30 45 -f 52 30 48 -f 49 50 46 -f 49 27 50 -f 27 28 51 50 -f 28 29 52 51 -f 29 30 52 +f 28//14 27//14 31//14 +f 28//14 31//14 32//14 +f 32//13 33//13 29//13 +f 32//13 29//13 28//13 +f 34//33 35//33 32//33 +f 34//33 32//33 31//33 +f 35//34 36//34 33//34 +f 35//34 33//34 32//34 +f 37//1 38//1 35//1 +f 37//1 35//1 34//1 +f 38//2 39//2 36//2 +f 38//2 36//2 35//2 +f 40//3 41//3 38//3 +f 40//3 38//3 37//3 +f 41//4 42//4 39//4 +f 41//4 39//4 38//4 +f 44//6 45//6 42//6 +f 44//6 42//6 41//6 +f 43//5 44//5 41//5 +f 43//5 41//5 40//5 +f 46//35 47//35 44//35 +f 46//35 44//35 43//35 +f 47//8 48//8 45//8 +f 47//8 45//8 44//8 +f 51//9 52//9 48//9 +f 51//9 48//9 47//9 +f 50//10 51//10 47//10 +f 50//10 47//10 46//10 +f 33//36 30//36 29//36 +f 31//28 27//28 49//28 +f 36//32 30//32 33//32 +f 49//29 34//29 31//29 +f 39//15 30//15 36//15 +f 49//16 37//16 34//16 +f 42//17 30//17 39//17 +f 49//18 40//18 37//18 +f 45//19 30//19 42//19 +f 49//20 43//20 40//20 +f 49//22 46//22 43//22 +f 48//37 30//37 45//37 +f 52//23 30//23 48//23 +f 49//24 50//24 46//24 +f 49//25 27//25 50//25 +f 27//11 28//11 51//11 +f 27//11 51//11 50//11 +f 28//38 29//38 52//38 +f 28//38 52//38 51//38 +f 29//39 30//39 52//39 o EAST_LIGHT_Sphere v 0.449287 1.871289 -1.193378 v 0.449287 0.677911 -1.687691 @@ -150,40 +221,57 @@ v -0.394558 1.871289 -0.843846 v -0.744090 0.677911 -1.193378 v -0.394558 -0.515466 -0.843846 +vn -0.862856 0.357406 -0.357407 usemtl Material-light s off -f 54 53 57 58 -f 58 59 55 54 -f 60 61 58 57 -f 61 62 59 58 -f 63 64 61 60 -f 64 65 62 61 -f 66 67 64 63 -f 67 68 65 64 -f 70 71 68 67 -f 69 70 67 66 -f 72 73 70 69 -f 73 74 71 70 -f 77 78 74 73 -f 76 77 73 72 -f 59 56 55 -f 57 53 75 -f 62 56 59 -f 75 60 57 -f 65 56 62 -f 75 63 60 -f 68 56 65 -f 75 66 63 -f 71 56 68 -f 75 69 66 -f 75 72 69 -f 74 56 71 -f 78 56 74 -f 75 76 72 -f 75 53 76 -f 53 54 77 76 -f 54 55 78 77 -f 55 56 78 +f 54//10 53//10 57//10 +f 54//10 57//10 58//10 +f 58//9 59//9 55//9 +f 58//9 55//9 54//9 +f 60//11 61//11 58//11 +f 60//11 58//11 57//11 +f 61//38 62//38 59//38 +f 61//38 59//38 58//38 +f 63//14 64//14 61//14 +f 63//14 61//14 60//14 +f 64//13 65//13 62//13 +f 64//13 62//13 61//13 +f 66//33 67//33 64//33 +f 66//33 64//33 63//33 +f 67//34 68//34 65//34 +f 67//34 65//34 64//34 +f 70//2 71//2 68//2 +f 70//2 68//2 67//2 +f 69//1 70//1 67//1 +f 69//1 67//1 66//1 +f 72//3 73//3 70//3 +f 72//3 70//3 69//3 +f 73//4 74//4 71//4 +f 73//4 71//4 70//4 +f 77//6 78//6 74//6 +f 77//6 74//6 73//6 +f 76//40 77//40 73//40 +f 76//40 73//40 72//40 +f 59//23 56//23 55//23 +f 57//24 53//24 75//24 +f 62//26 56//26 59//26 +f 75//25 60//25 57//25 +f 65//36 56//36 62//36 +f 75//28 63//28 60//28 +f 68//32 56//32 65//32 +f 75//29 66//29 63//29 +f 71//15 56//15 68//15 +f 75//16 69//16 66//16 +f 75//18 72//18 69//18 +f 74//17 56//17 71//17 +f 78//19 56//19 74//19 +f 75//20 76//20 72//20 +f 75//22 53//22 76//22 +f 53//7 54//7 77//7 +f 53//7 77//7 76//7 +f 54//8 55//8 78//8 +f 54//8 78//8 77//8 +f 55//37 56//37 78//37 o NORTH_LIGHT_Sphere v -1.193378 1.871289 -0.449287 v -1.687691 0.677911 -0.449287 @@ -211,40 +299,61 @@ v -0.843846 1.871289 0.394558 v -1.193378 0.677911 0.744090 v -0.843846 -0.515466 0.394558 +vn -0.377965 -0.912487 -0.156558 +vn 0.156558 -0.912487 -0.377965 +vn -0.156558 -0.912487 0.377964 +vn -0.862856 0.357407 0.357406 +vn -0.862856 -0.357407 0.357406 usemtl Material-light s off -f 80 79 83 84 -f 84 85 81 80 -f 86 87 84 83 -f 87 88 85 84 -f 89 90 87 86 -f 90 91 88 87 -f 92 93 90 89 -f 93 94 91 90 -f 96 97 94 93 -f 95 96 93 92 -f 98 99 96 95 -f 99 100 97 96 -f 103 104 100 99 -f 102 103 99 98 -f 85 82 81 -f 83 79 101 -f 88 82 85 -f 101 86 83 -f 91 82 88 -f 101 89 86 -f 94 82 91 -f 101 92 89 -f 97 82 94 -f 101 95 92 -f 101 98 95 -f 100 82 97 -f 104 82 100 -f 101 102 98 -f 101 79 102 -f 79 80 103 102 -f 80 81 104 103 -f 81 82 104 +f 80//5 79//5 83//5 +f 80//5 83//5 84//5 +f 84//6 85//6 81//6 +f 84//6 81//6 80//6 +f 86//7 87//7 84//7 +f 86//7 84//7 83//7 +f 87//8 88//8 85//8 +f 87//8 85//8 84//8 +f 89//10 90//10 87//10 +f 89//10 87//10 86//10 +f 90//9 91//9 88//9 +f 90//9 88//9 87//9 +f 92//11 93//11 90//11 +f 92//11 90//11 89//11 +f 93//38 94//38 91//38 +f 93//38 91//38 90//38 +f 96//13 97//13 94//13 +f 96//13 94//13 93//13 +f 95//14 96//14 93//14 +f 95//14 93//14 92//14 +f 98//33 99//33 96//33 +f 98//33 96//33 95//33 +f 99//31 100//31 97//31 +f 99//31 97//31 96//31 +f 103//2 104//2 100//2 +f 103//2 100//2 99//2 +f 102//1 103//1 99//1 +f 102//1 99//1 98//1 +f 85//41 82//41 81//41 +f 83//20 79//20 101//20 +f 88//37 82//37 85//37 +f 101//22 86//22 83//22 +f 91//42 82//42 88//42 +f 101//24 89//24 86//24 +f 94//39 82//39 91//39 +f 101//25 92//25 89//25 +f 97//27 82//27 94//27 +f 101//28 95//28 92//28 +f 101//29 98//29 95//29 +f 100//32 82//32 97//32 +f 104//43 82//43 100//43 +f 101//16 102//16 98//16 +f 101//18 79//18 102//18 +f 79//44 80//44 103//44 +f 79//44 103//44 102//44 +f 80//45 81//45 104//45 +f 80//45 104//45 103//45 +f 81//17 82//17 104//17 o WEST_torch_Cylinder v -0.495644 0.450610 -0.000061 v -0.494772 0.450445 -0.002204 @@ -620,112 +729,266 @@ vt -1.022835 -0.989388 vt -1.023098 -1.272758 vt -0.779351 -1.465417 +vn 1.000000 0.000000 -0.000016 +vn -1.000000 0.000000 0.000000 +vn 1.000000 0.000014 -0.000008 +vn 1.000000 0.000014 0.000008 +vn 1.000000 -0.000000 0.000016 +vn 0.000000 -0.866022 -0.500005 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.866022 -0.500006 +vn -0.000000 0.866022 0.500006 +vn -0.000000 0.000001 1.000000 +vn -0.000000 -0.866022 0.500006 +vn -0.000000 -0.866028 0.499995 +vn 0.000000 -0.866028 -0.499995 +vn 1.000000 -0.000014 0.000008 +vn 1.000000 0.000000 0.000000 +vn 1.000000 -0.000014 -0.000008 +vn 0.185874 0.982574 -0.000001 +vn 0.185873 0.982574 0.000001 +vn 0.185880 0.982573 0.000011 +vn 0.185889 0.982571 0.000006 +vn 0.185889 0.982571 -0.000006 +vn 0.185880 0.982572 -0.000011 +vn 0.185873 0.982574 -0.000001 +vn 0.185874 0.982574 0.000002 +vn -0.900229 0.208191 0.382419 +vn -0.368833 0.107666 0.923239 +vn 0.382675 -0.034497 0.923239 +vn 0.914071 -0.135022 0.382418 +vn 0.914071 -0.135022 -0.382417 +vn 0.382675 -0.034497 -0.923239 +vn -0.368833 0.107666 -0.923239 +vn -0.900229 0.208191 -0.382419 +vn -0.185858 -0.982543 0.000000 +vn -0.986328 0.164769 0.000000 +vn -0.698599 0.110324 -0.706931 +vn -0.003967 -0.021058 -0.999756 +vn 0.690634 -0.152440 -0.706931 +vn 0.978362 -0.206885 0.000000 +vn 0.690634 -0.152440 0.706931 +vn -0.003967 -0.021058 0.999756 +vn -0.698599 0.110324 0.706931 +vn -0.769677 -0.638417 0.000000 +vn -0.586169 -0.673116 0.450850 +vn -0.143162 -0.756920 0.637593 +vn 0.299783 -0.840724 0.450850 +vn 0.483291 -0.875423 0.000000 +vn 0.299783 -0.840724 -0.450850 +vn -0.143193 -0.756920 -0.637593 +vn -0.143162 -0.756920 -0.637593 +vn -0.586169 -0.673116 -0.450850 +vn -0.694784 0.131413 -0.707083 +vn -0.982543 0.185858 0.000000 +vn 0.694754 -0.131413 -0.707083 +vn 0.694784 -0.131413 -0.707083 +vn 0.982543 -0.185858 0.000000 +vn 0.694754 -0.131413 0.707083 +vn 0.694784 -0.131413 0.707083 +vn 0.000000 0.000000 1.000000 +vn -0.694784 0.131413 0.707083 +vn -0.319559 -0.947539 0.000000 +vn -0.279885 -0.955046 0.097476 +vn -0.184088 -0.973174 0.137852 +vn -0.088290 -0.991302 0.097476 +vn -0.048616 -0.998810 0.000000 +vn -0.088290 -0.991302 -0.097476 +vn -0.184088 -0.973174 -0.137852 +vn -0.279885 -0.955046 -0.097476 +vn -0.645680 0.763573 0.000000 +vn -0.422254 0.721305 -0.548967 +vn 0.117130 0.619251 -0.776360 +vn 0.656545 0.517228 -0.548967 +vn 0.880001 0.474960 0.000000 +vn 0.656545 0.517228 0.548967 +vn 0.117130 0.619251 0.776360 +vn -0.422254 0.721305 0.548967 +vn -0.410779 0.734489 0.540147 +vn 0.119938 0.634083 -0.763878 +vn -0.410779 0.734489 -0.540147 +vn -0.630634 0.776055 0.000000 +vn 0.650685 0.533677 0.540147 +vn 0.870510 0.492080 0.000000 +vn 0.650685 0.533677 -0.540147 +vn 0.119938 0.634083 0.763878 usemtl torch_material_rustiron.jpg s off -f 230/1 218/2 219/3 -f 231/4 225/5 224/6 -f 230/1 219/3 220/7 -f 231/4 226/8 225/5 -f 230/1 220/7 221/9 -f 231/4 227/10 226/8 -f 230/1 221/9 222/11 -f 231/4 228/12 227/10 -f 230/1 222/11 223/13 -f 231/4 229/14 228/12 -f 230/1 223/13 218/2 -f 231/4 224/6 229/14 -f 218/15 224/16 225/17 219/18 -f 219/19 225/20 226/21 220/22 -f 220/22 226/21 227/23 221/24 -f 221/25 227/26 228/27 222/28 -f 222/28 228/27 229/29 223/30 -f 223/31 229/32 224/16 218/15 -f 240/33 234/34 239/35 245/36 -f 241/37 235/38 234/39 240/40 -f 242/41 236/42 235/38 241/37 -f 243/43 237/44 236/45 242/46 -f 244/47 238/48 237/44 243/43 -f 245/36 239/35 238/49 244/50 -f 232/51 239/52 234/53 -f 233/54 240/55 245/56 -f 232/51 234/53 235/57 -f 233/54 241/58 240/55 -f 232/51 235/57 236/59 -f 233/54 242/60 241/58 -f 232/51 236/59 237/61 -f 233/54 243/62 242/60 -f 232/51 237/61 238/63 -f 233/54 244/64 243/62 -f 232/51 238/63 239/52 -f 233/54 245/56 244/64 -f 146/65 153/66 247/67 246/68 -f 153/66 152/69 248/70 247/67 -f 152/69 151/71 249/72 248/70 -f 151/71 150/73 250/74 249/72 -f 150/73 149/75 251/76 250/74 -f 149/75 148/77 252/78 251/76 -f 148/77 147/79 253/80 252/78 -f 147/79 146/65 246/68 253/80 -f 212/81 213/82 250/83 251/84 -f 211/85 212/86 251/76 252/78 -f 210/87 211/88 252/89 253/90 -f 210/87 253/90 246/91 217/92 -f 216/93 217/92 246/91 247/94 -f 215/95 216/96 247/97 248/98 -f 214/99 215/95 248/98 249/100 -f 213/82 214/101 249/102 250/83 +f 230/1/46 218/2/46 219/3/46 +f 231/4/47 225/5/47 224/6/47 +f 230/1/46 219/3/46 220/7/46 +f 231/4/47 226/8/47 225/5/47 +f 230/1/48 220/7/48 221/9/48 +f 231/4/47 227/10/47 226/8/47 +f 230/1/49 221/9/49 222/11/49 +f 231/4/47 228/12/47 227/10/47 +f 230/1/50 222/11/50 223/13/50 +f 231/4/47 229/14/47 228/12/47 +f 230/1/50 223/13/50 218/2/50 +f 231/4/47 224/6/47 229/14/47 +f 218/15/51 224/16/51 225/17/51 +f 218/15/51 225/17/51 219/18/51 +f 219/19/52 225/20/52 226/21/52 +f 219/19/52 226/21/52 220/22/52 +f 220/22/53 226/21/53 227/23/53 +f 220/22/53 227/23/53 221/24/53 +f 221/25/54 227/26/54 228/27/54 +f 221/25/54 228/27/54 222/28/54 +f 222/28/55 228/27/55 229/29/55 +f 222/28/55 229/29/55 223/30/55 +f 223/31/56 229/32/56 224/16/56 +f 223/31/56 224/16/56 218/15/56 +f 240/33/57 234/34/57 239/35/57 +f 240/33/57 239/35/57 245/36/57 +f 241/37/55 235/38/55 234/39/55 +f 241/37/55 234/39/55 240/40/55 +f 242/41/54 236/42/54 235/38/54 +f 242/41/54 235/38/54 241/37/54 +f 243/43/53 237/44/53 236/45/53 +f 243/43/53 236/45/53 242/46/53 +f 244/47/52 238/48/52 237/44/52 +f 244/47/52 237/44/52 243/43/52 +f 245/36/58 239/35/58 238/49/58 +f 245/36/58 238/49/58 244/50/58 +f 232/51/47 239/52/47 234/53/47 +f 233/54/50 240/55/50 245/56/50 +f 232/51/47 234/53/47 235/57/47 +f 233/54/59 241/58/59 240/55/59 +f 232/51/47 235/57/47 236/59/47 +f 233/54/60 242/60/60 241/58/60 +f 232/51/47 236/59/47 237/61/47 +f 233/54/60 243/62/60 242/60/60 +f 232/51/47 237/61/47 238/63/47 +f 233/54/61 244/64/61 243/62/61 +f 232/51/47 238/63/47 239/52/47 +f 233/54/46 245/56/46 244/64/46 +f 146/65/62 153/66/62 247/67/62 +f 146/65/62 247/67/62 246/68/62 +f 153/66/63 152/69/63 248/70/63 +f 153/66/63 248/70/63 247/67/63 +f 152/69/64 151/71/64 249/72/64 +f 152/69/64 249/72/64 248/70/64 +f 151/71/65 150/73/65 250/74/65 +f 151/71/65 250/74/65 249/72/65 +f 150/73/66 149/75/66 251/76/66 +f 150/73/66 251/76/66 250/74/66 +f 149/75/67 148/77/67 252/78/67 +f 149/75/67 252/78/67 251/76/67 +f 148/77/68 147/79/68 253/80/68 +f 148/77/68 253/80/68 252/78/68 +f 147/79/69 146/65/69 246/68/69 +f 147/79/69 246/68/69 253/80/69 +f 212/81/70 213/82/70 250/83/70 +f 212/81/70 250/83/70 251/84/70 +f 211/85/71 212/86/71 251/76/71 +f 211/85/71 251/76/71 252/78/71 +f 210/87/72 211/88/72 252/89/72 +f 210/87/72 252/89/72 253/90/72 +f 210/87/73 253/90/73 246/91/73 +f 210/87/73 246/91/73 217/92/73 +f 216/93/74 217/92/74 246/91/74 +f 216/93/74 246/91/74 247/94/74 +f 215/95/75 216/96/75 247/97/75 +f 215/95/75 247/97/75 248/98/75 +f 214/99/76 215/95/76 248/98/76 +f 214/99/76 248/98/76 249/100/76 +f 213/82/77 214/101/77 249/102/77 +f 213/82/77 249/102/77 250/83/77 s 1 -f 121/103 105/104 106/105 -f 121/103 106/105 107/106 -f 121/103 107/106 108/107 -f 121/103 108/107 109/108 -f 121/103 109/108 110/109 -f 121/103 110/109 111/110 -f 121/103 111/110 112/111 -f 112/111 105/104 121/103 -f 162/112 113/113 114/114 169/115 -f 169/116 114/117 115/118 168/119 -f 168/119 115/118 116/120 167/121 -f 167/122 116/123 117/124 166/125 -f 166/125 117/124 118/126 165/127 -f 165/127 118/126 119/128 164/129 -f 164/130 119/131 120/132 163/133 -f 113/113 162/112 163/134 120/135 -f 170/136 171/137 123/138 122/139 -f 171/140 172/141 124/142 123/143 -f 172/141 173/144 125/145 124/142 -f 173/144 174/146 126/147 125/145 -f 174/146 175/148 127/149 126/147 -f 175/148 176/150 128/151 127/149 -f 176/152 177/153 129/154 128/155 -f 177/156 170/136 122/139 129/157 -f 179/158 178/159 130/160 131/161 -f 180/162 179/163 131/164 132/165 -f 181/166 180/162 132/165 133/167 -f 182/168 181/169 133/170 134/171 -f 183/172 182/168 134/171 135/173 -f 184/174 183/172 135/173 136/175 -f 185/176 184/177 136/178 137/179 -f 178/159 185/180 137/181 130/160 -f 186/182 187/183 139/184 138/185 -f 187/183 188/186 140/187 139/184 -f 188/186 189/188 141/189 140/187 -f 189/188 190/190 142/191 141/189 -f 190/190 191/192 143/193 142/191 -f 191/192 192/194 144/195 143/193 -f 192/194 193/196 145/197 144/195 -f 193/196 186/182 138/185 145/197 -f 195/198 194/199 146/200 147/201 -f 196/202 195/203 147/204 148/205 -f 197/206 196/202 148/205 149/207 -f 198/208 197/209 149/210 150/211 -f 199/212 198/208 150/211 151/213 -f 200/214 199/212 151/213 152/215 -f 201/216 200/217 152/69 153/66 -f 194/199 201/218 153/219 146/200 -f 212/86 215/220 214/221 213/222 -f 210/223 217/224 216/225 211/85 -f 211/85 216/225 215/220 212/86 +f 121/103/78 105/104/78 106/105/78 +f 121/103/78 106/105/78 107/106/78 +f 121/103/78 107/106/78 108/107/78 +f 121/103/78 108/107/78 109/108/78 +f 121/103/78 109/108/78 110/109/78 +f 121/103/78 110/109/78 111/110/78 +f 121/103/78 111/110/78 112/111/78 +f 112/111/78 105/104/78 121/103/78 +f 162/112/79 113/113/79 114/114/80 +f 162/112/79 114/114/80 169/115/80 +f 169/116/80 114/117/80 115/118/81 +f 169/116/80 115/118/81 168/119/81 +f 168/119/81 115/118/81 116/120/82 +f 168/119/81 116/120/82 167/121/82 +f 167/122/82 116/123/82 117/124/83 +f 167/122/82 117/124/83 166/125/83 +f 166/125/83 117/124/83 118/126/84 +f 166/125/83 118/126/84 165/127/84 +f 165/127/84 118/126/84 119/128/85 +f 165/127/84 119/128/85 164/129/85 +f 164/130/85 119/131/85 120/132/86 +f 164/130/85 120/132/86 163/133/86 +f 113/113/79 162/112/79 163/134/86 +f 113/113/79 163/134/86 120/135/86 +f 170/136/87 171/137/88 123/138/88 +f 170/136/87 123/138/88 122/139/87 +f 171/140/88 172/141/89 124/142/89 +f 171/140/88 124/142/89 123/143/88 +f 172/141/89 173/144/90 125/145/90 +f 172/141/89 125/145/90 124/142/89 +f 173/144/90 174/146/91 126/147/91 +f 173/144/90 126/147/91 125/145/90 +f 174/146/91 175/148/92 127/149/92 +f 174/146/91 127/149/92 126/147/91 +f 175/148/92 176/150/93 128/151/94 +f 175/148/92 128/151/94 127/149/92 +f 176/152/93 177/153/95 129/154/95 +f 176/152/93 129/154/95 128/155/94 +f 177/156/95 170/136/87 122/139/87 +f 177/156/95 122/139/87 129/157/95 +f 179/158/96 178/159/97 130/160/97 +f 179/158/96 130/160/97 131/161/96 +f 180/162/52 179/163/96 131/164/96 +f 180/162/52 131/164/96 132/165/52 +f 181/166/98 180/162/52 132/165/52 +f 181/166/98 132/165/52 133/167/99 +f 182/168/100 181/169/98 133/170/99 +f 182/168/100 133/170/99 134/171/100 +f 183/172/101 182/168/100 134/171/100 +f 183/172/101 134/171/100 135/173/102 +f 184/174/103 183/172/101 135/173/102 +f 184/174/103 135/173/102 136/175/103 +f 185/176/104 184/177/103 136/178/103 +f 185/176/104 136/178/103 137/179/104 +f 178/159/97 185/180/104 137/181/104 +f 178/159/97 137/181/104 130/160/97 +f 186/182/105 187/183/106 139/184/106 +f 186/182/105 139/184/106 138/185/105 +f 187/183/106 188/186/107 140/187/107 +f 187/183/106 140/187/107 139/184/106 +f 188/186/107 189/188/108 141/189/108 +f 188/186/107 141/189/108 140/187/107 +f 189/188/108 190/190/109 142/191/109 +f 189/188/108 142/191/109 141/189/108 +f 190/190/109 191/192/110 143/193/110 +f 190/190/109 143/193/110 142/191/109 +f 191/192/110 192/194/111 144/195/111 +f 191/192/110 144/195/111 143/193/110 +f 192/194/111 193/196/112 145/197/112 +f 192/194/111 145/197/112 144/195/111 +f 193/196/112 186/182/105 138/185/105 +f 193/196/112 138/185/105 145/197/112 +f 195/198/96 194/199/97 146/200/113 +f 195/198/96 146/200/113 147/201/114 +f 196/202/52 195/203/96 147/204/114 +f 196/202/52 147/204/114 148/205/115 +f 197/206/99 196/202/52 148/205/115 +f 197/206/99 148/205/115 149/207/116 +f 198/208/100 197/209/99 149/210/116 +f 198/208/100 149/210/116 150/211/117 +f 199/212/101 198/208/100 150/211/117 +f 199/212/101 150/211/117 151/213/118 +f 200/214/103 199/212/101 151/213/118 +f 200/214/103 151/213/118 152/215/119 +f 201/216/104 200/217/103 152/69/119 +f 201/216/104 152/69/119 153/66/120 +f 194/199/97 201/218/104 153/219/120 +f 194/199/97 153/219/120 146/200/113 +f 212/86/121 215/220/122 214/221/123 +f 212/86/121 214/221/123 213/222/124 +f 210/223/125 217/224/126 216/225/127 +f 210/223/125 216/225/127 211/85/128 +f 211/85/128 216/225/127 215/220/122 +f 211/85/128 215/220/122 212/86/121 f 154 155 o EAST_torch_Cylinder v 0.495314 0.450610 -0.000061 @@ -1102,112 +1365,258 @@ vt -1.022835 -0.989388 vt -1.023098 -1.272758 vt -0.779351 -1.465417 +vn -1.000000 0.000000 0.000016 +vn -1.000000 0.000014 0.000008 +vn -1.000000 0.000014 -0.000008 +vn -1.000000 0.000000 -0.000016 +vn 0.000000 -0.866022 0.500005 +vn 0.000000 0.000001 -1.000000 +vn -0.000000 -0.866022 -0.500006 +vn -1.000000 -0.000014 -0.000008 +vn -1.000000 -0.000014 0.000008 +vn -0.185874 0.982574 0.000001 +vn -0.185873 0.982574 -0.000001 +vn -0.185880 0.982572 -0.000011 +vn -0.185889 0.982571 -0.000006 +vn -0.185889 0.982571 0.000006 +vn -0.185880 0.982572 0.000011 +vn -0.185873 0.982574 0.000001 +vn -0.185874 0.982574 -0.000002 +vn 0.900229 0.208191 -0.382419 +vn 0.368833 0.107666 -0.923239 +vn -0.382675 -0.034497 -0.923239 +vn -0.914071 -0.135022 -0.382418 +vn -0.914071 -0.135022 0.382417 +vn -0.382675 -0.034497 0.923239 +vn 0.368833 0.107666 0.923239 +vn 0.900229 0.208191 0.382419 +vn 0.185858 -0.982543 0.000000 +vn 0.986328 0.164769 0.000000 +vn 0.698599 0.110324 0.706931 +vn 0.003967 -0.021058 0.999756 +vn -0.690634 -0.152440 0.706931 +vn -0.978362 -0.206885 0.000000 +vn -0.690634 -0.152440 -0.706931 +vn 0.003967 -0.021058 -0.999756 +vn 0.698599 0.110324 -0.706931 +vn 0.769677 -0.638417 0.000000 +vn 0.586169 -0.673116 -0.450850 +vn 0.143162 -0.756920 -0.637593 +vn -0.299783 -0.840724 -0.450850 +vn -0.483291 -0.875423 0.000000 +vn -0.299783 -0.840724 0.450850 +vn 0.143193 -0.756920 0.637593 +vn 0.143162 -0.756920 0.637593 +vn 0.586169 -0.673116 0.450850 +vn 0.694784 0.131413 0.707083 +vn 0.982543 0.185858 0.000000 +vn -0.694754 -0.131413 0.707083 +vn -0.694784 -0.131413 0.707083 +vn -0.982543 -0.185858 0.000000 +vn -0.694754 -0.131413 -0.707083 +vn -0.694784 -0.131413 -0.707083 +vn 0.694784 0.131413 -0.707083 +vn 0.319559 -0.947539 0.000000 +vn 0.279885 -0.955046 -0.097476 +vn 0.184088 -0.973174 -0.137852 +vn 0.088290 -0.991302 -0.097476 +vn 0.048616 -0.998810 0.000000 +vn 0.088290 -0.991302 0.097476 +vn 0.184088 -0.973174 0.137852 +vn 0.279885 -0.955046 0.097476 +vn 0.645680 0.763573 0.000000 +vn 0.422254 0.721305 0.548967 +vn -0.117130 0.619251 0.776360 +vn -0.656545 0.517228 0.548967 +vn -0.880001 0.474960 0.000000 +vn -0.656545 0.517228 -0.548967 +vn -0.117130 0.619251 -0.776360 +vn 0.422254 0.721305 -0.548967 +vn 0.410779 0.734489 -0.540147 +vn -0.119938 0.634083 0.763878 +vn 0.410779 0.734489 0.540147 +vn 0.630634 0.776055 0.000000 +vn -0.650685 0.533677 -0.540147 +vn -0.870510 0.492080 0.000000 +vn -0.650685 0.533677 0.540147 +vn -0.119938 0.634083 -0.763878 usemtl torch_material_rustiron.jpg s off -f 379/226 367/227 368/228 -f 380/229 374/230 373/231 -f 379/226 368/228 369/232 -f 380/229 375/233 374/230 -f 379/226 369/232 370/234 -f 380/229 376/235 375/233 -f 379/226 370/234 371/236 -f 380/229 377/237 376/235 -f 379/226 371/236 372/238 -f 380/229 378/239 377/237 -f 379/226 372/238 367/227 -f 380/229 373/231 378/239 -f 367/240 373/241 374/242 368/243 -f 368/244 374/245 375/246 369/247 -f 369/247 375/246 376/248 370/249 -f 370/250 376/251 377/252 371/253 -f 371/253 377/252 378/254 372/255 -f 372/256 378/257 373/241 367/240 -f 389/258 383/259 388/260 394/261 -f 390/262 384/263 383/264 389/265 -f 391/266 385/267 384/263 390/262 -f 392/268 386/269 385/270 391/271 -f 393/272 387/273 386/269 392/268 -f 394/261 388/260 387/274 393/275 -f 381/276 388/277 383/278 -f 382/279 389/280 394/281 -f 381/276 383/278 384/282 -f 382/279 390/283 389/280 -f 381/276 384/282 385/284 -f 382/279 391/285 390/283 -f 381/276 385/284 386/286 -f 382/279 392/287 391/285 -f 381/276 386/286 387/288 -f 382/279 393/289 392/287 -f 381/276 387/288 388/277 -f 382/279 394/281 393/289 -f 295/290 302/291 396/292 395/293 -f 302/291 301/294 397/295 396/292 -f 301/294 300/296 398/297 397/295 -f 300/296 299/298 399/299 398/297 -f 299/298 298/300 400/301 399/299 -f 298/300 297/302 401/303 400/301 -f 297/302 296/304 402/305 401/303 -f 296/304 295/290 395/293 402/305 -f 361/306 362/307 399/308 400/309 -f 360/310 361/311 400/301 401/303 -f 359/312 360/313 401/314 402/315 -f 359/312 402/315 395/316 366/317 -f 365/318 366/317 395/316 396/319 -f 364/320 365/321 396/322 397/323 -f 363/324 364/320 397/323 398/325 -f 362/307 363/326 398/327 399/308 +f 379/226/129 367/227/129 368/228/129 +f 380/229/60 374/230/60 373/231/60 +f 379/226/129 368/228/129 369/232/129 +f 380/229/60 375/233/60 374/230/60 +f 379/226/130 369/232/130 370/234/130 +f 380/229/60 376/235/60 375/233/60 +f 379/226/131 370/234/131 371/236/131 +f 380/229/60 377/237/60 376/235/60 +f 379/226/132 371/236/132 372/238/132 +f 380/229/60 378/239/60 377/237/60 +f 379/226/132 372/238/132 367/227/132 +f 380/229/60 373/231/60 378/239/60 +f 367/240/133 373/241/133 374/242/133 +f 367/240/133 374/242/133 368/243/133 +f 368/244/103 374/245/103 375/246/103 +f 368/244/103 375/246/103 369/247/103 +f 369/247/54 375/246/54 376/248/54 +f 369/247/54 376/248/54 370/249/54 +f 370/250/53 376/251/53 377/252/53 +f 370/250/53 377/252/53 371/253/53 +f 371/253/134 377/252/134 378/254/134 +f 371/253/134 378/254/134 372/255/134 +f 372/256/135 378/257/135 373/241/135 +f 372/256/135 373/241/135 367/240/135 +f 389/258/58 383/259/58 388/260/58 +f 389/258/58 388/260/58 394/261/58 +f 390/262/134 384/263/134 383/264/134 +f 390/262/134 383/264/134 389/265/134 +f 391/266/53 385/267/53 384/263/53 +f 391/266/53 384/263/53 390/262/53 +f 392/268/54 386/269/54 385/270/54 +f 392/268/54 385/270/54 391/271/54 +f 393/272/103 387/273/103 386/269/103 +f 393/272/103 386/269/103 392/268/103 +f 394/261/57 388/260/57 387/274/57 +f 394/261/57 387/274/57 393/275/57 +f 381/276/60 388/277/60 383/278/60 +f 382/279/132 389/280/132 394/281/132 +f 381/276/60 383/278/60 384/282/60 +f 382/279/136 390/283/136 389/280/136 +f 381/276/60 384/282/60 385/284/60 +f 382/279/47 391/285/47 390/283/47 +f 381/276/60 385/284/60 386/286/60 +f 382/279/47 392/287/47 391/285/47 +f 381/276/60 386/286/60 387/288/60 +f 382/279/137 393/289/137 392/287/137 +f 381/276/60 387/288/60 388/277/60 +f 382/279/129 394/281/129 393/289/129 +f 295/290/138 302/291/138 396/292/138 +f 295/290/138 396/292/138 395/293/138 +f 302/291/139 301/294/139 397/295/139 +f 302/291/139 397/295/139 396/292/139 +f 301/294/140 300/296/140 398/297/140 +f 301/294/140 398/297/140 397/295/140 +f 300/296/141 299/298/141 399/299/141 +f 300/296/141 399/299/141 398/297/141 +f 299/298/142 298/300/142 400/301/142 +f 299/298/142 400/301/142 399/299/142 +f 298/300/143 297/302/143 401/303/143 +f 298/300/143 401/303/143 400/301/143 +f 297/302/144 296/304/144 402/305/144 +f 297/302/144 402/305/144 401/303/144 +f 296/304/145 295/290/145 395/293/145 +f 296/304/145 395/293/145 402/305/145 +f 361/306/146 362/307/146 399/308/146 +f 361/306/146 399/308/146 400/309/146 +f 360/310/147 361/311/147 400/301/147 +f 360/310/147 400/301/147 401/303/147 +f 359/312/148 360/313/148 401/314/148 +f 359/312/148 401/314/148 402/315/148 +f 359/312/149 402/315/149 395/316/149 +f 359/312/149 395/316/149 366/317/149 +f 365/318/150 366/317/150 395/316/150 +f 365/318/150 395/316/150 396/319/150 +f 364/320/151 365/321/151 396/322/151 +f 364/320/151 396/322/151 397/323/151 +f 363/324/152 364/320/152 397/323/152 +f 363/324/152 397/323/152 398/325/152 +f 362/307/153 363/326/153 398/327/153 +f 362/307/153 398/327/153 399/308/153 s 1 -f 270/328 254/329 255/330 -f 270/328 255/330 256/331 -f 270/328 256/331 257/332 -f 270/328 257/332 258/333 -f 270/328 258/333 259/334 -f 270/328 259/334 260/335 -f 270/328 260/335 261/336 -f 261/336 254/329 270/328 -f 311/337 262/338 263/339 318/340 -f 318/341 263/342 264/343 317/344 -f 317/344 264/343 265/345 316/346 -f 316/347 265/348 266/349 315/350 -f 315/350 266/349 267/351 314/352 -f 314/352 267/351 268/353 313/354 -f 313/355 268/356 269/357 312/358 -f 262/338 311/337 312/359 269/360 -f 319/361 320/362 272/363 271/364 -f 320/365 321/366 273/367 272/368 -f 321/366 322/369 274/370 273/367 -f 322/369 323/371 275/372 274/370 -f 323/371 324/373 276/374 275/372 -f 324/373 325/375 277/376 276/374 -f 325/377 326/378 278/379 277/380 -f 326/381 319/361 271/364 278/382 -f 328/383 327/384 279/385 280/386 -f 329/387 328/388 280/389 281/390 -f 330/391 329/387 281/390 282/392 -f 331/393 330/394 282/395 283/396 -f 332/397 331/393 283/396 284/398 -f 333/399 332/397 284/398 285/400 -f 334/401 333/402 285/403 286/404 -f 327/384 334/405 286/406 279/385 -f 335/407 336/408 288/409 287/410 -f 336/408 337/411 289/412 288/409 -f 337/411 338/413 290/414 289/412 -f 338/413 339/415 291/416 290/414 -f 339/415 340/417 292/418 291/416 -f 340/417 341/419 293/420 292/418 -f 341/419 342/421 294/422 293/420 -f 342/421 335/407 287/410 294/422 -f 344/423 343/424 295/425 296/426 -f 345/427 344/428 296/429 297/430 -f 346/431 345/427 297/430 298/432 -f 347/433 346/434 298/435 299/436 -f 348/437 347/433 299/436 300/438 -f 349/439 348/437 300/438 301/440 -f 350/441 349/442 301/294 302/291 -f 343/424 350/443 302/444 295/425 -f 361/311 364/445 363/446 362/447 -f 359/448 366/449 365/450 360/310 -f 360/310 365/450 364/445 361/311 +f 270/328/154 254/329/154 255/330/154 +f 270/328/154 255/330/154 256/331/154 +f 270/328/154 256/331/154 257/332/154 +f 270/328/154 257/332/154 258/333/154 +f 270/328/154 258/333/154 259/334/154 +f 270/328/154 259/334/154 260/335/154 +f 270/328/154 260/335/154 261/336/154 +f 261/336/154 254/329/154 270/328/154 +f 311/337/155 262/338/155 263/339/156 +f 311/337/155 263/339/156 318/340/156 +f 318/341/156 263/342/156 264/343/157 +f 318/341/156 264/343/157 317/344/157 +f 317/344/157 264/343/157 265/345/158 +f 317/344/157 265/345/158 316/346/158 +f 316/347/158 265/348/158 266/349/159 +f 316/347/158 266/349/159 315/350/159 +f 315/350/159 266/349/159 267/351/160 +f 315/350/159 267/351/160 314/352/160 +f 314/352/160 267/351/160 268/353/161 +f 314/352/160 268/353/161 313/354/161 +f 313/355/161 268/356/161 269/357/162 +f 313/355/161 269/357/162 312/358/162 +f 262/338/155 311/337/155 312/359/162 +f 262/338/155 312/359/162 269/360/162 +f 319/361/163 320/362/164 272/363/164 +f 319/361/163 272/363/164 271/364/163 +f 320/365/164 321/366/165 273/367/165 +f 320/365/164 273/367/165 272/368/164 +f 321/366/165 322/369/166 274/370/166 +f 321/366/165 274/370/166 273/367/165 +f 322/369/166 323/371/167 275/372/167 +f 322/369/166 275/372/167 274/370/166 +f 323/371/167 324/373/168 276/374/168 +f 323/371/167 276/374/168 275/372/167 +f 324/373/168 325/375/169 277/376/170 +f 324/373/168 277/376/170 276/374/168 +f 325/377/169 326/378/171 278/379/171 +f 325/377/169 278/379/171 277/380/170 +f 326/381/171 319/361/163 271/364/163 +f 326/381/171 271/364/163 278/382/171 +f 328/383/172 327/384/173 279/385/173 +f 328/383/172 279/385/173 280/386/172 +f 329/387/103 328/388/172 280/389/172 +f 329/387/103 280/389/172 281/390/103 +f 330/391/174 329/387/103 281/390/103 +f 330/391/174 281/390/103 282/392/175 +f 331/393/176 330/394/174 282/395/175 +f 331/393/176 282/395/175 283/396/176 +f 332/397/177 331/393/176 283/396/176 +f 332/397/177 283/396/176 284/398/178 +f 333/399/52 332/397/177 284/398/178 +f 333/399/52 284/398/178 285/400/52 +f 334/401/179 333/402/52 285/403/52 +f 334/401/179 285/403/52 286/404/179 +f 327/384/173 334/405/179 286/406/179 +f 327/384/173 286/406/179 279/385/173 +f 335/407/180 336/408/181 288/409/181 +f 335/407/180 288/409/181 287/410/180 +f 336/408/181 337/411/182 289/412/182 +f 336/408/181 289/412/182 288/409/181 +f 337/411/182 338/413/183 290/414/183 +f 337/411/182 290/414/183 289/412/182 +f 338/413/183 339/415/184 291/416/184 +f 338/413/183 291/416/184 290/414/183 +f 339/415/184 340/417/185 292/418/185 +f 339/415/184 292/418/185 291/416/184 +f 340/417/185 341/419/186 293/420/186 +f 340/417/185 293/420/186 292/418/185 +f 341/419/186 342/421/187 294/422/187 +f 341/419/186 294/422/187 293/420/186 +f 342/421/187 335/407/180 287/410/180 +f 342/421/187 287/410/180 294/422/187 +f 344/423/172 343/424/173 295/425/188 +f 344/423/172 295/425/188 296/426/189 +f 345/427/103 344/428/172 296/429/189 +f 345/427/103 296/429/189 297/430/190 +f 346/431/175 345/427/103 297/430/190 +f 346/431/175 297/430/190 298/432/191 +f 347/433/176 346/434/175 298/435/191 +f 347/433/176 298/435/191 299/436/192 +f 348/437/178 347/433/176 299/436/192 +f 348/437/178 299/436/192 300/438/193 +f 349/439/52 348/437/178 300/438/193 +f 349/439/52 300/438/193 301/440/194 +f 350/441/179 349/442/52 301/294/194 +f 350/441/179 301/294/194 302/291/195 +f 343/424/173 350/443/179 302/444/195 +f 343/424/173 302/444/195 295/425/188 +f 361/311/196 364/445/197 363/446/198 +f 361/311/196 363/446/198 362/447/199 +f 359/448/200 366/449/201 365/450/202 +f 359/448/200 365/450/202 360/310/203 +f 360/310/203 365/450/202 364/445/197 +f 360/310/203 364/445/197 361/311/196 f 303 304 o SOUTH_torch_Cylinder v -0.000165 0.450610 0.487722 @@ -1584,112 +1993,264 @@ vt -1.022835 -0.989388 vt -1.023098 -1.272758 vt -0.779351 -1.465417 +vn -0.000016 0.000000 -1.000000 +vn 0.000016 0.000000 1.000000 +vn 0.000008 0.000014 1.000000 +vn -0.000008 0.000014 -1.000000 +vn 0.000008 0.000014 -1.000000 +vn 0.000016 -0.000000 -1.000000 +vn -0.500005 -0.866022 -0.000000 +vn -0.500006 0.866022 -0.000000 +vn 0.500006 0.866022 0.000000 +vn 1.000000 0.000001 0.000000 +vn 0.500006 -0.866022 0.000000 +vn 0.499995 -0.866028 0.000000 +vn -0.499995 -0.866028 -0.000000 +vn 0.000008 -0.000014 -1.000000 +vn -0.000008 -0.000014 -1.000000 +vn -0.000001 0.982574 -0.185874 +vn 0.000002 0.982574 -0.185872 +vn 0.000012 0.982572 -0.185880 +vn 0.000006 0.982571 -0.185889 +vn -0.000006 0.982571 -0.185889 +vn -0.000011 0.982572 -0.185880 +vn -0.000001 0.982574 -0.185873 +vn 0.000002 0.982574 -0.185874 +vn 0.382418 0.208191 0.900229 +vn 0.923239 0.107666 0.368833 +vn 0.923239 -0.034497 -0.382675 +vn 0.382418 -0.135022 -0.914071 +vn -0.382417 -0.135022 -0.914071 +vn -0.923239 -0.034497 -0.382675 +vn -0.923239 0.107666 0.368833 +vn -0.382419 0.208191 0.900229 +vn 0.000000 -0.982543 0.185858 +vn 0.000000 0.164769 0.986328 +vn -0.706931 0.110324 0.698599 +vn -0.999756 -0.021058 0.003967 +vn -0.706931 -0.152440 -0.690634 +vn 0.000000 -0.206885 -0.978362 +vn 0.706931 -0.152440 -0.690634 +vn 0.999756 -0.021058 0.003967 +vn 0.706931 0.110324 0.698599 +vn 0.000000 -0.638417 0.769677 +vn 0.450850 -0.673116 0.586169 +vn 0.637593 -0.756920 0.143162 +vn 0.450850 -0.840724 -0.299783 +vn 0.000000 -0.875423 -0.483291 +vn -0.450850 -0.840724 -0.299783 +vn -0.637593 -0.756920 0.143162 +vn -0.450850 -0.673116 0.586169 +vn -0.707083 0.131413 0.694784 +vn 0.000000 0.185858 0.982543 +vn -0.707083 -0.131413 -0.694754 +vn -0.707083 -0.131413 -0.694784 +vn 0.000000 -0.185858 -0.982543 +vn 0.707083 -0.131413 -0.694754 +vn 0.707083 -0.131413 -0.694784 +vn 0.999969 0.000000 0.000000 +vn 0.707083 0.131413 0.694784 +vn 0.000000 -0.947539 0.319559 +vn 0.097476 -0.955046 0.279885 +vn 0.137852 -0.973174 0.184088 +vn 0.097476 -0.991302 0.088290 +vn 0.000000 -0.998810 0.048616 +vn -0.097476 -0.991302 0.088290 +vn -0.137852 -0.973174 0.184088 +vn -0.097476 -0.955046 0.279885 +vn 0.000000 0.763573 0.645680 +vn -0.548967 0.721305 0.422254 +vn -0.776360 0.619251 -0.117130 +vn -0.548967 0.517228 -0.656545 +vn 0.000000 0.474960 -0.880001 +vn 0.548967 0.517228 -0.656545 +vn 0.776360 0.619251 -0.117130 +vn 0.548967 0.721305 0.422254 +vn 0.540147 0.734489 0.410779 +vn -0.763878 0.634083 -0.119938 +vn -0.540147 0.734489 0.410779 +vn 0.000000 0.776055 0.630634 +vn 0.540147 0.533677 -0.650685 +vn 0.000000 0.492080 -0.870510 +vn -0.540147 0.533677 -0.650685 +vn 0.763878 0.634083 -0.119938 usemtl torch_material_rustiron.jpg s off -f 528/451 516/452 517/453 -f 529/454 523/455 522/456 -f 528/451 517/453 518/457 -f 529/454 524/458 523/455 -f 528/451 518/457 519/459 -f 529/454 525/460 524/458 -f 528/451 519/459 520/461 -f 529/454 526/462 525/460 -f 528/451 520/461 521/463 -f 529/454 527/464 526/462 -f 528/451 521/463 516/452 -f 529/454 522/456 527/464 -f 516/465 522/466 523/467 517/468 -f 517/469 523/470 524/471 518/472 -f 518/472 524/471 525/473 519/474 -f 519/475 525/476 526/477 520/478 -f 520/478 526/477 527/479 521/480 -f 521/481 527/482 522/466 516/465 -f 538/483 532/484 537/485 543/486 -f 539/487 533/488 532/489 538/490 -f 540/491 534/492 533/488 539/487 -f 541/493 535/494 534/495 540/496 -f 542/497 536/498 535/494 541/493 -f 543/486 537/485 536/499 542/500 -f 530/501 537/502 532/503 -f 531/504 538/505 543/506 -f 530/501 532/503 533/507 -f 531/504 539/508 538/505 -f 530/501 533/507 534/509 -f 531/504 540/510 539/508 -f 530/501 534/509 535/511 -f 531/504 541/512 540/510 -f 530/501 535/511 536/513 -f 531/504 542/514 541/512 -f 530/501 536/513 537/502 -f 531/504 543/506 542/514 -f 444/515 451/516 545/517 544/518 -f 451/516 450/519 546/520 545/517 -f 450/519 449/521 547/522 546/520 -f 449/521 448/523 548/524 547/522 -f 448/523 447/525 549/526 548/524 -f 447/525 446/527 550/528 549/526 -f 446/527 445/529 551/530 550/528 -f 445/529 444/515 544/518 551/530 -f 510/531 511/532 548/533 549/534 -f 509/535 510/536 549/526 550/528 -f 508/537 509/538 550/539 551/540 -f 508/537 551/540 544/541 515/542 -f 514/543 515/542 544/541 545/544 -f 513/545 514/546 545/547 546/548 -f 512/549 513/545 546/548 547/550 -f 511/532 512/551 547/552 548/533 +f 528/451/204 516/452/204 517/453/204 +f 529/454/205 523/455/205 522/456/205 +f 528/451/204 517/453/204 518/457/204 +f 529/454/206 524/458/206 523/455/206 +f 528/451/207 518/457/207 519/459/207 +f 529/454/103 525/460/103 524/458/103 +f 528/451/208 519/459/208 520/461/208 +f 529/454/103 526/462/103 525/460/103 +f 528/451/209 520/461/209 521/463/209 +f 529/454/103 527/464/103 526/462/103 +f 528/451/209 521/463/209 516/452/209 +f 529/454/103 522/456/103 527/464/103 +f 516/465/210 522/466/210 523/467/210 +f 516/465/210 523/467/210 517/468/210 +f 517/469/47 523/470/47 524/471/47 +f 517/469/47 524/471/47 518/472/47 +f 518/472/211 524/471/211 525/473/211 +f 518/472/211 525/473/211 519/474/211 +f 519/475/212 525/476/212 526/477/212 +f 519/475/212 526/477/212 520/478/212 +f 520/478/213 526/477/213 527/479/213 +f 520/478/213 527/479/213 521/480/213 +f 521/481/214 527/482/214 522/466/214 +f 521/481/214 522/466/214 516/465/214 +f 538/483/215 532/484/215 537/485/215 +f 538/483/215 537/485/215 543/486/215 +f 539/487/213 533/488/213 532/489/213 +f 539/487/213 532/489/213 538/490/213 +f 540/491/212 534/492/212 533/488/212 +f 540/491/212 533/488/212 539/487/212 +f 541/493/211 535/494/211 534/495/211 +f 541/493/211 534/495/211 540/496/211 +f 542/497/47 536/498/47 535/494/47 +f 542/497/47 535/494/47 541/493/47 +f 543/486/216 537/485/216 536/499/216 +f 543/486/216 536/499/216 542/500/216 +f 530/501/103 537/502/103 532/503/103 +f 531/504/209 538/505/209 543/506/209 +f 530/501/103 532/503/103 533/507/103 +f 531/504/217 539/508/217 538/505/217 +f 530/501/103 533/507/103 534/509/103 +f 531/504/52 540/510/52 539/508/52 +f 530/501/103 534/509/103 535/511/103 +f 531/504/52 541/512/52 540/510/52 +f 530/501/103 535/511/103 536/513/103 +f 531/504/218 542/514/218 541/512/218 +f 530/501/103 536/513/103 537/502/103 +f 531/504/204 543/506/204 542/514/204 +f 444/515/219 451/516/219 545/517/219 +f 444/515/219 545/517/219 544/518/219 +f 451/516/220 450/519/220 546/520/220 +f 451/516/220 546/520/220 545/517/220 +f 450/519/221 449/521/221 547/522/221 +f 450/519/221 547/522/221 546/520/221 +f 449/521/222 448/523/222 548/524/222 +f 449/521/222 548/524/222 547/522/222 +f 448/523/223 447/525/223 549/526/223 +f 448/523/223 549/526/223 548/524/223 +f 447/525/224 446/527/224 550/528/224 +f 447/525/224 550/528/224 549/526/224 +f 446/527/225 445/529/225 551/530/225 +f 446/527/225 551/530/225 550/528/225 +f 445/529/226 444/515/226 544/518/226 +f 445/529/226 544/518/226 551/530/226 +f 510/531/227 511/532/227 548/533/227 +f 510/531/227 548/533/227 549/534/227 +f 509/535/228 510/536/228 549/526/228 +f 509/535/228 549/526/228 550/528/228 +f 508/537/229 509/538/229 550/539/229 +f 508/537/229 550/539/229 551/540/229 +f 508/537/230 551/540/230 544/541/230 +f 508/537/230 544/541/230 515/542/230 +f 514/543/231 515/542/231 544/541/231 +f 514/543/231 544/541/231 545/544/231 +f 513/545/232 514/546/232 545/547/232 +f 513/545/232 545/547/232 546/548/232 +f 512/549/233 513/545/233 546/548/233 +f 512/549/233 546/548/233 547/550/233 +f 511/532/234 512/551/234 547/552/234 +f 511/532/234 547/552/234 548/533/234 s 1 -f 419/553 403/554 404/555 -f 419/553 404/555 405/556 -f 419/553 405/556 406/557 -f 419/553 406/557 407/558 -f 419/553 407/558 408/559 -f 419/553 408/559 409/560 -f 419/553 409/560 410/561 -f 410/561 403/554 419/553 -f 460/562 411/563 412/564 467/565 -f 467/566 412/567 413/568 466/569 -f 466/569 413/568 414/570 465/571 -f 465/572 414/573 415/574 464/575 -f 464/575 415/574 416/576 463/577 -f 463/577 416/576 417/578 462/579 -f 462/580 417/581 418/582 461/583 -f 411/563 460/562 461/584 418/585 -f 468/586 469/587 421/588 420/589 -f 469/590 470/591 422/592 421/593 -f 470/591 471/594 423/595 422/592 -f 471/594 472/596 424/597 423/595 -f 472/596 473/598 425/599 424/597 -f 473/598 474/600 426/601 425/599 -f 474/602 475/603 427/604 426/605 -f 475/606 468/586 420/589 427/607 -f 477/608 476/609 428/610 429/611 -f 478/612 477/613 429/614 430/615 -f 479/616 478/612 430/615 431/617 -f 480/618 479/619 431/620 432/621 -f 481/622 480/618 432/621 433/623 -f 482/624 481/622 433/623 434/625 -f 483/626 482/627 434/628 435/629 -f 476/609 483/630 435/631 428/610 -f 484/632 485/633 437/634 436/635 -f 485/633 486/636 438/637 437/634 -f 486/636 487/638 439/639 438/637 -f 487/638 488/640 440/641 439/639 -f 488/640 489/642 441/643 440/641 -f 489/642 490/644 442/645 441/643 -f 490/644 491/646 443/647 442/645 -f 491/646 484/632 436/635 443/647 -f 493/648 492/649 444/650 445/651 -f 494/652 493/653 445/654 446/655 -f 495/656 494/652 446/655 447/657 -f 496/658 495/659 447/660 448/661 -f 497/662 496/658 448/661 449/663 -f 498/664 497/662 449/663 450/665 -f 499/666 498/667 450/519 451/516 -f 492/649 499/668 451/669 444/650 -f 510/536 513/670 512/671 511/672 -f 508/673 515/674 514/675 509/535 -f 509/535 514/675 513/670 510/536 +f 419/553/235 403/554/235 404/555/235 +f 419/553/235 404/555/235 405/556/235 +f 419/553/235 405/556/235 406/557/235 +f 419/553/235 406/557/235 407/558/235 +f 419/553/235 407/558/235 408/559/235 +f 419/553/235 408/559/235 409/560/235 +f 419/553/235 409/560/235 410/561/235 +f 410/561/235 403/554/235 419/553/235 +f 460/562/236 411/563/236 412/564/237 +f 460/562/236 412/564/237 467/565/237 +f 467/566/237 412/567/237 413/568/238 +f 467/566/237 413/568/238 466/569/238 +f 466/569/238 413/568/238 414/570/239 +f 466/569/238 414/570/239 465/571/239 +f 465/572/239 414/573/239 415/574/240 +f 465/572/239 415/574/240 464/575/240 +f 464/575/240 415/574/240 416/576/241 +f 464/575/240 416/576/241 463/577/241 +f 463/577/241 416/576/241 417/578/242 +f 463/577/241 417/578/242 462/579/242 +f 462/580/242 417/581/242 418/582/243 +f 462/580/242 418/582/243 461/583/243 +f 411/563/236 460/562/236 461/584/243 +f 411/563/236 461/584/243 418/585/243 +f 468/586/244 469/587/245 421/588/245 +f 468/586/244 421/588/245 420/589/244 +f 469/590/245 470/591/246 422/592/246 +f 469/590/245 422/592/246 421/593/245 +f 470/591/246 471/594/247 423/595/247 +f 470/591/246 423/595/247 422/592/246 +f 471/594/247 472/596/248 424/597/248 +f 471/594/247 424/597/248 423/595/247 +f 472/596/248 473/598/249 425/599/249 +f 472/596/248 425/599/249 424/597/248 +f 473/598/249 474/600/250 426/601/250 +f 473/598/249 426/601/250 425/599/249 +f 474/602/250 475/603/251 427/604/251 +f 474/602/250 427/604/251 426/605/250 +f 475/606/251 468/586/244 420/589/244 +f 475/606/251 420/589/244 427/607/251 +f 477/608/252 476/609/253 428/610/253 +f 477/608/252 428/610/253 429/611/252 +f 478/612/47 477/613/252 429/614/252 +f 478/612/47 429/614/252 430/615/47 +f 479/616/254 478/612/47 430/615/47 +f 479/616/254 430/615/47 431/617/255 +f 480/618/256 479/619/254 431/620/255 +f 480/618/256 431/620/255 432/621/256 +f 481/622/257 480/618/256 432/621/256 +f 481/622/257 432/621/256 433/623/258 +f 482/624/259 481/622/257 433/623/258 +f 482/624/259 433/623/258 434/625/60 +f 483/626/260 482/627/259 434/628/60 +f 483/626/260 434/628/60 435/629/260 +f 476/609/253 483/630/260 435/631/260 +f 476/609/253 435/631/260 428/610/253 +f 484/632/261 485/633/262 437/634/262 +f 484/632/261 437/634/262 436/635/261 +f 485/633/262 486/636/263 438/637/263 +f 485/633/262 438/637/263 437/634/262 +f 486/636/263 487/638/264 439/639/264 +f 486/636/263 439/639/264 438/637/263 +f 487/638/264 488/640/265 440/641/265 +f 487/638/264 440/641/265 439/639/264 +f 488/640/265 489/642/266 441/643/266 +f 488/640/265 441/643/266 440/641/265 +f 489/642/266 490/644/267 442/645/267 +f 489/642/266 442/645/267 441/643/266 +f 490/644/267 491/646/268 443/647/268 +f 490/644/267 443/647/268 442/645/267 +f 491/646/268 484/632/261 436/635/261 +f 491/646/268 436/635/261 443/647/268 +f 493/648/252 492/649/253 444/650/269 +f 493/648/252 444/650/269 445/651/270 +f 494/652/47 493/653/252 445/654/270 +f 494/652/47 445/654/270 446/655/271 +f 495/656/255 494/652/47 446/655/271 +f 495/656/255 446/655/271 447/657/272 +f 496/658/256 495/659/255 447/660/272 +f 496/658/256 447/660/272 448/661/273 +f 497/662/257 496/658/256 448/661/273 +f 497/662/257 448/661/273 449/663/274 +f 498/664/60 497/662/257 449/663/274 +f 498/664/60 449/663/274 450/665/275 +f 499/666/260 498/667/60 450/519/275 +f 499/666/260 450/519/275 451/516/276 +f 492/649/253 499/668/260 451/669/276 +f 492/649/253 451/669/276 444/650/269 +f 510/536/277 513/670/278 512/671/279 +f 510/536/277 512/671/279 511/672/280 +f 508/673/281 515/674/282 514/675/283 +f 508/673/281 514/675/283 509/535/284 +f 509/535/284 514/675/283 513/670/278 +f 509/535/284 513/670/278 510/536/277 f 452 453 o NORTH_torch_Cylinder v -0.000165 0.450610 -0.495540 @@ -2066,110 +2627,254 @@ vt -1.022835 -0.989388 vt -1.023098 -1.272758 vt -0.779351 -1.465417 +vn -0.000008 0.000014 1.000000 +vn -0.000016 0.000000 1.000000 +vn 0.500005 -0.866022 -0.000000 +vn -1.000000 0.000001 -0.000000 +vn -0.500006 -0.866022 0.000000 +vn -0.000008 -0.000014 1.000000 +vn 0.000008 -0.000014 1.000000 +vn 0.000001 0.982574 0.185874 +vn -0.000001 0.982574 0.185873 +vn -0.000011 0.982572 0.185880 +vn -0.000006 0.982571 0.185889 +vn 0.000006 0.982571 0.185889 +vn 0.000011 0.982572 0.185880 +vn 0.000001 0.982574 0.185873 +vn -0.000002 0.982574 0.185874 +vn -0.382419 0.208191 -0.900229 +vn -0.923239 0.107666 -0.368833 +vn -0.923239 -0.034497 0.382675 +vn -0.382418 -0.135022 0.914071 +vn 0.382417 -0.135022 0.914071 +vn 0.923239 -0.034497 0.382675 +vn 0.923239 0.107666 -0.368833 +vn 0.382419 0.208191 -0.900229 +vn 0.000000 -0.982543 -0.185858 +vn 0.000000 0.164769 -0.986328 +vn 0.706931 0.110324 -0.698599 +vn 0.999756 -0.021058 -0.003967 +vn 0.706931 -0.152440 0.690634 +vn 0.000000 -0.206885 0.978362 +vn -0.706931 -0.152440 0.690634 +vn -0.999756 -0.021058 -0.003967 +vn -0.706931 0.110324 -0.698599 +vn 0.000000 -0.638417 -0.769677 +vn -0.450850 -0.673116 -0.586169 +vn -0.637593 -0.756920 -0.143162 +vn -0.450850 -0.840724 0.299783 +vn 0.000000 -0.875423 0.483291 +vn 0.450850 -0.840724 0.299783 +vn 0.637593 -0.756920 -0.143193 +vn 0.637593 -0.756920 -0.143162 +vn 0.450850 -0.673116 -0.586169 +vn 0.707083 0.131413 -0.694784 +vn 0.000000 0.185858 -0.982543 +vn 0.707083 -0.131413 0.694754 +vn 0.707083 -0.131413 0.694784 +vn 0.000000 -0.185858 0.982543 +vn -0.707083 -0.131413 0.694754 +vn -0.707083 -0.131413 0.694784 +vn -0.707083 0.131413 -0.694784 +vn 0.000000 -0.947539 -0.319559 +vn -0.097476 -0.955046 -0.279885 +vn -0.137852 -0.973174 -0.184088 +vn -0.097476 -0.991302 -0.088290 +vn 0.000000 -0.998810 -0.048616 +vn 0.097476 -0.991302 -0.088290 +vn 0.137852 -0.973174 -0.184088 +vn 0.097476 -0.955046 -0.279885 +vn 0.000000 0.763573 -0.645680 +vn 0.548967 0.721305 -0.422254 +vn 0.776360 0.619251 0.117130 +vn 0.548967 0.517228 0.656545 +vn 0.000000 0.474960 0.880001 +vn -0.548967 0.517228 0.656545 +vn -0.776360 0.619251 0.117130 +vn -0.548967 0.721305 -0.422254 +vn -0.540147 0.734489 -0.410779 +vn 0.763878 0.634083 0.119938 +vn 0.540147 0.734489 -0.410779 +vn 0.000000 0.776055 -0.630634 +vn -0.540147 0.533677 0.650685 +vn 0.000000 0.492080 0.870510 +vn 0.540147 0.533677 0.650685 +vn -0.763878 0.634083 0.119938 usemtl torch_material_rustiron.jpg s off -f 677/676 665/677 666/678 -f 678/679 672/680 671/681 -f 677/676 666/678 667/682 -f 678/679 673/683 672/680 -f 677/676 667/682 668/684 -f 678/679 674/685 673/683 -f 677/676 668/684 669/686 -f 678/679 675/687 674/685 -f 677/676 669/686 670/688 -f 678/679 676/689 675/687 -f 677/676 670/688 665/677 -f 678/679 671/681 676/689 -f 665/690 671/691 672/692 666/693 -f 666/694 672/695 673/696 667/697 -f 667/697 673/696 674/698 668/699 -f 668/700 674/701 675/702 669/703 -f 669/703 675/702 676/704 670/705 -f 670/706 676/707 671/691 665/690 -f 687/708 681/709 686/710 692/711 -f 688/712 682/713 681/714 687/715 -f 689/716 683/717 682/713 688/712 -f 690/718 684/719 683/720 689/721 -f 691/722 685/723 684/719 690/718 -f 692/711 686/710 685/724 691/725 -f 679/726 686/727 681/728 -f 680/729 687/730 692/731 -f 679/726 681/728 682/732 -f 680/729 688/733 687/730 -f 679/726 682/732 683/734 -f 680/729 689/735 688/733 -f 679/726 683/734 684/736 -f 680/729 690/737 689/735 -f 679/726 684/736 685/738 -f 680/729 691/739 690/737 -f 679/726 685/738 686/727 -f 680/729 692/731 691/739 -f 593/740 600/741 694/742 693/743 -f 600/741 599/744 695/745 694/742 -f 599/744 598/746 696/747 695/745 -f 598/746 597/748 697/749 696/747 -f 597/748 596/750 698/751 697/749 -f 596/750 595/752 699/753 698/751 -f 595/752 594/754 700/755 699/753 -f 594/754 593/740 693/743 700/755 -f 659/756 660/757 697/758 698/759 -f 658/760 659/761 698/751 699/753 -f 657/762 658/763 699/764 700/765 -f 657/762 700/765 693/766 664/767 -f 663/768 664/767 693/766 694/769 -f 662/770 663/771 694/772 695/773 -f 661/774 662/770 695/773 696/775 -f 660/757 661/776 696/777 697/758 +f 677/676/205 665/677/205 666/678/205 +f 678/679/52 672/680/52 671/681/52 +f 677/676/205 666/678/205 667/682/205 +f 678/679/52 673/683/52 672/680/52 +f 677/676/206 667/682/206 668/684/206 +f 678/679/52 674/685/52 673/683/52 +f 677/676/285 668/684/285 669/686/285 +f 678/679/52 675/687/52 674/685/52 +f 677/676/286 669/686/286 670/688/286 +f 678/679/52 676/689/52 675/687/52 +f 677/676/286 670/688/286 665/677/286 +f 678/679/52 671/681/52 676/689/52 +f 665/690/287 671/691/287 672/692/287 +f 665/690/287 672/692/287 666/693/287 +f 666/694/60 672/695/60 673/696/60 +f 666/694/60 673/696/60 667/697/60 +f 667/697/212 673/696/212 674/698/212 +f 667/697/212 674/698/212 668/699/212 +f 668/700/211 674/701/211 675/702/211 +f 668/700/211 675/702/211 669/703/211 +f 669/703/288 675/702/288 676/704/288 +f 669/703/288 676/704/288 670/705/288 +f 670/706/289 676/707/289 671/691/289 +f 670/706/289 671/691/289 665/690/289 +f 687/708/216 681/709/216 686/710/216 +f 687/708/216 686/710/216 692/711/216 +f 688/712/288 682/713/288 681/714/288 +f 688/712/288 681/714/288 687/715/288 +f 689/716/211 683/717/211 682/713/211 +f 689/716/211 682/713/211 688/712/211 +f 690/718/212 684/719/212 683/720/212 +f 690/718/212 683/720/212 689/721/212 +f 691/722/60 685/723/60 684/719/60 +f 691/722/60 684/719/60 690/718/60 +f 692/711/215 686/710/215 685/724/215 +f 692/711/215 685/724/215 691/725/215 +f 679/726/52 686/727/52 681/728/52 +f 680/729/286 687/730/286 692/731/286 +f 679/726/52 681/728/52 682/732/52 +f 680/729/290 688/733/290 687/730/290 +f 679/726/52 682/732/52 683/734/52 +f 680/729/103 689/735/103 688/733/103 +f 679/726/52 683/734/52 684/736/52 +f 680/729/103 690/737/103 689/735/103 +f 679/726/52 684/736/52 685/738/52 +f 680/729/291 691/739/291 690/737/291 +f 679/726/52 685/738/52 686/727/52 +f 680/729/205 692/731/205 691/739/205 +f 593/740/292 600/741/292 694/742/292 +f 593/740/292 694/742/292 693/743/292 +f 600/741/293 599/744/293 695/745/293 +f 600/741/293 695/745/293 694/742/293 +f 599/744/294 598/746/294 696/747/294 +f 599/744/294 696/747/294 695/745/294 +f 598/746/295 597/748/295 697/749/295 +f 598/746/295 697/749/295 696/747/295 +f 597/748/296 596/750/296 698/751/296 +f 597/748/296 698/751/296 697/749/296 +f 596/750/297 595/752/297 699/753/297 +f 596/750/297 699/753/297 698/751/297 +f 595/752/298 594/754/298 700/755/298 +f 595/752/298 700/755/298 699/753/298 +f 594/754/299 593/740/299 693/743/299 +f 594/754/299 693/743/299 700/755/299 +f 659/756/300 660/757/300 697/758/300 +f 659/756/300 697/758/300 698/759/300 +f 658/760/301 659/761/301 698/751/301 +f 658/760/301 698/751/301 699/753/301 +f 657/762/302 658/763/302 699/764/302 +f 657/762/302 699/764/302 700/765/302 +f 657/762/303 700/765/303 693/766/303 +f 657/762/303 693/766/303 664/767/303 +f 663/768/304 664/767/304 693/766/304 +f 663/768/304 693/766/304 694/769/304 +f 662/770/305 663/771/305 694/772/305 +f 662/770/305 694/772/305 695/773/305 +f 661/774/306 662/770/306 695/773/306 +f 661/774/306 695/773/306 696/775/306 +f 660/757/307 661/776/307 696/777/307 +f 660/757/307 696/777/307 697/758/307 s 1 -f 568/778 552/779 553/780 -f 568/778 553/780 554/781 -f 568/778 554/781 555/782 -f 568/778 555/782 556/783 -f 568/778 556/783 557/784 -f 568/778 557/784 558/785 -f 568/778 558/785 559/786 -f 559/786 552/779 568/778 -f 609/787 560/788 561/789 616/790 -f 616/791 561/792 562/793 615/794 -f 615/794 562/793 563/795 614/796 -f 614/797 563/798 564/799 613/800 -f 613/800 564/799 565/801 612/802 -f 612/802 565/801 566/803 611/804 -f 611/805 566/806 567/807 610/808 -f 560/788 609/787 610/809 567/810 -f 617/811 618/812 570/813 569/814 -f 618/815 619/816 571/817 570/818 -f 619/816 620/819 572/820 571/817 -f 620/819 621/821 573/822 572/820 -f 621/821 622/823 574/824 573/822 -f 622/823 623/825 575/826 574/824 -f 623/827 624/828 576/829 575/830 -f 624/831 617/811 569/814 576/832 -f 626/833 625/834 577/835 578/836 -f 627/837 626/838 578/839 579/840 -f 628/841 627/837 579/840 580/842 -f 629/843 628/844 580/845 581/846 -f 630/847 629/843 581/846 582/848 -f 631/849 630/847 582/848 583/850 -f 632/851 631/852 583/853 584/854 -f 625/834 632/855 584/856 577/835 -f 633/857 634/858 586/859 585/860 -f 634/858 635/861 587/862 586/859 -f 635/861 636/863 588/864 587/862 -f 636/863 637/865 589/866 588/864 -f 637/865 638/867 590/868 589/866 -f 638/867 639/869 591/870 590/868 -f 639/869 640/871 592/872 591/870 -f 640/871 633/857 585/860 592/872 -f 642/873 641/874 593/875 594/876 -f 643/877 642/878 594/879 595/880 -f 644/881 643/877 595/880 596/882 -f 645/883 644/884 596/885 597/886 -f 646/887 645/883 597/886 598/888 -f 647/889 646/887 598/888 599/890 -f 648/891 647/892 599/744 600/741 -f 641/874 648/893 600/894 593/875 -f 659/761 662/895 661/896 660/897 -f 657/898 664/899 663/900 658/760 -f 658/760 663/900 662/895 659/761 +f 568/778/308 552/779/308 553/780/308 +f 568/778/308 553/780/308 554/781/308 +f 568/778/308 554/781/308 555/782/308 +f 568/778/308 555/782/308 556/783/308 +f 568/778/308 556/783/308 557/784/308 +f 568/778/308 557/784/308 558/785/308 +f 568/778/308 558/785/308 559/786/308 +f 559/786/308 552/779/308 568/778/308 +f 609/787/309 560/788/309 561/789/310 +f 609/787/309 561/789/310 616/790/310 +f 616/791/310 561/792/310 562/793/311 +f 616/791/310 562/793/311 615/794/311 +f 615/794/311 562/793/311 563/795/312 +f 615/794/311 563/795/312 614/796/312 +f 614/797/312 563/798/312 564/799/313 +f 614/797/312 564/799/313 613/800/313 +f 613/800/313 564/799/313 565/801/314 +f 613/800/313 565/801/314 612/802/314 +f 612/802/314 565/801/314 566/803/315 +f 612/802/314 566/803/315 611/804/315 +f 611/805/315 566/806/315 567/807/316 +f 611/805/315 567/807/316 610/808/316 +f 560/788/309 609/787/309 610/809/316 +f 560/788/309 610/809/316 567/810/316 +f 617/811/317 618/812/318 570/813/318 +f 617/811/317 570/813/318 569/814/317 +f 618/815/318 619/816/319 571/817/319 +f 618/815/318 571/817/319 570/818/318 +f 619/816/319 620/819/320 572/820/320 +f 619/816/319 572/820/320 571/817/319 +f 620/819/320 621/821/321 573/822/321 +f 620/819/320 573/822/321 572/820/320 +f 621/821/321 622/823/322 574/824/322 +f 621/821/321 574/824/322 573/822/321 +f 622/823/322 623/825/323 575/826/324 +f 622/823/322 575/826/324 574/824/322 +f 623/827/323 624/828/325 576/829/325 +f 623/827/323 576/829/325 575/830/324 +f 624/831/325 617/811/317 569/814/317 +f 624/831/325 569/814/317 576/832/325 +f 626/833/326 625/834/327 577/835/327 +f 626/833/326 577/835/327 578/836/326 +f 627/837/60 626/838/326 578/839/326 +f 627/837/60 578/839/326 579/840/60 +f 628/841/328 627/837/60 579/840/60 +f 628/841/328 579/840/60 580/842/329 +f 629/843/330 628/844/328 580/845/329 +f 629/843/330 580/845/329 581/846/330 +f 630/847/331 629/843/330 581/846/330 +f 630/847/331 581/846/330 582/848/332 +f 631/849/47 630/847/331 582/848/332 +f 631/849/47 582/848/332 583/850/47 +f 632/851/333 631/852/47 583/853/47 +f 632/851/333 583/853/47 584/854/333 +f 625/834/327 632/855/333 584/856/333 +f 625/834/327 584/856/333 577/835/327 +f 633/857/334 634/858/335 586/859/335 +f 633/857/334 586/859/335 585/860/334 +f 634/858/335 635/861/336 587/862/336 +f 634/858/335 587/862/336 586/859/335 +f 635/861/336 636/863/337 588/864/337 +f 635/861/336 588/864/337 587/862/336 +f 636/863/337 637/865/338 589/866/338 +f 636/863/337 589/866/338 588/864/337 +f 637/865/338 638/867/339 590/868/339 +f 637/865/338 590/868/339 589/866/338 +f 638/867/339 639/869/340 591/870/340 +f 638/867/339 591/870/340 590/868/339 +f 639/869/340 640/871/341 592/872/341 +f 639/869/340 592/872/341 591/870/340 +f 640/871/341 633/857/334 585/860/334 +f 640/871/341 585/860/334 592/872/341 +f 642/873/326 641/874/327 593/875/342 +f 642/873/326 593/875/342 594/876/343 +f 643/877/60 642/878/326 594/879/343 +f 643/877/60 594/879/343 595/880/344 +f 644/881/329 643/877/60 595/880/344 +f 644/881/329 595/880/344 596/882/345 +f 645/883/330 644/884/329 596/885/345 +f 645/883/330 596/885/345 597/886/346 +f 646/887/332 645/883/330 597/886/346 +f 646/887/332 597/886/346 598/888/347 +f 647/889/47 646/887/332 598/888/347 +f 647/889/47 598/888/347 599/890/348 +f 648/891/333 647/892/47 599/744/348 +f 648/891/333 599/744/348 600/741/349 +f 641/874/327 648/893/333 600/894/349 +f 641/874/327 600/894/349 593/875/342 +f 659/761/350 662/895/351 661/896/352 +f 659/761/350 661/896/352 660/897/353 +f 657/898/354 664/899/355 663/900/356 +f 657/898/354 663/900/356 658/760/357 +f 658/760/357 663/900/356 662/895/351 +f 658/760/357 662/895/351 659/761/350 f 601 602 diff -r d89b403f630b -r 12a1dcfe91fa prototype/data/deftile-nolight.mtl --- a/prototype/data/deftile-nolight.mtl Fri Oct 26 03:03:52 2012 +0300 +++ b/prototype/data/deftile-nolight.mtl Fri Oct 26 21:22:14 2012 +0300 @@ -1,4 +1,4 @@ -# Blender MTL File: 'deftile-nolight.blend' +# Blender MTL File: 'deftile.blend' # Material Count: 2 newmtl floor_material_floor_diffuse.jpg Ns 96.078431 @@ -8,19 +8,19 @@ Ni 1.000000 d 1.000000 illum 2 -map_Kd floor_diffuse.jpg -map_Bump floor_normal.jpg +map_Kd /home/nuclear/3ddata/dung_crawl_prot/floor_diffuse.jpg +map_Bump /home/nuclear/3ddata/dung_crawl_prot/floor_normal.jpg newmtl wall_material_stonewall_diffuse.jpg Ns 105.882353 Ka 0.000000 0.000000 0.000000 Kd 0.640000 0.640000 0.640000 -Ks 0.200000 0.200000 0.200000 +Ks 0.100000 0.100000 0.100000 Ni 1.000000 d 1.000000 illum 2 -map_Kd stonewall_diffuse.jpg -map_Bump stonewall_normal.jpg +map_Kd /home/nuclear/3ddata/dung_crawl_prot/stonewall_diffuse.jpg +map_Bump /home/nuclear/3ddata/dung_crawl_prot/stonewall_normal.jpg diff -r d89b403f630b -r 12a1dcfe91fa prototype/data/deftile-nolight.obj --- a/prototype/data/deftile-nolight.obj Fri Oct 26 03:03:52 2012 +0300 +++ b/prototype/data/deftile-nolight.obj Fri Oct 26 21:22:14 2012 +0300 @@ -1,4 +1,4 @@ -# Blender v2.63 (sub 0) OBJ File: 'deftile-nolight.blend' +# Blender v2.63 (sub 0) OBJ File: 'deftile.blend' # www.blender.org mtllib deftile-nolight.mtl o NE_pillar_Cylinder.005 diff -r d89b403f630b -r 12a1dcfe91fa prototype/sdr/mrt.p.glsl --- a/prototype/sdr/mrt.p.glsl Fri Oct 26 03:03:52 2012 +0300 +++ b/prototype/sdr/mrt.p.glsl Fri Oct 26 21:22:14 2012 +0300 @@ -29,8 +29,10 @@ float fog = clamp((fog_end + pos.z) / (fog_end - fog_start), 0.0, 1.0); - vec4 texel = texture2D(tex_dif, gl_TexCoord[0].st); - vec3 diffuse = fog * (gl_FrontMaterial.diffuse * texel).xyz; + vec3 texel_srgb = texture2D(tex_dif, gl_TexCoord[0].st).xyz; + vec3 texel = pow(texel_srgb.xyz, 2.2); + + vec3 diffuse = fog * (gl_FrontMaterial.diffuse.xyz * texel); vec3 spec = fog * gl_FrontMaterial.specular.xyz; float sstr = (spec.x + spec.y + spec.z) / 3.0; diff -r d89b403f630b -r 12a1dcfe91fa prototype/sdr/post.p.glsl --- a/prototype/sdr/post.p.glsl Fri Oct 26 03:03:52 2012 +0300 +++ b/prototype/sdr/post.p.glsl Fri Oct 26 21:22:14 2012 +0300 @@ -9,5 +9,8 @@ // use that color as an index into the palette vec3 color = texture3D(paltex, tc).xyz; // gamma-correction - gl_FragColor = vec4(pow(color, 1.0 / 2.2), fbcolor.a); + + gl_FragColor = vec4(color, fbcolor.a); + //gl_FragColor = vec4(pow(color, 1.0 / 2.2), fbcolor.a); + //gl_FragColor = vec4(sqrt(color), fbcolor.a); } diff -r d89b403f630b -r 12a1dcfe91fa prototype/src/light.cc --- a/prototype/src/light.cc Fri Oct 26 03:03:52 2012 +0300 +++ b/prototype/src/light.cc Fri Oct 26 21:22:14 2012 +0300 @@ -130,7 +130,7 @@ } if((loc = glGetUniformLocation(sdr, "light_color")) != -1) { float t = get_time_msec() / 1000.0 + flicker_offset * 4.0; - float intens = fbm1(t * 2.0, 2) * 0.5 + 1.0; + float intens = intensity * (fbm1(t * 2.0, 2) * 0.5 + 1.0); glUniform3f(loc, color.x * intens, color.y * intens, color.z * intens); } } diff -r d89b403f630b -r 12a1dcfe91fa prototype/src/renderer.cc --- a/prototype/src/renderer.cc Fri Oct 26 03:03:52 2012 +0300 +++ b/prototype/src/renderer.cc Fri Oct 26 21:22:14 2012 +0300 @@ -1,4 +1,5 @@ #include +#include #include "opengl.h" #include "renderer.h" #include "level.h" @@ -53,6 +54,10 @@ return false; } + if(GLEW_ARB_framebuffer_sRGB) { + glEnable(GL_FRAMEBUFFER_SRGB); + } + rend = this; return true; } @@ -79,7 +84,7 @@ // ... resize the render target glBindTexture(GL_TEXTURE_2D, rend_tex); - glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, tex_xsz, tex_ysz, 0, GL_RGBA, GL_UNSIGNED_BYTE, 0); + glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA16F, tex_xsz, tex_ysz, 0, GL_RGBA, GL_UNSIGNED_BYTE, 0); // ... resize the depth buffer glBindRenderbufferEXT(GL_RENDERBUFFER, rend_depth); @@ -177,7 +182,7 @@ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, clamp); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); - glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, tex_xsz, tex_ysz, 0, GL_RGBA, GL_UNSIGNED_BYTE, 0); + glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA16F, tex_xsz, tex_ysz, 0, GL_RGBA, GL_UNSIGNED_BYTE, 0); glFramebufferTexture2DEXT(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, rend_tex, 0); diff -r d89b403f630b -r 12a1dcfe91fa prototype/src/tile.cc --- a/prototype/src/tile.cc Fri Oct 26 03:03:52 2012 +0300 +++ b/prototype/src/tile.cc Fri Oct 26 21:22:14 2012 +0300 @@ -325,6 +325,7 @@ lt->set_radius(rad); lt->set_color(m->get_material().kd); + lt->set_intensity(0.8); return lt; }