# HG changeset patch # User John Tsiombikas # Date 1346113127 -10800 # Node ID 0357994effe2fa47090efbd6dff10d1dbdf7e574 # Parent 0cd55268eaf4db82dd42f808ab2f033cc3982c51 ha! fixed deferred diff -r 0cd55268eaf4 -r 0357994effe2 prototype/data/deftile.mtl --- a/prototype/data/deftile.mtl Tue Aug 28 02:18:19 2012 +0300 +++ b/prototype/data/deftile.mtl Tue Aug 28 03:18:47 2012 +0300 @@ -1,11 +1,12 @@ # Blender MTL File: 'deftile.blend' # Material Count: 4 -newmtl -Ns 0 +newmtl Material-light +Ns 96.078431 Ka 0.000000 0.000000 0.000000 -Kd 0.8 0.8 0.8 -Ks 0.8 0.8 0.8 -d 1 +Kd 1.000000 0.599313 0.348773 +Ks 0.000000 0.000000 0.000000 +Ni 1.000000 +d 1.000000 illum 2 diff -r 0cd55268eaf4 -r 0357994effe2 prototype/data/deftile.obj --- a/prototype/data/deftile.obj Tue Aug 28 02:18:19 2012 +0300 +++ b/prototype/data/deftile.obj Tue Aug 28 03:18:47 2012 +0300 @@ -2,32 +2,32 @@ # www.blender.org mtllib deftile.mtl o WEST_LIGHT_Sphere -v -0.449287 1.385018 0.707107 -v -0.449287 0.677911 1.000000 -v -0.449287 -0.029195 0.707107 -v -0.449287 -0.322089 0.000000 -v -0.949288 1.385018 0.500000 -v -1.156394 0.677911 0.707107 -v -0.949288 -0.029195 0.500000 -v -1.156394 1.385018 0.000000 -v -1.449288 0.677911 0.000000 -v -1.156394 -0.029195 0.000000 -v -0.949288 1.385018 -0.500000 -v -1.156394 0.677911 -0.707107 -v -0.949287 -0.029195 -0.500000 -v -0.449287 1.385018 -0.707107 -v -0.449287 0.677911 -1.000000 -v -0.449287 -0.029195 -0.707107 -v 0.050713 1.385018 -0.500000 -v 0.257820 0.677911 -0.707107 -v 0.050713 -0.029195 -0.500000 -v 0.257820 1.385018 0.000000 -v 0.550713 0.677911 0.000000 -v 0.257819 -0.029195 0.000000 -v -0.449287 1.677911 0.000000 -v 0.050713 1.385018 0.500001 -v 0.257819 0.677911 0.707107 -v 0.050712 -0.029195 0.500000 +v -0.449287 1.563989 0.886078 +v -0.449287 0.677911 1.253103 +v -0.449287 -0.208166 0.886078 +v -0.449287 -0.575192 0.000000 +v -1.075839 1.563989 0.626552 +v -1.335365 0.677911 0.886078 +v -1.075839 -0.208166 0.626552 +v -1.335365 1.563989 0.000000 +v -1.702391 0.677911 -0.000000 +v -1.335365 -0.208166 0.000000 +v -1.075839 1.563989 -0.626552 +v -1.335365 0.677911 -0.886078 +v -1.075839 -0.208166 -0.626552 +v -0.449287 1.563989 -0.886078 +v -0.449287 0.677911 -1.253103 +v -0.449287 -0.208166 -0.886078 +v 0.177264 1.563989 -0.626552 +v 0.436791 0.677911 -0.886077 +v 0.177264 -0.208166 -0.626551 +v 0.436791 1.563989 0.000000 +v 0.803816 0.677911 0.000000 +v 0.436790 -0.208166 0.000000 +v -0.449287 1.931015 0.000000 +v 0.177264 1.563989 0.626552 +v 0.436790 0.677911 0.886078 +v 0.177264 -0.208166 0.626552 vn -0.357407 0.357407 0.862856 vn -0.357407 -0.357407 0.862856 vn -0.862856 0.357407 0.357407 @@ -43,12 +43,12 @@ vn 0.862856 -0.357407 0.357407 vn 0.862856 0.357407 0.357407 vn -0.156558 -0.912487 0.377964 -vn -0.156558 0.912487 0.377965 -vn -0.377964 -0.912487 0.156558 +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.377965 vn -0.156558 0.912487 -0.377964 vn 0.156558 -0.912487 -0.377964 vn 0.156558 0.912487 -0.377964 @@ -56,11 +56,11 @@ 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.377965 +vn 0.156558 0.912487 0.377964 vn 0.357406 0.357407 0.862856 vn 0.357407 -0.357407 0.862856 vn 0.156558 -0.912487 0.377964 -usemtl +usemtl Material-light s off f 2//1 1//1 5//1 f 2//1 5//1 6//1 @@ -111,41 +111,37 @@ f 2//31 26//31 25//31 f 3//32 4//32 26//32 o SOUTH_LIGHT_Sphere -v 0.707107 1.385018 0.449287 -v 1.000000 0.677911 0.449287 -v 0.707107 -0.029195 0.449287 -v 0.000000 -0.322089 0.449287 -v 0.500000 1.385018 0.949288 -v 0.707107 0.677911 1.156394 -v 0.500000 -0.029195 0.949287 -v 0.000000 1.385018 1.156394 -v 0.000000 0.677911 1.449288 -v 0.000000 -0.029195 1.156394 -v -0.500000 1.385018 0.949288 -v -0.707107 0.677911 1.156394 -v -0.500000 -0.029195 0.949288 -v -0.707107 1.385018 0.449287 -v -1.000000 0.677911 0.449287 -v -0.707107 -0.029195 0.449287 -v -0.500000 1.385018 -0.050713 -v -0.707107 0.677911 -0.257819 -v -0.500000 -0.029195 -0.050713 -v 0.000000 1.385018 -0.257820 -v 0.000000 0.677911 -0.550713 -v 0.000000 -0.029195 -0.257819 -v 0.000000 1.677911 0.449287 -v 0.500000 1.385018 -0.050713 -v 0.707107 0.677911 -0.257819 -v 0.500000 -0.029195 -0.050712 +v 0.886078 1.563989 0.449287 +v 1.253103 0.677911 0.449287 +v 0.886078 -0.208166 0.449287 +v 0.000000 -0.575192 0.449287 +v 0.626552 1.563989 1.075839 +v 0.886078 0.677911 1.335365 +v 0.626552 -0.208166 1.075839 +v 0.000000 1.563989 1.335365 +v 0.000000 0.677911 1.702391 +v 0.000000 -0.208166 1.335365 +v -0.626552 1.563989 1.075839 +v -0.886078 0.677911 1.335365 +v -0.626552 -0.208166 1.075839 +v -0.886078 1.563989 0.449287 +v -1.253103 0.677911 0.449287 +v -0.886078 -0.208166 0.449287 +v -0.626552 1.563989 -0.177264 +v -0.886078 0.677911 -0.436790 +v -0.626551 -0.208166 -0.177264 +v 0.000000 1.563989 -0.436791 +v 0.000000 0.677911 -0.803816 +v 0.000000 -0.208166 -0.436790 +v 0.000000 1.931015 0.449287 +v 0.626552 1.563989 -0.177264 +v 0.886078 0.677911 -0.436790 +v 0.626552 -0.208166 -0.177264 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.377964 -vn -0.156558 0.912487 0.377964 -vn -0.156558 -0.912487 -0.377965 -vn 0.377965 0.912487 -0.156558 +vn -0.377964 -0.912487 0.156558 +vn -0.377965 -0.912487 -0.156558 vn 0.377964 -0.912487 -0.156558 -usemtl +usemtl Material-light s off f 28//14 27//14 31//14 f 28//14 31//14 32//14 @@ -173,60 +169,60 @@ f 47//8 45//8 44//8 f 51//9 52//9 48//9 f 51//9 48//9 47//9 -f 50//34 51//34 47//34 -f 50//34 47//34 46//34 +f 50//10 51//10 47//10 +f 50//10 47//10 46//10 f 33//27 30//27 29//27 -f 31//35 27//35 49//35 +f 31//28 27//28 49//28 f 36//32 30//32 33//32 -f 49//36 34//36 31//36 +f 49//29 34//29 31//29 f 39//15 30//15 36//15 -f 49//37 37//37 34//37 -f 42//17 30//17 39//17 +f 49//16 37//16 34//16 +f 42//34 30//34 39//34 f 49//18 40//18 37//18 -f 45//19 30//19 42//19 +f 45//35 30//35 42//35 f 49//20 43//20 40//20 f 49//22 46//22 43//22 -f 48//38 30//38 45//38 +f 48//21 30//21 45//21 f 52//23 30//23 48//23 f 49//24 50//24 46//24 -f 49//39 27//39 50//39 +f 49//25 27//25 50//25 f 27//11 28//11 51//11 f 27//11 51//11 50//11 f 28//12 29//12 52//12 f 28//12 52//12 51//12 -f 29//40 30//40 52//40 +f 29//36 30//36 52//36 o EAST_LIGHT_Sphere -v 0.449287 1.385018 -0.707107 -v 0.449287 0.677911 -1.000000 -v 0.449287 -0.029195 -0.707107 -v 0.449287 -0.322089 -0.000000 -v 0.949288 1.385018 -0.500000 -v 1.156394 0.677911 -0.707107 -v 0.949287 -0.029195 -0.500000 -v 1.156394 1.385018 -0.000000 -v 1.449288 0.677911 -0.000000 -v 1.156394 -0.029195 -0.000000 -v 0.949288 1.385018 0.500000 -v 1.156394 0.677911 0.707107 -v 0.949287 -0.029195 0.500000 -v 0.449287 1.385018 0.707107 -v 0.449287 0.677911 1.000000 -v 0.449287 -0.029195 0.707107 -v -0.050713 1.385018 0.500000 -v -0.257820 0.677911 0.707107 -v -0.050713 -0.029195 0.500000 -v -0.257820 1.385018 -0.000000 -v -0.550713 0.677911 -0.000000 -v -0.257819 -0.029195 -0.000000 -v 0.449287 1.677911 -0.000000 -v -0.050713 1.385018 -0.500000 -v -0.257819 0.677911 -0.707107 -v -0.050712 -0.029195 -0.500000 -vn -0.862856 0.357406 -0.357407 -vn 0.156558 0.912487 -0.377965 -vn -0.377965 -0.912487 0.156558 -vn -0.156558 0.912487 -0.377965 -usemtl +v 0.449287 1.563989 -0.886078 +v 0.449287 0.677911 -1.253103 +v 0.449287 -0.208166 -0.886078 +v 0.449287 -0.575192 -0.000000 +v 1.075839 1.563989 -0.626552 +v 1.335365 0.677911 -0.886078 +v 1.075839 -0.208166 -0.626552 +v 1.335365 1.563989 -0.000000 +v 1.702391 0.677911 -0.000000 +v 1.335365 -0.208166 -0.000000 +v 1.075839 1.563989 0.626552 +v 1.335365 0.677911 0.886078 +v 1.075839 -0.208166 0.626552 +v 0.449287 1.563989 0.886078 +v 0.449287 0.677911 1.253103 +v 0.449287 -0.208166 0.886078 +v -0.177264 1.563989 0.626552 +v -0.436790 0.677911 0.886078 +v -0.177264 -0.208166 0.626551 +v -0.436791 1.563989 -0.000000 +v -0.803816 0.677911 -0.000000 +v -0.436790 -0.208166 -0.000000 +v 0.449287 1.931015 -0.000000 +v -0.177264 1.563989 -0.626552 +v -0.436790 0.677911 -0.886078 +v -0.177264 -0.208166 -0.626552 +vn -0.862856 0.357406 0.357407 +vn 0.156558 -0.912487 0.377965 +vn -0.357406 0.357407 -0.862856 +vn -0.156558 -0.912487 -0.377964 +usemtl Material-light s off f 54//10 53//10 57//10 f 54//10 57//10 58//10 @@ -248,66 +244,63 @@ 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 72//37 73//37 70//37 +f 72//37 70//37 69//37 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//41 77//41 73//41 -f 76//41 73//41 72//41 +f 76//5 77//5 73//5 +f 76//5 73//5 72//5 f 59//23 56//23 55//23 -f 57//42 53//42 75//42 -f 62//40 56//40 59//40 +f 57//24 53//24 75//24 +f 62//36 56//36 59//36 f 75//25 60//25 57//25 f 65//27 56//27 62//27 f 75//28 63//28 60//28 -f 68//32 56//32 65//32 -f 75//36 66//36 63//36 +f 68//38 56//38 65//38 +f 75//29 66//29 63//29 f 71//15 56//15 68//15 -f 75//37 69//37 66//37 +f 75//16 69//16 66//16 f 75//18 72//18 69//18 -f 74//43 56//43 71//43 +f 74//17 56//17 71//17 f 78//19 56//19 74//19 f 75//20 76//20 72//20 -f 75//44 53//44 76//44 -f 53//7 54//7 77//7 -f 53//7 77//7 76//7 +f 75//22 53//22 76//22 +f 53//39 54//39 77//39 +f 53//39 77//39 76//39 f 54//8 55//8 78//8 f 54//8 78//8 77//8 -f 55//21 56//21 78//21 +f 55//40 56//40 78//40 o NORTH_LIGHT_Sphere -v -0.707107 1.385018 -0.449287 -v -1.000000 0.677911 -0.449287 -v -0.707107 -0.029195 -0.449287 -v -0.000000 -0.322089 -0.449287 -v -0.500000 1.385018 -0.949288 -v -0.707107 0.677911 -1.156394 -v -0.500000 -0.029195 -0.949288 -v 0.000000 1.385018 -1.156394 -v 0.000000 0.677911 -1.449288 -v -0.000000 -0.029195 -1.156394 -v 0.500000 1.385018 -0.949288 -v 0.707107 0.677911 -1.156394 -v 0.500000 -0.029195 -0.949287 -v 0.707107 1.385018 -0.449287 -v 1.000000 0.677911 -0.449287 -v 0.707107 -0.029195 -0.449287 -v 0.500000 1.385018 0.050713 -v 0.707107 0.677911 0.257820 -v 0.500000 -0.029195 0.050713 -v -0.000000 1.385018 0.257820 -v -0.000000 0.677911 0.550713 -v -0.000000 -0.029195 0.257819 -v -0.000000 1.677911 -0.449287 -v -0.500000 1.385018 0.050713 -v -0.707107 0.677911 0.257819 -v -0.500000 -0.029195 0.050712 -vn -0.377965 0.912487 -0.156558 -vn 0.156558 -0.912487 0.377965 -vn -0.377965 0.912487 0.156558 +v -0.886078 1.563989 -0.449287 +v -1.253103 0.677911 -0.449287 +v -0.886078 -0.208166 -0.449287 +v -0.000000 -0.575192 -0.449287 +v -0.626552 1.563989 -1.075839 +v -0.886078 0.677911 -1.335365 +v -0.626552 -0.208166 -1.075839 +v 0.000000 1.563989 -1.335365 +v 0.000000 0.677911 -1.702391 +v 0.000000 -0.208166 -1.335365 +v 0.626552 1.563989 -1.075839 +v 0.886078 0.677911 -1.335365 +v 0.626552 -0.208166 -1.075839 +v 0.886078 1.563989 -0.449287 +v 1.253103 0.677911 -0.449287 +v 0.886078 -0.208166 -0.449287 +v 0.626552 1.563989 0.177264 +v 0.886078 0.677911 0.436791 +v 0.626551 -0.208166 0.177264 +v -0.000000 1.563989 0.436791 +v -0.000000 0.677911 0.803816 +v -0.000000 -0.208166 0.436790 +v -0.000000 1.931015 -0.449287 +v -0.626552 1.563989 0.177264 +v -0.886078 0.677911 0.436790 +v -0.626552 -0.208166 0.177264 vn -0.862856 0.357407 0.357406 -usemtl +usemtl Material-light s off f 80//5 79//5 83//5 f 80//5 83//5 84//5 @@ -338,25 +331,25 @@ f 102//1 103//1 99//1 f 102//1 99//1 98//1 f 85//19 82//19 81//19 -f 83//45 79//45 101//45 +f 83//20 79//20 101//20 f 88//21 82//21 85//21 f 101//22 86//22 83//22 f 91//23 82//23 88//23 f 101//24 89//24 86//24 -f 94//26 82//26 91//26 +f 94//36 82//36 91//36 f 101//25 92//25 89//25 f 97//27 82//27 94//27 f 101//28 95//28 92//28 -f 101//36 98//36 95//36 -f 100//46 82//46 97//46 +f 101//29 98//29 95//29 +f 100//38 82//38 97//38 f 104//15 82//15 100//15 -f 101//37 102//37 98//37 -f 101//47 79//47 102//47 -f 79//48 80//48 103//48 -f 79//48 103//48 102//48 +f 101//16 102//16 98//16 +f 101//18 79//18 102//18 +f 79//41 80//41 103//41 +f 79//41 103//41 102//41 f 80//4 81//4 104//4 f 80//4 104//4 103//4 -f 81//17 82//17 104//17 +f 81//34 82//34 104//34 o NE_pillar_Cylinder.005 v 0.500000 0.000001 -0.425000 v 0.471299 0.000001 -0.430709 @@ -465,54 +458,54 @@ vn -0.122166 0.036134 0.991821 usemtl wall_material_stonewall_diffuse.jpg s 1 -f 106/1/49 116/2/50 117/3/51 -f 106/1/49 117/3/51 107/4/52 -f 107/4/52 117/3/51 118/5/53 -f 107/4/52 118/5/53 108/6/54 -f 116/2/50 121/7/55 122/8/56 -f 116/2/50 122/8/56 117/3/51 -f 117/3/51 122/8/56 123/9/57 -f 117/3/51 123/9/57 118/5/53 -f 121/7/55 126/10/58 127/11/59 -f 121/7/55 127/11/59 122/8/56 -f 126/10/58 111/12/60 112/13/61 -f 126/10/58 112/13/61 127/11/59 -f 122/8/56 127/11/59 128/14/62 -f 122/8/56 128/14/62 123/9/57 -f 127/11/59 112/13/61 113/15/63 -f 127/11/59 113/15/63 128/14/62 -f 118/5/53 132/16/64 130/17/65 -f 118/5/53 130/17/65 108/6/54 -f 132/16/64 119/18/66 109/19/67 -f 132/16/64 109/19/67 130/17/65 -f 123/9/57 133/20/68 132/16/64 -f 123/9/57 132/16/64 118/5/53 -f 133/20/68 124/21/69 119/18/66 -f 133/20/68 119/18/66 132/16/64 -f 128/14/62 134/22/70 133/20/68 -f 128/14/62 133/20/68 123/9/57 -f 134/22/70 129/23/71 124/21/69 -f 134/22/70 124/21/69 133/20/68 -f 113/15/63 131/24/72 134/22/70 -f 113/15/63 134/22/70 128/14/62 -f 131/24/72 114/25/73 129/23/71 -f 131/24/72 129/23/71 134/22/70 -f 135/26/74 105/27/75 115/28/76 -f 135/26/74 115/28/76 137/29/77 -f 137/29/77 116/2/50 106/1/49 -f 137/29/77 106/1/49 135/26/74 -f 120/30/78 138/31/79 137/29/77 -f 120/30/78 137/29/77 115/28/76 -f 138/31/79 121/7/55 116/2/50 -f 138/31/79 116/2/50 137/29/77 -f 125/32/80 139/33/81 138/31/79 -f 125/32/80 138/31/79 120/30/78 -f 139/33/81 126/10/58 121/7/55 -f 139/33/81 121/7/55 138/31/79 -f 110/34/82 136/35/83 139/33/81 -f 110/34/82 139/33/81 125/32/80 -f 136/35/83 111/12/60 126/10/58 -f 136/35/83 126/10/58 139/33/81 +f 106/1/42 116/2/43 117/3/44 +f 106/1/42 117/3/44 107/4/45 +f 107/4/45 117/3/44 118/5/46 +f 107/4/45 118/5/46 108/6/47 +f 116/2/43 121/7/48 122/8/49 +f 116/2/43 122/8/49 117/3/44 +f 117/3/44 122/8/49 123/9/50 +f 117/3/44 123/9/50 118/5/46 +f 121/7/48 126/10/51 127/11/52 +f 121/7/48 127/11/52 122/8/49 +f 126/10/51 111/12/53 112/13/54 +f 126/10/51 112/13/54 127/11/52 +f 122/8/49 127/11/52 128/14/55 +f 122/8/49 128/14/55 123/9/50 +f 127/11/52 112/13/54 113/15/56 +f 127/11/52 113/15/56 128/14/55 +f 118/5/46 132/16/57 130/17/58 +f 118/5/46 130/17/58 108/6/47 +f 132/16/57 119/18/59 109/19/60 +f 132/16/57 109/19/60 130/17/58 +f 123/9/50 133/20/61 132/16/57 +f 123/9/50 132/16/57 118/5/46 +f 133/20/61 124/21/62 119/18/59 +f 133/20/61 119/18/59 132/16/57 +f 128/14/55 134/22/63 133/20/61 +f 128/14/55 133/20/61 123/9/50 +f 134/22/63 129/23/64 124/21/62 +f 134/22/63 124/21/62 133/20/61 +f 113/15/56 131/24/65 134/22/63 +f 113/15/56 134/22/63 128/14/55 +f 131/24/65 114/25/66 129/23/64 +f 131/24/65 129/23/64 134/22/63 +f 135/26/67 105/27/68 115/28/69 +f 135/26/67 115/28/69 137/29/70 +f 137/29/70 116/2/43 106/1/42 +f 137/29/70 106/1/42 135/26/67 +f 120/30/71 138/31/72 137/29/70 +f 120/30/71 137/29/70 115/28/69 +f 138/31/72 121/7/48 116/2/43 +f 138/31/72 116/2/43 137/29/70 +f 125/32/73 139/33/74 138/31/72 +f 125/32/73 138/31/72 120/30/71 +f 139/33/74 126/10/51 121/7/48 +f 139/33/74 121/7/48 138/31/72 +f 110/34/75 136/35/76 139/33/74 +f 110/34/75 139/33/74 125/32/73 +f 136/35/76 111/12/53 126/10/51 +f 136/35/76 126/10/51 139/33/74 o WEST_torch_Cylinder v -0.495644 0.450610 -0.000061 v -0.494772 0.450445 -0.002204 @@ -973,181 +966,181 @@ vn 0.119938 0.634083 0.763878 usemtl torch_material_rustiron.jpg s off -f 265/36/84 253/37/84 254/38/84 -f 266/39/85 260/40/85 259/41/85 -f 265/36/84 254/38/84 255/42/84 -f 266/39/85 261/43/85 260/40/85 -f 265/36/86 255/42/86 256/44/86 -f 266/39/85 262/45/85 261/43/85 -f 265/36/87 256/44/87 257/46/87 -f 266/39/85 263/47/85 262/45/85 -f 265/36/88 257/46/88 258/48/88 -f 266/39/85 264/49/85 263/47/85 -f 265/36/88 258/48/88 253/37/88 -f 266/39/85 259/41/85 264/49/85 -f 253/50/89 259/51/89 260/52/89 -f 253/50/89 260/52/89 254/53/89 -f 254/54/90 260/55/90 261/56/90 -f 254/54/90 261/56/90 255/57/90 -f 255/57/91 261/56/91 262/58/91 -f 255/57/91 262/58/91 256/59/91 -f 256/60/92 262/61/92 263/62/92 -f 256/60/92 263/62/92 257/63/92 -f 257/63/93 263/62/93 264/64/93 -f 257/63/93 264/64/93 258/65/93 -f 258/66/94 264/67/94 259/51/94 -f 258/66/94 259/51/94 253/50/94 -f 275/68/95 269/69/95 274/70/95 -f 275/68/95 274/70/95 280/71/95 -f 276/72/93 270/73/93 269/74/93 -f 276/72/93 269/74/93 275/75/93 -f 277/76/92 271/77/92 270/73/92 -f 277/76/92 270/73/92 276/72/92 -f 278/78/91 272/79/91 271/80/91 -f 278/78/91 271/80/91 277/81/91 -f 279/82/90 273/83/90 272/79/90 -f 279/82/90 272/79/90 278/78/90 -f 280/71/96 274/70/96 273/84/96 -f 280/71/96 273/84/96 279/85/96 -f 267/86/85 274/87/85 269/88/85 -f 268/89/88 275/90/88 280/91/88 -f 267/86/85 269/88/85 270/92/85 -f 268/89/97 276/93/97 275/90/97 -f 267/86/85 270/92/85 271/94/85 -f 268/89/98 277/95/98 276/93/98 -f 267/86/85 271/94/85 272/96/85 -f 268/89/98 278/97/98 277/95/98 -f 267/86/85 272/96/85 273/98/85 -f 268/89/99 279/99/99 278/97/99 -f 267/86/85 273/98/85 274/87/85 -f 268/89/84 280/91/84 279/99/84 -f 181/100/100 188/101/100 282/102/100 -f 181/100/100 282/102/100 281/103/100 -f 188/101/101 187/104/101 283/105/101 -f 188/101/101 283/105/101 282/102/101 -f 187/104/102 186/106/102 284/107/102 -f 187/104/102 284/107/102 283/105/102 -f 186/106/103 185/108/103 285/109/103 -f 186/106/103 285/109/103 284/107/103 -f 185/108/104 184/110/104 286/111/104 -f 185/108/104 286/111/104 285/109/104 -f 184/110/105 183/112/105 287/113/105 -f 184/110/105 287/113/105 286/111/105 -f 183/112/106 182/114/106 288/115/106 -f 183/112/106 288/115/106 287/113/106 -f 182/114/107 181/100/107 281/103/107 -f 182/114/107 281/103/107 288/115/107 -f 247/116/108 248/117/108 285/118/108 -f 247/116/108 285/118/108 286/119/108 -f 246/120/109 247/121/109 286/111/109 -f 246/120/109 286/111/109 287/113/109 -f 245/122/110 246/123/110 287/124/110 -f 245/122/110 287/124/110 288/125/110 -f 245/122/111 288/125/111 281/126/111 -f 245/122/111 281/126/111 252/127/111 -f 251/128/112 252/127/112 281/126/112 -f 251/128/112 281/126/112 282/129/112 -f 250/130/113 251/131/113 282/132/113 -f 250/130/113 282/132/113 283/133/113 -f 249/134/114 250/130/114 283/133/114 -f 249/134/114 283/133/114 284/135/114 -f 248/117/115 249/136/115 284/137/115 -f 248/117/115 284/137/115 285/118/115 +f 265/36/77 253/37/77 254/38/77 +f 266/39/78 260/40/78 259/41/78 +f 265/36/77 254/38/77 255/42/77 +f 266/39/78 261/43/78 260/40/78 +f 265/36/79 255/42/79 256/44/79 +f 266/39/78 262/45/78 261/43/78 +f 265/36/80 256/44/80 257/46/80 +f 266/39/78 263/47/78 262/45/78 +f 265/36/81 257/46/81 258/48/81 +f 266/39/78 264/49/78 263/47/78 +f 265/36/81 258/48/81 253/37/81 +f 266/39/78 259/41/78 264/49/78 +f 253/50/82 259/51/82 260/52/82 +f 253/50/82 260/52/82 254/53/82 +f 254/54/83 260/55/83 261/56/83 +f 254/54/83 261/56/83 255/57/83 +f 255/57/84 261/56/84 262/58/84 +f 255/57/84 262/58/84 256/59/84 +f 256/60/85 262/61/85 263/62/85 +f 256/60/85 263/62/85 257/63/85 +f 257/63/86 263/62/86 264/64/86 +f 257/63/86 264/64/86 258/65/86 +f 258/66/87 264/67/87 259/51/87 +f 258/66/87 259/51/87 253/50/87 +f 275/68/88 269/69/88 274/70/88 +f 275/68/88 274/70/88 280/71/88 +f 276/72/86 270/73/86 269/74/86 +f 276/72/86 269/74/86 275/75/86 +f 277/76/85 271/77/85 270/73/85 +f 277/76/85 270/73/85 276/72/85 +f 278/78/84 272/79/84 271/80/84 +f 278/78/84 271/80/84 277/81/84 +f 279/82/83 273/83/83 272/79/83 +f 279/82/83 272/79/83 278/78/83 +f 280/71/89 274/70/89 273/84/89 +f 280/71/89 273/84/89 279/85/89 +f 267/86/78 274/87/78 269/88/78 +f 268/89/81 275/90/81 280/91/81 +f 267/86/78 269/88/78 270/92/78 +f 268/89/90 276/93/90 275/90/90 +f 267/86/78 270/92/78 271/94/78 +f 268/89/91 277/95/91 276/93/91 +f 267/86/78 271/94/78 272/96/78 +f 268/89/91 278/97/91 277/95/91 +f 267/86/78 272/96/78 273/98/78 +f 268/89/92 279/99/92 278/97/92 +f 267/86/78 273/98/78 274/87/78 +f 268/89/77 280/91/77 279/99/77 +f 181/100/93 188/101/93 282/102/93 +f 181/100/93 282/102/93 281/103/93 +f 188/101/94 187/104/94 283/105/94 +f 188/101/94 283/105/94 282/102/94 +f 187/104/95 186/106/95 284/107/95 +f 187/104/95 284/107/95 283/105/95 +f 186/106/96 185/108/96 285/109/96 +f 186/106/96 285/109/96 284/107/96 +f 185/108/97 184/110/97 286/111/97 +f 185/108/97 286/111/97 285/109/97 +f 184/110/98 183/112/98 287/113/98 +f 184/110/98 287/113/98 286/111/98 +f 183/112/99 182/114/99 288/115/99 +f 183/112/99 288/115/99 287/113/99 +f 182/114/100 181/100/100 281/103/100 +f 182/114/100 281/103/100 288/115/100 +f 247/116/101 248/117/101 285/118/101 +f 247/116/101 285/118/101 286/119/101 +f 246/120/102 247/121/102 286/111/102 +f 246/120/102 286/111/102 287/113/102 +f 245/122/103 246/123/103 287/124/103 +f 245/122/103 287/124/103 288/125/103 +f 245/122/104 288/125/104 281/126/104 +f 245/122/104 281/126/104 252/127/104 +f 251/128/105 252/127/105 281/126/105 +f 251/128/105 281/126/105 282/129/105 +f 250/130/106 251/131/106 282/132/106 +f 250/130/106 282/132/106 283/133/106 +f 249/134/107 250/130/107 283/133/107 +f 249/134/107 283/133/107 284/135/107 +f 248/117/108 249/136/108 284/137/108 +f 248/117/108 284/137/108 285/118/108 s 1 -f 156/138/116 140/139/116 141/140/116 -f 156/138/116 141/140/116 142/141/116 -f 156/138/116 142/141/116 143/142/116 -f 156/138/116 143/142/116 144/143/116 -f 156/138/116 144/143/116 145/144/116 -f 156/138/116 145/144/116 146/145/116 -f 156/138/116 146/145/116 147/146/116 -f 147/146/116 140/139/116 156/138/116 -f 197/147/117 148/148/117 149/149/118 -f 197/147/117 149/149/118 204/150/118 -f 204/151/118 149/152/118 150/153/119 -f 204/151/118 150/153/119 203/154/119 -f 203/154/119 150/153/119 151/155/120 -f 203/154/119 151/155/120 202/156/120 -f 202/157/120 151/158/120 152/159/121 -f 202/157/120 152/159/121 201/160/121 -f 201/160/121 152/159/121 153/161/122 -f 201/160/121 153/161/122 200/162/122 -f 200/162/122 153/161/122 154/163/123 -f 200/162/122 154/163/123 199/164/123 -f 199/165/123 154/166/123 155/167/124 -f 199/165/123 155/167/124 198/168/124 -f 148/148/117 197/147/117 198/169/124 -f 148/148/117 198/169/124 155/170/124 -f 205/171/125 206/172/126 158/173/126 -f 205/171/125 158/173/126 157/174/125 -f 206/175/126 207/176/127 159/177/127 -f 206/175/126 159/177/127 158/178/126 -f 207/176/127 208/179/128 160/180/128 -f 207/176/127 160/180/128 159/177/127 -f 208/179/128 209/181/129 161/182/129 -f 208/179/128 161/182/129 160/180/128 -f 209/181/129 210/183/130 162/184/130 -f 209/181/129 162/184/130 161/182/129 -f 210/183/130 211/185/131 163/186/132 -f 210/183/130 163/186/132 162/184/130 -f 211/187/131 212/188/133 164/189/133 -f 211/187/131 164/189/133 163/190/132 -f 212/191/133 205/171/125 157/174/125 -f 212/191/133 157/174/125 164/192/133 -f 214/193/134 213/194/135 165/195/135 -f 214/193/134 165/195/135 166/196/134 -f 215/197/90 214/198/134 166/199/134 -f 215/197/90 166/199/134 167/200/90 -f 216/201/136 215/197/90 167/200/90 -f 216/201/136 167/200/90 168/202/137 -f 217/203/138 216/204/136 168/205/137 -f 217/203/138 168/205/137 169/206/138 -f 218/207/139 217/203/138 169/206/138 -f 218/207/139 169/206/138 170/208/140 -f 219/209/141 218/207/139 170/208/140 -f 219/209/141 170/208/140 171/210/141 -f 220/211/142 219/212/141 171/213/141 -f 220/211/142 171/213/141 172/214/142 -f 213/194/135 220/215/142 172/216/142 -f 213/194/135 172/216/142 165/195/135 -f 221/217/143 222/218/144 174/219/144 -f 221/217/143 174/219/144 173/220/143 -f 222/218/144 223/221/145 175/222/145 -f 222/218/144 175/222/145 174/219/144 -f 223/221/145 224/223/146 176/224/146 -f 223/221/145 176/224/146 175/222/145 -f 224/223/146 225/225/147 177/226/147 -f 224/223/146 177/226/147 176/224/146 -f 225/225/147 226/227/148 178/228/148 -f 225/225/147 178/228/148 177/226/147 -f 226/227/148 227/229/149 179/230/149 -f 226/227/148 179/230/149 178/228/148 -f 227/229/149 228/231/150 180/232/150 -f 227/229/149 180/232/150 179/230/149 -f 228/231/150 221/217/143 173/220/143 -f 228/231/150 173/220/143 180/232/150 -f 230/233/134 229/234/135 181/235/151 -f 230/233/134 181/235/151 182/236/152 -f 231/237/90 230/238/134 182/239/152 -f 231/237/90 182/239/152 183/240/153 -f 232/241/137 231/237/90 183/240/153 -f 232/241/137 183/240/153 184/242/154 -f 233/243/138 232/244/137 184/245/154 -f 233/243/138 184/245/154 185/246/155 -f 234/247/139 233/243/138 185/246/155 -f 234/247/139 185/246/155 186/248/156 -f 235/249/141 234/247/139 186/248/156 -f 235/249/141 186/248/156 187/250/157 -f 236/251/142 235/252/141 187/104/157 -f 236/251/142 187/104/157 188/101/158 -f 229/234/135 236/253/142 188/254/158 -f 229/234/135 188/254/158 181/235/151 -f 247/121/159 250/255/160 249/256/161 -f 247/121/159 249/256/161 248/257/162 -f 245/258/163 252/259/164 251/260/165 -f 245/258/163 251/260/165 246/120/166 -f 246/120/166 251/260/165 250/255/160 -f 246/120/166 250/255/160 247/121/159 +f 156/138/109 140/139/109 141/140/109 +f 156/138/109 141/140/109 142/141/109 +f 156/138/109 142/141/109 143/142/109 +f 156/138/109 143/142/109 144/143/109 +f 156/138/109 144/143/109 145/144/109 +f 156/138/109 145/144/109 146/145/109 +f 156/138/109 146/145/109 147/146/109 +f 147/146/109 140/139/109 156/138/109 +f 197/147/110 148/148/110 149/149/111 +f 197/147/110 149/149/111 204/150/111 +f 204/151/111 149/152/111 150/153/112 +f 204/151/111 150/153/112 203/154/112 +f 203/154/112 150/153/112 151/155/113 +f 203/154/112 151/155/113 202/156/113 +f 202/157/113 151/158/113 152/159/114 +f 202/157/113 152/159/114 201/160/114 +f 201/160/114 152/159/114 153/161/115 +f 201/160/114 153/161/115 200/162/115 +f 200/162/115 153/161/115 154/163/116 +f 200/162/115 154/163/116 199/164/116 +f 199/165/116 154/166/116 155/167/117 +f 199/165/116 155/167/117 198/168/117 +f 148/148/110 197/147/110 198/169/117 +f 148/148/110 198/169/117 155/170/117 +f 205/171/118 206/172/119 158/173/119 +f 205/171/118 158/173/119 157/174/118 +f 206/175/119 207/176/120 159/177/120 +f 206/175/119 159/177/120 158/178/119 +f 207/176/120 208/179/121 160/180/121 +f 207/176/120 160/180/121 159/177/120 +f 208/179/121 209/181/122 161/182/122 +f 208/179/121 161/182/122 160/180/121 +f 209/181/122 210/183/123 162/184/123 +f 209/181/122 162/184/123 161/182/122 +f 210/183/123 211/185/124 163/186/125 +f 210/183/123 163/186/125 162/184/123 +f 211/187/124 212/188/126 164/189/126 +f 211/187/124 164/189/126 163/190/125 +f 212/191/126 205/171/118 157/174/118 +f 212/191/126 157/174/118 164/192/126 +f 214/193/127 213/194/128 165/195/128 +f 214/193/127 165/195/128 166/196/127 +f 215/197/83 214/198/127 166/199/127 +f 215/197/83 166/199/127 167/200/83 +f 216/201/129 215/197/83 167/200/83 +f 216/201/129 167/200/83 168/202/130 +f 217/203/131 216/204/129 168/205/130 +f 217/203/131 168/205/130 169/206/131 +f 218/207/132 217/203/131 169/206/131 +f 218/207/132 169/206/131 170/208/133 +f 219/209/134 218/207/132 170/208/133 +f 219/209/134 170/208/133 171/210/134 +f 220/211/135 219/212/134 171/213/134 +f 220/211/135 171/213/134 172/214/135 +f 213/194/128 220/215/135 172/216/135 +f 213/194/128 172/216/135 165/195/128 +f 221/217/136 222/218/137 174/219/137 +f 221/217/136 174/219/137 173/220/136 +f 222/218/137 223/221/138 175/222/138 +f 222/218/137 175/222/138 174/219/137 +f 223/221/138 224/223/139 176/224/139 +f 223/221/138 176/224/139 175/222/138 +f 224/223/139 225/225/140 177/226/140 +f 224/223/139 177/226/140 176/224/139 +f 225/225/140 226/227/141 178/228/141 +f 225/225/140 178/228/141 177/226/140 +f 226/227/141 227/229/142 179/230/142 +f 226/227/141 179/230/142 178/228/141 +f 227/229/142 228/231/143 180/232/143 +f 227/229/142 180/232/143 179/230/142 +f 228/231/143 221/217/136 173/220/136 +f 228/231/143 173/220/136 180/232/143 +f 230/233/127 229/234/128 181/235/144 +f 230/233/127 181/235/144 182/236/145 +f 231/237/83 230/238/127 182/239/145 +f 231/237/83 182/239/145 183/240/146 +f 232/241/130 231/237/83 183/240/146 +f 232/241/130 183/240/146 184/242/147 +f 233/243/131 232/244/130 184/245/147 +f 233/243/131 184/245/147 185/246/148 +f 234/247/132 233/243/131 185/246/148 +f 234/247/132 185/246/148 186/248/149 +f 235/249/134 234/247/132 186/248/149 +f 235/249/134 186/248/149 187/250/150 +f 236/251/135 235/252/134 187/104/150 +f 236/251/135 187/104/150 188/101/151 +f 229/234/128 236/253/135 188/254/151 +f 229/234/128 188/254/151 181/235/144 +f 247/121/152 250/255/153 249/256/154 +f 247/121/152 249/256/154 248/257/155 +f 245/258/156 252/259/157 251/260/158 +f 245/258/156 251/260/158 246/120/159 +f 246/120/159 251/260/158 250/255/153 +f 246/120/159 250/255/153 247/121/152 f 189 190 o EAST_torch_Cylinder v 0.495314 0.450610 -0.000061 @@ -1601,181 +1594,181 @@ vn -0.119938 0.634083 -0.763878 usemtl torch_material_rustiron.jpg s off -f 414/261/167 402/262/167 403/263/167 -f 415/264/98 409/265/98 408/266/98 -f 414/261/167 403/263/167 404/267/167 -f 415/264/98 410/268/98 409/265/98 -f 414/261/168 404/267/168 405/269/168 -f 415/264/98 411/270/98 410/268/98 -f 414/261/169 405/269/169 406/271/169 -f 415/264/98 412/272/98 411/270/98 -f 414/261/170 406/271/170 407/273/170 -f 415/264/98 413/274/98 412/272/98 -f 414/261/170 407/273/170 402/262/170 -f 415/264/98 408/266/98 413/274/98 -f 402/275/171 408/276/171 409/277/171 -f 402/275/171 409/277/171 403/278/171 -f 403/279/141 409/280/141 410/281/141 -f 403/279/141 410/281/141 404/282/141 -f 404/282/92 410/281/92 411/283/92 -f 404/282/92 411/283/92 405/284/92 -f 405/285/91 411/286/91 412/287/91 -f 405/285/91 412/287/91 406/288/91 -f 406/288/172 412/287/172 413/289/172 -f 406/288/172 413/289/172 407/290/172 -f 407/291/173 413/292/173 408/276/173 -f 407/291/173 408/276/173 402/275/173 -f 424/293/96 418/294/96 423/295/96 -f 424/293/96 423/295/96 429/296/96 -f 425/297/172 419/298/172 418/299/172 -f 425/297/172 418/299/172 424/300/172 -f 426/301/91 420/302/91 419/298/91 -f 426/301/91 419/298/91 425/297/91 -f 427/303/92 421/304/92 420/305/92 -f 427/303/92 420/305/92 426/306/92 -f 428/307/141 422/308/141 421/304/141 -f 428/307/141 421/304/141 427/303/141 -f 429/296/95 423/295/95 422/309/95 -f 429/296/95 422/309/95 428/310/95 -f 416/311/98 423/312/98 418/313/98 -f 417/314/170 424/315/170 429/316/170 -f 416/311/98 418/313/98 419/317/98 -f 417/314/174 425/318/174 424/315/174 -f 416/311/98 419/317/98 420/319/98 -f 417/314/85 426/320/85 425/318/85 -f 416/311/98 420/319/98 421/321/98 -f 417/314/85 427/322/85 426/320/85 -f 416/311/98 421/321/98 422/323/98 -f 417/314/175 428/324/175 427/322/175 -f 416/311/98 422/323/98 423/312/98 -f 417/314/167 429/316/167 428/324/167 -f 330/325/176 337/326/176 431/327/176 -f 330/325/176 431/327/176 430/328/176 -f 337/326/177 336/329/177 432/330/177 -f 337/326/177 432/330/177 431/327/177 -f 336/329/178 335/331/178 433/332/178 -f 336/329/178 433/332/178 432/330/178 -f 335/331/179 334/333/179 434/334/179 -f 335/331/179 434/334/179 433/332/179 -f 334/333/180 333/335/180 435/336/180 -f 334/333/180 435/336/180 434/334/180 -f 333/335/181 332/337/181 436/338/181 -f 333/335/181 436/338/181 435/336/181 -f 332/337/182 331/339/182 437/340/182 -f 332/337/182 437/340/182 436/338/182 -f 331/339/183 330/325/183 430/328/183 -f 331/339/183 430/328/183 437/340/183 -f 396/341/184 397/342/184 434/343/184 -f 396/341/184 434/343/184 435/344/184 -f 395/345/185 396/346/185 435/336/185 -f 395/345/185 435/336/185 436/338/185 -f 394/347/186 395/348/186 436/349/186 -f 394/347/186 436/349/186 437/350/186 -f 394/347/187 437/350/187 430/351/187 -f 394/347/187 430/351/187 401/352/187 -f 400/353/188 401/352/188 430/351/188 -f 400/353/188 430/351/188 431/354/188 -f 399/355/189 400/356/189 431/357/189 -f 399/355/189 431/357/189 432/358/189 -f 398/359/190 399/355/190 432/358/190 -f 398/359/190 432/358/190 433/360/190 -f 397/342/191 398/361/191 433/362/191 -f 397/342/191 433/362/191 434/343/191 +f 414/261/160 402/262/160 403/263/160 +f 415/264/91 409/265/91 408/266/91 +f 414/261/160 403/263/160 404/267/160 +f 415/264/91 410/268/91 409/265/91 +f 414/261/161 404/267/161 405/269/161 +f 415/264/91 411/270/91 410/268/91 +f 414/261/162 405/269/162 406/271/162 +f 415/264/91 412/272/91 411/270/91 +f 414/261/163 406/271/163 407/273/163 +f 415/264/91 413/274/91 412/272/91 +f 414/261/163 407/273/163 402/262/163 +f 415/264/91 408/266/91 413/274/91 +f 402/275/164 408/276/164 409/277/164 +f 402/275/164 409/277/164 403/278/164 +f 403/279/134 409/280/134 410/281/134 +f 403/279/134 410/281/134 404/282/134 +f 404/282/85 410/281/85 411/283/85 +f 404/282/85 411/283/85 405/284/85 +f 405/285/84 411/286/84 412/287/84 +f 405/285/84 412/287/84 406/288/84 +f 406/288/165 412/287/165 413/289/165 +f 406/288/165 413/289/165 407/290/165 +f 407/291/166 413/292/166 408/276/166 +f 407/291/166 408/276/166 402/275/166 +f 424/293/89 418/294/89 423/295/89 +f 424/293/89 423/295/89 429/296/89 +f 425/297/165 419/298/165 418/299/165 +f 425/297/165 418/299/165 424/300/165 +f 426/301/84 420/302/84 419/298/84 +f 426/301/84 419/298/84 425/297/84 +f 427/303/85 421/304/85 420/305/85 +f 427/303/85 420/305/85 426/306/85 +f 428/307/134 422/308/134 421/304/134 +f 428/307/134 421/304/134 427/303/134 +f 429/296/88 423/295/88 422/309/88 +f 429/296/88 422/309/88 428/310/88 +f 416/311/91 423/312/91 418/313/91 +f 417/314/163 424/315/163 429/316/163 +f 416/311/91 418/313/91 419/317/91 +f 417/314/167 425/318/167 424/315/167 +f 416/311/91 419/317/91 420/319/91 +f 417/314/78 426/320/78 425/318/78 +f 416/311/91 420/319/91 421/321/91 +f 417/314/78 427/322/78 426/320/78 +f 416/311/91 421/321/91 422/323/91 +f 417/314/168 428/324/168 427/322/168 +f 416/311/91 422/323/91 423/312/91 +f 417/314/160 429/316/160 428/324/160 +f 330/325/169 337/326/169 431/327/169 +f 330/325/169 431/327/169 430/328/169 +f 337/326/170 336/329/170 432/330/170 +f 337/326/170 432/330/170 431/327/170 +f 336/329/171 335/331/171 433/332/171 +f 336/329/171 433/332/171 432/330/171 +f 335/331/172 334/333/172 434/334/172 +f 335/331/172 434/334/172 433/332/172 +f 334/333/173 333/335/173 435/336/173 +f 334/333/173 435/336/173 434/334/173 +f 333/335/174 332/337/174 436/338/174 +f 333/335/174 436/338/174 435/336/174 +f 332/337/175 331/339/175 437/340/175 +f 332/337/175 437/340/175 436/338/175 +f 331/339/176 330/325/176 430/328/176 +f 331/339/176 430/328/176 437/340/176 +f 396/341/177 397/342/177 434/343/177 +f 396/341/177 434/343/177 435/344/177 +f 395/345/178 396/346/178 435/336/178 +f 395/345/178 435/336/178 436/338/178 +f 394/347/179 395/348/179 436/349/179 +f 394/347/179 436/349/179 437/350/179 +f 394/347/180 437/350/180 430/351/180 +f 394/347/180 430/351/180 401/352/180 +f 400/353/181 401/352/181 430/351/181 +f 400/353/181 430/351/181 431/354/181 +f 399/355/182 400/356/182 431/357/182 +f 399/355/182 431/357/182 432/358/182 +f 398/359/183 399/355/183 432/358/183 +f 398/359/183 432/358/183 433/360/183 +f 397/342/184 398/361/184 433/362/184 +f 397/342/184 433/362/184 434/343/184 s 1 -f 305/363/192 289/364/192 290/365/192 -f 305/363/192 290/365/192 291/366/192 -f 305/363/192 291/366/192 292/367/192 -f 305/363/192 292/367/192 293/368/192 -f 305/363/192 293/368/192 294/369/192 -f 305/363/192 294/369/192 295/370/192 -f 305/363/192 295/370/192 296/371/192 -f 296/371/192 289/364/192 305/363/192 -f 346/372/193 297/373/193 298/374/194 -f 346/372/193 298/374/194 353/375/194 -f 353/376/194 298/377/194 299/378/195 -f 353/376/194 299/378/195 352/379/195 -f 352/379/195 299/378/195 300/380/196 -f 352/379/195 300/380/196 351/381/196 -f 351/382/196 300/383/196 301/384/197 -f 351/382/196 301/384/197 350/385/197 -f 350/385/197 301/384/197 302/386/198 -f 350/385/197 302/386/198 349/387/198 -f 349/387/198 302/386/198 303/388/199 -f 349/387/198 303/388/199 348/389/199 -f 348/390/199 303/391/199 304/392/200 -f 348/390/199 304/392/200 347/393/200 -f 297/373/193 346/372/193 347/394/200 -f 297/373/193 347/394/200 304/395/200 -f 354/396/201 355/397/202 307/398/202 -f 354/396/201 307/398/202 306/399/201 -f 355/400/202 356/401/203 308/402/203 -f 355/400/202 308/402/203 307/403/202 -f 356/401/203 357/404/204 309/405/204 -f 356/401/203 309/405/204 308/402/203 -f 357/404/204 358/406/205 310/407/205 -f 357/404/204 310/407/205 309/405/204 -f 358/406/205 359/408/206 311/409/206 -f 358/406/205 311/409/206 310/407/205 -f 359/408/206 360/410/207 312/411/208 -f 359/408/206 312/411/208 311/409/206 -f 360/412/207 361/413/209 313/414/209 -f 360/412/207 313/414/209 312/415/208 -f 361/416/209 354/396/201 306/399/201 -f 361/416/209 306/399/201 313/417/209 -f 363/418/210 362/419/211 314/420/211 -f 363/418/210 314/420/211 315/421/210 -f 364/422/141 363/423/210 315/424/210 -f 364/422/141 315/424/210 316/425/141 -f 365/426/212 364/422/141 316/425/141 -f 365/426/212 316/425/141 317/427/213 -f 366/428/214 365/429/212 317/430/213 -f 366/428/214 317/430/213 318/431/214 -f 367/432/215 366/428/214 318/431/214 -f 367/432/215 318/431/214 319/433/216 -f 368/434/90 367/432/215 319/433/216 -f 368/434/90 319/433/216 320/435/90 -f 369/436/217 368/437/90 320/438/90 -f 369/436/217 320/438/90 321/439/217 -f 362/419/211 369/440/217 321/441/217 -f 362/419/211 321/441/217 314/420/211 -f 370/442/218 371/443/219 323/444/219 -f 370/442/218 323/444/219 322/445/218 -f 371/443/219 372/446/220 324/447/220 -f 371/443/219 324/447/220 323/444/219 -f 372/446/220 373/448/221 325/449/221 -f 372/446/220 325/449/221 324/447/220 -f 373/448/221 374/450/222 326/451/222 -f 373/448/221 326/451/222 325/449/221 -f 374/450/222 375/452/223 327/453/223 -f 374/450/222 327/453/223 326/451/222 -f 375/452/223 376/454/224 328/455/224 -f 375/452/223 328/455/224 327/453/223 -f 376/454/224 377/456/225 329/457/225 -f 376/454/224 329/457/225 328/455/224 -f 377/456/225 370/442/218 322/445/218 -f 377/456/225 322/445/218 329/457/225 -f 379/458/210 378/459/211 330/460/226 -f 379/458/210 330/460/226 331/461/227 -f 380/462/141 379/463/210 331/464/227 -f 380/462/141 331/464/227 332/465/228 -f 381/466/213 380/462/141 332/465/228 -f 381/466/213 332/465/228 333/467/229 -f 382/468/214 381/469/213 333/470/229 -f 382/468/214 333/470/229 334/471/230 -f 383/472/216 382/468/214 334/471/230 -f 383/472/216 334/471/230 335/473/231 -f 384/474/90 383/472/216 335/473/231 -f 384/474/90 335/473/231 336/475/232 -f 385/476/217 384/477/90 336/329/232 -f 385/476/217 336/329/232 337/326/233 -f 378/459/211 385/478/217 337/479/233 -f 378/459/211 337/479/233 330/460/226 -f 396/346/234 399/480/235 398/481/236 -f 396/346/234 398/481/236 397/482/237 -f 394/483/238 401/484/239 400/485/240 -f 394/483/238 400/485/240 395/345/241 -f 395/345/241 400/485/240 399/480/235 -f 395/345/241 399/480/235 396/346/234 +f 305/363/185 289/364/185 290/365/185 +f 305/363/185 290/365/185 291/366/185 +f 305/363/185 291/366/185 292/367/185 +f 305/363/185 292/367/185 293/368/185 +f 305/363/185 293/368/185 294/369/185 +f 305/363/185 294/369/185 295/370/185 +f 305/363/185 295/370/185 296/371/185 +f 296/371/185 289/364/185 305/363/185 +f 346/372/186 297/373/186 298/374/187 +f 346/372/186 298/374/187 353/375/187 +f 353/376/187 298/377/187 299/378/188 +f 353/376/187 299/378/188 352/379/188 +f 352/379/188 299/378/188 300/380/189 +f 352/379/188 300/380/189 351/381/189 +f 351/382/189 300/383/189 301/384/190 +f 351/382/189 301/384/190 350/385/190 +f 350/385/190 301/384/190 302/386/191 +f 350/385/190 302/386/191 349/387/191 +f 349/387/191 302/386/191 303/388/192 +f 349/387/191 303/388/192 348/389/192 +f 348/390/192 303/391/192 304/392/193 +f 348/390/192 304/392/193 347/393/193 +f 297/373/186 346/372/186 347/394/193 +f 297/373/186 347/394/193 304/395/193 +f 354/396/194 355/397/195 307/398/195 +f 354/396/194 307/398/195 306/399/194 +f 355/400/195 356/401/196 308/402/196 +f 355/400/195 308/402/196 307/403/195 +f 356/401/196 357/404/197 309/405/197 +f 356/401/196 309/405/197 308/402/196 +f 357/404/197 358/406/198 310/407/198 +f 357/404/197 310/407/198 309/405/197 +f 358/406/198 359/408/199 311/409/199 +f 358/406/198 311/409/199 310/407/198 +f 359/408/199 360/410/200 312/411/201 +f 359/408/199 312/411/201 311/409/199 +f 360/412/200 361/413/202 313/414/202 +f 360/412/200 313/414/202 312/415/201 +f 361/416/202 354/396/194 306/399/194 +f 361/416/202 306/399/194 313/417/202 +f 363/418/203 362/419/204 314/420/204 +f 363/418/203 314/420/204 315/421/203 +f 364/422/134 363/423/203 315/424/203 +f 364/422/134 315/424/203 316/425/134 +f 365/426/205 364/422/134 316/425/134 +f 365/426/205 316/425/134 317/427/206 +f 366/428/207 365/429/205 317/430/206 +f 366/428/207 317/430/206 318/431/207 +f 367/432/208 366/428/207 318/431/207 +f 367/432/208 318/431/207 319/433/209 +f 368/434/83 367/432/208 319/433/209 +f 368/434/83 319/433/209 320/435/83 +f 369/436/210 368/437/83 320/438/83 +f 369/436/210 320/438/83 321/439/210 +f 362/419/204 369/440/210 321/441/210 +f 362/419/204 321/441/210 314/420/204 +f 370/442/211 371/443/212 323/444/212 +f 370/442/211 323/444/212 322/445/211 +f 371/443/212 372/446/213 324/447/213 +f 371/443/212 324/447/213 323/444/212 +f 372/446/213 373/448/214 325/449/214 +f 372/446/213 325/449/214 324/447/213 +f 373/448/214 374/450/215 326/451/215 +f 373/448/214 326/451/215 325/449/214 +f 374/450/215 375/452/216 327/453/216 +f 374/450/215 327/453/216 326/451/215 +f 375/452/216 376/454/217 328/455/217 +f 375/452/216 328/455/217 327/453/216 +f 376/454/217 377/456/218 329/457/218 +f 376/454/217 329/457/218 328/455/217 +f 377/456/218 370/442/211 322/445/211 +f 377/456/218 322/445/211 329/457/218 +f 379/458/203 378/459/204 330/460/219 +f 379/458/203 330/460/219 331/461/220 +f 380/462/134 379/463/203 331/464/220 +f 380/462/134 331/464/220 332/465/221 +f 381/466/206 380/462/134 332/465/221 +f 381/466/206 332/465/221 333/467/222 +f 382/468/207 381/469/206 333/470/222 +f 382/468/207 333/470/222 334/471/223 +f 383/472/209 382/468/207 334/471/223 +f 383/472/209 334/471/223 335/473/224 +f 384/474/83 383/472/209 335/473/224 +f 384/474/83 335/473/224 336/475/225 +f 385/476/210 384/477/83 336/329/225 +f 385/476/210 336/329/225 337/326/226 +f 378/459/204 385/478/210 337/479/226 +f 378/459/204 337/479/226 330/460/219 +f 396/346/227 399/480/228 398/481/229 +f 396/346/227 398/481/229 397/482/230 +f 394/483/231 401/484/232 400/485/233 +f 394/483/231 400/485/233 395/345/234 +f 395/345/234 400/485/233 399/480/228 +f 395/345/234 399/480/228 396/346/227 f 338 339 o SOUTH_torch_Cylinder v -0.000165 0.450610 0.495418 @@ -2233,181 +2226,181 @@ vn 0.763878 0.634083 -0.119938 usemtl torch_material_rustiron.jpg s off -f 563/486/242 551/487/242 552/488/242 -f 564/489/141 558/490/141 557/491/141 -f 563/486/242 552/488/242 553/492/242 -f 564/489/141 559/493/141 558/490/141 -f 563/486/243 553/492/243 554/494/243 -f 564/489/141 560/495/141 559/493/141 -f 563/486/244 554/494/244 555/496/244 -f 564/489/141 561/497/141 560/495/141 -f 563/486/245 555/496/245 556/498/245 -f 564/489/141 562/499/141 561/497/141 -f 563/486/245 556/498/245 551/487/245 -f 564/489/141 557/491/141 562/499/141 -f 551/500/246 557/501/246 558/502/246 -f 551/500/246 558/502/246 552/503/246 -f 552/504/85 558/505/85 559/506/85 -f 552/504/85 559/506/85 553/507/85 -f 553/507/247 559/506/247 560/508/247 -f 553/507/247 560/508/247 554/509/247 -f 554/510/248 560/511/248 561/512/248 -f 554/510/248 561/512/248 555/513/248 -f 555/513/249 561/512/249 562/514/249 -f 555/513/249 562/514/249 556/515/249 -f 556/516/250 562/517/250 557/501/250 -f 556/516/250 557/501/250 551/500/250 -f 573/518/251 567/519/251 572/520/251 -f 573/518/251 572/520/251 578/521/251 -f 574/522/249 568/523/249 567/524/249 -f 574/522/249 567/524/249 573/525/249 -f 575/526/248 569/527/248 568/523/248 -f 575/526/248 568/523/248 574/522/248 -f 576/528/247 570/529/247 569/530/247 -f 576/528/247 569/530/247 575/531/247 -f 577/532/85 571/533/85 570/529/85 -f 577/532/85 570/529/85 576/528/85 -f 578/521/252 572/520/252 571/534/252 -f 578/521/252 571/534/252 577/535/252 -f 565/536/141 572/537/141 567/538/141 -f 566/539/245 573/540/245 578/541/245 -f 565/536/141 567/538/141 568/542/141 -f 566/539/253 574/543/253 573/540/253 -f 565/536/141 568/542/141 569/544/141 -f 566/539/90 575/545/90 574/543/90 -f 565/536/141 569/544/141 570/546/141 -f 566/539/90 576/547/90 575/545/90 -f 565/536/141 570/546/141 571/548/141 -f 566/539/254 577/549/254 576/547/254 -f 565/536/141 571/548/141 572/537/141 -f 566/539/242 578/541/242 577/549/242 -f 479/550/255 486/551/255 580/552/255 -f 479/550/255 580/552/255 579/553/255 -f 486/551/256 485/554/256 581/555/256 -f 486/551/256 581/555/256 580/552/256 -f 485/554/257 484/556/257 582/557/257 -f 485/554/257 582/557/257 581/555/257 -f 484/556/258 483/558/258 583/559/258 -f 484/556/258 583/559/258 582/557/258 -f 483/558/259 482/560/259 584/561/259 -f 483/558/259 584/561/259 583/559/259 -f 482/560/260 481/562/260 585/563/260 -f 482/560/260 585/563/260 584/561/260 -f 481/562/261 480/564/261 586/565/261 -f 481/562/261 586/565/261 585/563/261 -f 480/564/262 479/550/262 579/553/262 -f 480/564/262 579/553/262 586/565/262 -f 545/566/263 546/567/263 583/568/263 -f 545/566/263 583/568/263 584/569/263 -f 544/570/264 545/571/264 584/561/264 -f 544/570/264 584/561/264 585/563/264 -f 543/572/265 544/573/265 585/574/265 -f 543/572/265 585/574/265 586/575/265 -f 543/572/266 586/575/266 579/576/266 -f 543/572/266 579/576/266 550/577/266 -f 549/578/267 550/577/267 579/576/267 -f 549/578/267 579/576/267 580/579/267 -f 548/580/268 549/581/268 580/582/268 -f 548/580/268 580/582/268 581/583/268 -f 547/584/269 548/580/269 581/583/269 -f 547/584/269 581/583/269 582/585/269 -f 546/567/270 547/586/270 582/587/270 -f 546/567/270 582/587/270 583/568/270 +f 563/486/235 551/487/235 552/488/235 +f 564/489/134 558/490/134 557/491/134 +f 563/486/235 552/488/235 553/492/235 +f 564/489/134 559/493/134 558/490/134 +f 563/486/236 553/492/236 554/494/236 +f 564/489/134 560/495/134 559/493/134 +f 563/486/237 554/494/237 555/496/237 +f 564/489/134 561/497/134 560/495/134 +f 563/486/238 555/496/238 556/498/238 +f 564/489/134 562/499/134 561/497/134 +f 563/486/238 556/498/238 551/487/238 +f 564/489/134 557/491/134 562/499/134 +f 551/500/239 557/501/239 558/502/239 +f 551/500/239 558/502/239 552/503/239 +f 552/504/78 558/505/78 559/506/78 +f 552/504/78 559/506/78 553/507/78 +f 553/507/240 559/506/240 560/508/240 +f 553/507/240 560/508/240 554/509/240 +f 554/510/241 560/511/241 561/512/241 +f 554/510/241 561/512/241 555/513/241 +f 555/513/242 561/512/242 562/514/242 +f 555/513/242 562/514/242 556/515/242 +f 556/516/243 562/517/243 557/501/243 +f 556/516/243 557/501/243 551/500/243 +f 573/518/244 567/519/244 572/520/244 +f 573/518/244 572/520/244 578/521/244 +f 574/522/242 568/523/242 567/524/242 +f 574/522/242 567/524/242 573/525/242 +f 575/526/241 569/527/241 568/523/241 +f 575/526/241 568/523/241 574/522/241 +f 576/528/240 570/529/240 569/530/240 +f 576/528/240 569/530/240 575/531/240 +f 577/532/78 571/533/78 570/529/78 +f 577/532/78 570/529/78 576/528/78 +f 578/521/245 572/520/245 571/534/245 +f 578/521/245 571/534/245 577/535/245 +f 565/536/134 572/537/134 567/538/134 +f 566/539/238 573/540/238 578/541/238 +f 565/536/134 567/538/134 568/542/134 +f 566/539/246 574/543/246 573/540/246 +f 565/536/134 568/542/134 569/544/134 +f 566/539/83 575/545/83 574/543/83 +f 565/536/134 569/544/134 570/546/134 +f 566/539/83 576/547/83 575/545/83 +f 565/536/134 570/546/134 571/548/134 +f 566/539/247 577/549/247 576/547/247 +f 565/536/134 571/548/134 572/537/134 +f 566/539/235 578/541/235 577/549/235 +f 479/550/248 486/551/248 580/552/248 +f 479/550/248 580/552/248 579/553/248 +f 486/551/249 485/554/249 581/555/249 +f 486/551/249 581/555/249 580/552/249 +f 485/554/250 484/556/250 582/557/250 +f 485/554/250 582/557/250 581/555/250 +f 484/556/251 483/558/251 583/559/251 +f 484/556/251 583/559/251 582/557/251 +f 483/558/252 482/560/252 584/561/252 +f 483/558/252 584/561/252 583/559/252 +f 482/560/253 481/562/253 585/563/253 +f 482/560/253 585/563/253 584/561/253 +f 481/562/254 480/564/254 586/565/254 +f 481/562/254 586/565/254 585/563/254 +f 480/564/255 479/550/255 579/553/255 +f 480/564/255 579/553/255 586/565/255 +f 545/566/256 546/567/256 583/568/256 +f 545/566/256 583/568/256 584/569/256 +f 544/570/257 545/571/257 584/561/257 +f 544/570/257 584/561/257 585/563/257 +f 543/572/258 544/573/258 585/574/258 +f 543/572/258 585/574/258 586/575/258 +f 543/572/259 586/575/259 579/576/259 +f 543/572/259 579/576/259 550/577/259 +f 549/578/260 550/577/260 579/576/260 +f 549/578/260 579/576/260 580/579/260 +f 548/580/261 549/581/261 580/582/261 +f 548/580/261 580/582/261 581/583/261 +f 547/584/262 548/580/262 581/583/262 +f 547/584/262 581/583/262 582/585/262 +f 546/567/263 547/586/263 582/587/263 +f 546/567/263 582/587/263 583/568/263 s 1 -f 454/588/271 438/589/271 439/590/271 -f 454/588/271 439/590/271 440/591/271 -f 454/588/271 440/591/271 441/592/271 -f 454/588/271 441/592/271 442/593/271 -f 454/588/271 442/593/271 443/594/271 -f 454/588/271 443/594/271 444/595/271 -f 454/588/271 444/595/271 445/596/271 -f 445/596/271 438/589/271 454/588/271 -f 495/597/272 446/598/272 447/599/273 -f 495/597/272 447/599/273 502/600/273 -f 502/601/273 447/602/273 448/603/274 -f 502/601/273 448/603/274 501/604/274 -f 501/604/274 448/603/274 449/605/275 -f 501/604/274 449/605/275 500/606/275 -f 500/607/275 449/608/275 450/609/276 -f 500/607/275 450/609/276 499/610/276 -f 499/610/276 450/609/276 451/611/277 -f 499/610/276 451/611/277 498/612/277 -f 498/612/277 451/611/277 452/613/278 -f 498/612/277 452/613/278 497/614/278 -f 497/615/278 452/616/278 453/617/279 -f 497/615/278 453/617/279 496/618/279 -f 446/598/272 495/597/272 496/619/279 -f 446/598/272 496/619/279 453/620/279 -f 503/621/280 504/622/281 456/623/281 -f 503/621/280 456/623/281 455/624/280 -f 504/625/281 505/626/282 457/627/282 -f 504/625/281 457/627/282 456/628/281 -f 505/626/282 506/629/283 458/630/283 -f 505/626/282 458/630/283 457/627/282 -f 506/629/283 507/631/284 459/632/284 -f 506/629/283 459/632/284 458/630/283 -f 507/631/284 508/633/285 460/634/285 -f 507/631/284 460/634/285 459/632/284 -f 508/633/285 509/635/286 461/636/286 -f 508/633/285 461/636/286 460/634/285 -f 509/637/286 510/638/287 462/639/287 -f 509/637/286 462/639/287 461/640/286 -f 510/641/287 503/621/280 455/624/280 -f 510/641/287 455/624/280 462/642/287 -f 512/643/288 511/644/289 463/645/289 -f 512/643/288 463/645/289 464/646/288 -f 513/647/85 512/648/288 464/649/288 -f 513/647/85 464/649/288 465/650/85 -f 514/651/290 513/647/85 465/650/85 -f 514/651/290 465/650/85 466/652/291 -f 515/653/292 514/654/290 466/655/291 -f 515/653/292 466/655/291 467/656/292 -f 516/657/293 515/653/292 467/656/292 -f 516/657/293 467/656/292 468/658/294 -f 517/659/295 516/657/293 468/658/294 -f 517/659/295 468/658/294 469/660/98 -f 518/661/296 517/662/295 469/663/98 -f 518/661/296 469/663/98 470/664/296 -f 511/644/289 518/665/296 470/666/296 -f 511/644/289 470/666/296 463/645/289 -f 519/667/297 520/668/298 472/669/298 -f 519/667/297 472/669/298 471/670/297 -f 520/668/298 521/671/299 473/672/299 -f 520/668/298 473/672/299 472/669/298 -f 521/671/299 522/673/300 474/674/300 -f 521/671/299 474/674/300 473/672/299 -f 522/673/300 523/675/301 475/676/301 -f 522/673/300 475/676/301 474/674/300 -f 523/675/301 524/677/302 476/678/302 -f 523/675/301 476/678/302 475/676/301 -f 524/677/302 525/679/303 477/680/303 -f 524/677/302 477/680/303 476/678/302 -f 525/679/303 526/681/304 478/682/304 -f 525/679/303 478/682/304 477/680/303 -f 526/681/304 519/667/297 471/670/297 -f 526/681/304 471/670/297 478/682/304 -f 528/683/288 527/684/289 479/685/305 -f 528/683/288 479/685/305 480/686/306 -f 529/687/85 528/688/288 480/689/306 -f 529/687/85 480/689/306 481/690/307 -f 530/691/291 529/687/85 481/690/307 -f 530/691/291 481/690/307 482/692/308 -f 531/693/292 530/694/291 482/695/308 -f 531/693/292 482/695/308 483/696/309 -f 532/697/293 531/693/292 483/696/309 -f 532/697/293 483/696/309 484/698/310 -f 533/699/98 532/697/293 484/698/310 -f 533/699/98 484/698/310 485/700/311 -f 534/701/296 533/702/98 485/554/311 -f 534/701/296 485/554/311 486/551/312 -f 527/684/289 534/703/296 486/704/312 -f 527/684/289 486/704/312 479/685/305 -f 545/571/313 548/705/314 547/706/315 -f 545/571/313 547/706/315 546/707/316 -f 543/708/317 550/709/318 549/710/319 -f 543/708/317 549/710/319 544/570/320 -f 544/570/320 549/710/319 548/705/314 -f 544/570/320 548/705/314 545/571/313 +f 454/588/264 438/589/264 439/590/264 +f 454/588/264 439/590/264 440/591/264 +f 454/588/264 440/591/264 441/592/264 +f 454/588/264 441/592/264 442/593/264 +f 454/588/264 442/593/264 443/594/264 +f 454/588/264 443/594/264 444/595/264 +f 454/588/264 444/595/264 445/596/264 +f 445/596/264 438/589/264 454/588/264 +f 495/597/265 446/598/265 447/599/266 +f 495/597/265 447/599/266 502/600/266 +f 502/601/266 447/602/266 448/603/267 +f 502/601/266 448/603/267 501/604/267 +f 501/604/267 448/603/267 449/605/268 +f 501/604/267 449/605/268 500/606/268 +f 500/607/268 449/608/268 450/609/269 +f 500/607/268 450/609/269 499/610/269 +f 499/610/269 450/609/269 451/611/270 +f 499/610/269 451/611/270 498/612/270 +f 498/612/270 451/611/270 452/613/271 +f 498/612/270 452/613/271 497/614/271 +f 497/615/271 452/616/271 453/617/272 +f 497/615/271 453/617/272 496/618/272 +f 446/598/265 495/597/265 496/619/272 +f 446/598/265 496/619/272 453/620/272 +f 503/621/273 504/622/274 456/623/274 +f 503/621/273 456/623/274 455/624/273 +f 504/625/274 505/626/275 457/627/275 +f 504/625/274 457/627/275 456/628/274 +f 505/626/275 506/629/276 458/630/276 +f 505/626/275 458/630/276 457/627/275 +f 506/629/276 507/631/277 459/632/277 +f 506/629/276 459/632/277 458/630/276 +f 507/631/277 508/633/278 460/634/278 +f 507/631/277 460/634/278 459/632/277 +f 508/633/278 509/635/279 461/636/279 +f 508/633/278 461/636/279 460/634/278 +f 509/637/279 510/638/280 462/639/280 +f 509/637/279 462/639/280 461/640/279 +f 510/641/280 503/621/273 455/624/273 +f 510/641/280 455/624/273 462/642/280 +f 512/643/281 511/644/282 463/645/282 +f 512/643/281 463/645/282 464/646/281 +f 513/647/78 512/648/281 464/649/281 +f 513/647/78 464/649/281 465/650/78 +f 514/651/283 513/647/78 465/650/78 +f 514/651/283 465/650/78 466/652/284 +f 515/653/285 514/654/283 466/655/284 +f 515/653/285 466/655/284 467/656/285 +f 516/657/286 515/653/285 467/656/285 +f 516/657/286 467/656/285 468/658/287 +f 517/659/288 516/657/286 468/658/287 +f 517/659/288 468/658/287 469/660/91 +f 518/661/289 517/662/288 469/663/91 +f 518/661/289 469/663/91 470/664/289 +f 511/644/282 518/665/289 470/666/289 +f 511/644/282 470/666/289 463/645/282 +f 519/667/290 520/668/291 472/669/291 +f 519/667/290 472/669/291 471/670/290 +f 520/668/291 521/671/292 473/672/292 +f 520/668/291 473/672/292 472/669/291 +f 521/671/292 522/673/293 474/674/293 +f 521/671/292 474/674/293 473/672/292 +f 522/673/293 523/675/294 475/676/294 +f 522/673/293 475/676/294 474/674/293 +f 523/675/294 524/677/295 476/678/295 +f 523/675/294 476/678/295 475/676/294 +f 524/677/295 525/679/296 477/680/296 +f 524/677/295 477/680/296 476/678/295 +f 525/679/296 526/681/297 478/682/297 +f 525/679/296 478/682/297 477/680/296 +f 526/681/297 519/667/290 471/670/290 +f 526/681/297 471/670/290 478/682/297 +f 528/683/281 527/684/282 479/685/298 +f 528/683/281 479/685/298 480/686/299 +f 529/687/78 528/688/281 480/689/299 +f 529/687/78 480/689/299 481/690/300 +f 530/691/284 529/687/78 481/690/300 +f 530/691/284 481/690/300 482/692/301 +f 531/693/285 530/694/284 482/695/301 +f 531/693/285 482/695/301 483/696/302 +f 532/697/286 531/693/285 483/696/302 +f 532/697/286 483/696/302 484/698/303 +f 533/699/91 532/697/286 484/698/303 +f 533/699/91 484/698/303 485/700/304 +f 534/701/289 533/702/91 485/554/304 +f 534/701/289 485/554/304 486/551/305 +f 527/684/282 534/703/289 486/704/305 +f 527/684/282 486/704/305 479/685/298 +f 545/571/306 548/705/307 547/706/308 +f 545/571/306 547/706/308 546/707/309 +f 543/708/310 550/709/311 549/710/312 +f 543/708/310 549/710/312 544/570/313 +f 544/570/313 549/710/312 548/705/307 +f 544/570/313 548/705/307 545/571/306 f 487 488 o NORTH_torch_Cylinder v -0.000165 0.450610 -0.495540 @@ -2861,181 +2854,181 @@ vn -0.763878 0.634083 0.119938 usemtl torch_material_rustiron.jpg s off -f 712/711/321 700/712/321 701/713/321 -f 713/714/90 707/715/90 706/716/90 -f 712/711/321 701/713/321 702/717/321 -f 713/714/90 708/718/90 707/715/90 -f 712/711/322 702/717/322 703/719/322 -f 713/714/90 709/720/90 708/718/90 -f 712/711/323 703/719/323 704/721/323 -f 713/714/90 710/722/90 709/720/90 -f 712/711/324 704/721/324 705/723/324 -f 713/714/90 711/724/90 710/722/90 -f 712/711/324 705/723/324 700/712/324 -f 713/714/90 706/716/90 711/724/90 -f 700/725/325 706/726/325 707/727/325 -f 700/725/325 707/727/325 701/728/325 -f 701/729/98 707/730/98 708/731/98 -f 701/729/98 708/731/98 702/732/98 -f 702/732/248 708/731/248 709/733/248 -f 702/732/248 709/733/248 703/734/248 -f 703/735/247 709/736/247 710/737/247 -f 703/735/247 710/737/247 704/738/247 -f 704/738/326 710/737/326 711/739/326 -f 704/738/326 711/739/326 705/740/326 -f 705/741/327 711/742/327 706/726/327 -f 705/741/327 706/726/327 700/725/327 -f 722/743/252 716/744/252 721/745/252 -f 722/743/252 721/745/252 727/746/252 -f 723/747/326 717/748/326 716/749/326 -f 723/747/326 716/749/326 722/750/326 -f 724/751/247 718/752/247 717/748/247 -f 724/751/247 717/748/247 723/747/247 -f 725/753/248 719/754/248 718/755/248 -f 725/753/248 718/755/248 724/756/248 -f 726/757/98 720/758/98 719/754/98 -f 726/757/98 719/754/98 725/753/98 -f 727/746/251 721/745/251 720/759/251 -f 727/746/251 720/759/251 726/760/251 -f 714/761/90 721/762/90 716/763/90 -f 715/764/324 722/765/324 727/766/324 -f 714/761/90 716/763/90 717/767/90 -f 715/764/328 723/768/328 722/765/328 -f 714/761/90 717/767/90 718/769/90 -f 715/764/141 724/770/141 723/768/141 -f 714/761/90 718/769/90 719/771/90 -f 715/764/141 725/772/141 724/770/141 -f 714/761/90 719/771/90 720/773/90 -f 715/764/329 726/774/329 725/772/329 -f 714/761/90 720/773/90 721/762/90 -f 715/764/321 727/766/321 726/774/321 -f 628/775/330 635/776/330 729/777/330 -f 628/775/330 729/777/330 728/778/330 -f 635/776/331 634/779/331 730/780/331 -f 635/776/331 730/780/331 729/777/331 -f 634/779/332 633/781/332 731/782/332 -f 634/779/332 731/782/332 730/780/332 -f 633/781/333 632/783/333 732/784/333 -f 633/781/333 732/784/333 731/782/333 -f 632/783/334 631/785/334 733/786/334 -f 632/783/334 733/786/334 732/784/334 -f 631/785/335 630/787/335 734/788/335 -f 631/785/335 734/788/335 733/786/335 -f 630/787/336 629/789/336 735/790/336 -f 630/787/336 735/790/336 734/788/336 -f 629/789/337 628/775/337 728/778/337 -f 629/789/337 728/778/337 735/790/337 -f 694/791/338 695/792/338 732/793/338 -f 694/791/338 732/793/338 733/794/338 -f 693/795/339 694/796/339 733/786/339 -f 693/795/339 733/786/339 734/788/339 -f 692/797/340 693/798/340 734/799/340 -f 692/797/340 734/799/340 735/800/340 -f 692/797/341 735/800/341 728/801/341 -f 692/797/341 728/801/341 699/802/341 -f 698/803/342 699/802/342 728/801/342 -f 698/803/342 728/801/342 729/804/342 -f 697/805/343 698/806/343 729/807/343 -f 697/805/343 729/807/343 730/808/343 -f 696/809/344 697/805/344 730/808/344 -f 696/809/344 730/808/344 731/810/344 -f 695/792/345 696/811/345 731/812/345 -f 695/792/345 731/812/345 732/793/345 +f 712/711/314 700/712/314 701/713/314 +f 713/714/83 707/715/83 706/716/83 +f 712/711/314 701/713/314 702/717/314 +f 713/714/83 708/718/83 707/715/83 +f 712/711/315 702/717/315 703/719/315 +f 713/714/83 709/720/83 708/718/83 +f 712/711/316 703/719/316 704/721/316 +f 713/714/83 710/722/83 709/720/83 +f 712/711/317 704/721/317 705/723/317 +f 713/714/83 711/724/83 710/722/83 +f 712/711/317 705/723/317 700/712/317 +f 713/714/83 706/716/83 711/724/83 +f 700/725/318 706/726/318 707/727/318 +f 700/725/318 707/727/318 701/728/318 +f 701/729/91 707/730/91 708/731/91 +f 701/729/91 708/731/91 702/732/91 +f 702/732/241 708/731/241 709/733/241 +f 702/732/241 709/733/241 703/734/241 +f 703/735/240 709/736/240 710/737/240 +f 703/735/240 710/737/240 704/738/240 +f 704/738/319 710/737/319 711/739/319 +f 704/738/319 711/739/319 705/740/319 +f 705/741/320 711/742/320 706/726/320 +f 705/741/320 706/726/320 700/725/320 +f 722/743/245 716/744/245 721/745/245 +f 722/743/245 721/745/245 727/746/245 +f 723/747/319 717/748/319 716/749/319 +f 723/747/319 716/749/319 722/750/319 +f 724/751/240 718/752/240 717/748/240 +f 724/751/240 717/748/240 723/747/240 +f 725/753/241 719/754/241 718/755/241 +f 725/753/241 718/755/241 724/756/241 +f 726/757/91 720/758/91 719/754/91 +f 726/757/91 719/754/91 725/753/91 +f 727/746/244 721/745/244 720/759/244 +f 727/746/244 720/759/244 726/760/244 +f 714/761/83 721/762/83 716/763/83 +f 715/764/317 722/765/317 727/766/317 +f 714/761/83 716/763/83 717/767/83 +f 715/764/321 723/768/321 722/765/321 +f 714/761/83 717/767/83 718/769/83 +f 715/764/134 724/770/134 723/768/134 +f 714/761/83 718/769/83 719/771/83 +f 715/764/134 725/772/134 724/770/134 +f 714/761/83 719/771/83 720/773/83 +f 715/764/322 726/774/322 725/772/322 +f 714/761/83 720/773/83 721/762/83 +f 715/764/314 727/766/314 726/774/314 +f 628/775/323 635/776/323 729/777/323 +f 628/775/323 729/777/323 728/778/323 +f 635/776/324 634/779/324 730/780/324 +f 635/776/324 730/780/324 729/777/324 +f 634/779/325 633/781/325 731/782/325 +f 634/779/325 731/782/325 730/780/325 +f 633/781/326 632/783/326 732/784/326 +f 633/781/326 732/784/326 731/782/326 +f 632/783/327 631/785/327 733/786/327 +f 632/783/327 733/786/327 732/784/327 +f 631/785/328 630/787/328 734/788/328 +f 631/785/328 734/788/328 733/786/328 +f 630/787/329 629/789/329 735/790/329 +f 630/787/329 735/790/329 734/788/329 +f 629/789/330 628/775/330 728/778/330 +f 629/789/330 728/778/330 735/790/330 +f 694/791/331 695/792/331 732/793/331 +f 694/791/331 732/793/331 733/794/331 +f 693/795/332 694/796/332 733/786/332 +f 693/795/332 733/786/332 734/788/332 +f 692/797/333 693/798/333 734/799/333 +f 692/797/333 734/799/333 735/800/333 +f 692/797/334 735/800/334 728/801/334 +f 692/797/334 728/801/334 699/802/334 +f 698/803/335 699/802/335 728/801/335 +f 698/803/335 728/801/335 729/804/335 +f 697/805/336 698/806/336 729/807/336 +f 697/805/336 729/807/336 730/808/336 +f 696/809/337 697/805/337 730/808/337 +f 696/809/337 730/808/337 731/810/337 +f 695/792/338 696/811/338 731/812/338 +f 695/792/338 731/812/338 732/793/338 s 1 -f 603/813/346 587/814/346 588/815/346 -f 603/813/346 588/815/346 589/816/346 -f 603/813/346 589/816/346 590/817/346 -f 603/813/346 590/817/346 591/818/346 -f 603/813/346 591/818/346 592/819/346 -f 603/813/346 592/819/346 593/820/346 -f 603/813/346 593/820/346 594/821/346 -f 594/821/346 587/814/346 603/813/346 -f 644/822/347 595/823/347 596/824/348 -f 644/822/347 596/824/348 651/825/348 -f 651/826/348 596/827/348 597/828/349 -f 651/826/348 597/828/349 650/829/349 -f 650/829/349 597/828/349 598/830/350 -f 650/829/349 598/830/350 649/831/350 -f 649/832/350 598/833/350 599/834/351 -f 649/832/350 599/834/351 648/835/351 -f 648/835/351 599/834/351 600/836/352 -f 648/835/351 600/836/352 647/837/352 -f 647/837/352 600/836/352 601/838/353 -f 647/837/352 601/838/353 646/839/353 -f 646/840/353 601/841/353 602/842/354 -f 646/840/353 602/842/354 645/843/354 -f 595/823/347 644/822/347 645/844/354 -f 595/823/347 645/844/354 602/845/354 -f 652/846/355 653/847/356 605/848/356 -f 652/846/355 605/848/356 604/849/355 -f 653/850/356 654/851/357 606/852/357 -f 653/850/356 606/852/357 605/853/356 -f 654/851/357 655/854/358 607/855/358 -f 654/851/357 607/855/358 606/852/357 -f 655/854/358 656/856/359 608/857/359 -f 655/854/358 608/857/359 607/855/358 -f 656/856/359 657/858/360 609/859/360 -f 656/856/359 609/859/360 608/857/359 -f 657/858/360 658/860/361 610/861/362 -f 657/858/360 610/861/362 609/859/360 -f 658/862/361 659/863/363 611/864/363 -f 658/862/361 611/864/363 610/865/362 -f 659/866/363 652/846/355 604/849/355 -f 659/866/363 604/849/355 611/867/363 -f 661/868/364 660/869/365 612/870/365 -f 661/868/364 612/870/365 613/871/364 -f 662/872/98 661/873/364 613/874/364 -f 662/872/98 613/874/364 614/875/98 -f 663/876/366 662/872/98 614/875/98 -f 663/876/366 614/875/98 615/877/367 -f 664/878/368 663/879/366 615/880/367 -f 664/878/368 615/880/367 616/881/368 -f 665/882/369 664/878/368 616/881/368 -f 665/882/369 616/881/368 617/883/370 -f 666/884/85 665/882/369 617/883/370 -f 666/884/85 617/883/370 618/885/85 -f 667/886/371 666/887/85 618/888/85 -f 667/886/371 618/888/85 619/889/371 -f 660/869/365 667/890/371 619/891/371 -f 660/869/365 619/891/371 612/870/365 -f 668/892/372 669/893/373 621/894/373 -f 668/892/372 621/894/373 620/895/372 -f 669/893/373 670/896/374 622/897/374 -f 669/893/373 622/897/374 621/894/373 -f 670/896/374 671/898/375 623/899/375 -f 670/896/374 623/899/375 622/897/374 -f 671/898/375 672/900/376 624/901/376 -f 671/898/375 624/901/376 623/899/375 -f 672/900/376 673/902/377 625/903/377 -f 672/900/376 625/903/377 624/901/376 -f 673/902/377 674/904/378 626/905/378 -f 673/902/377 626/905/378 625/903/377 -f 674/904/378 675/906/379 627/907/379 -f 674/904/378 627/907/379 626/905/378 -f 675/906/379 668/892/372 620/895/372 -f 675/906/379 620/895/372 627/907/379 -f 677/908/364 676/909/365 628/910/380 -f 677/908/364 628/910/380 629/911/381 -f 678/912/98 677/913/364 629/914/381 -f 678/912/98 629/914/381 630/915/382 -f 679/916/367 678/912/98 630/915/382 -f 679/916/367 630/915/382 631/917/383 -f 680/918/368 679/919/367 631/920/383 -f 680/918/368 631/920/383 632/921/384 -f 681/922/370 680/918/368 632/921/384 -f 681/922/370 632/921/384 633/923/385 -f 682/924/85 681/922/370 633/923/385 -f 682/924/85 633/923/385 634/925/386 -f 683/926/371 682/927/85 634/779/386 -f 683/926/371 634/779/386 635/776/387 -f 676/909/365 683/928/371 635/929/387 -f 676/909/365 635/929/387 628/910/380 -f 694/796/388 697/930/389 696/931/390 -f 694/796/388 696/931/390 695/932/391 -f 692/933/392 699/934/393 698/935/394 -f 692/933/392 698/935/394 693/795/395 -f 693/795/395 698/935/394 697/930/389 -f 693/795/395 697/930/389 694/796/388 +f 603/813/339 587/814/339 588/815/339 +f 603/813/339 588/815/339 589/816/339 +f 603/813/339 589/816/339 590/817/339 +f 603/813/339 590/817/339 591/818/339 +f 603/813/339 591/818/339 592/819/339 +f 603/813/339 592/819/339 593/820/339 +f 603/813/339 593/820/339 594/821/339 +f 594/821/339 587/814/339 603/813/339 +f 644/822/340 595/823/340 596/824/341 +f 644/822/340 596/824/341 651/825/341 +f 651/826/341 596/827/341 597/828/342 +f 651/826/341 597/828/342 650/829/342 +f 650/829/342 597/828/342 598/830/343 +f 650/829/342 598/830/343 649/831/343 +f 649/832/343 598/833/343 599/834/344 +f 649/832/343 599/834/344 648/835/344 +f 648/835/344 599/834/344 600/836/345 +f 648/835/344 600/836/345 647/837/345 +f 647/837/345 600/836/345 601/838/346 +f 647/837/345 601/838/346 646/839/346 +f 646/840/346 601/841/346 602/842/347 +f 646/840/346 602/842/347 645/843/347 +f 595/823/340 644/822/340 645/844/347 +f 595/823/340 645/844/347 602/845/347 +f 652/846/348 653/847/349 605/848/349 +f 652/846/348 605/848/349 604/849/348 +f 653/850/349 654/851/350 606/852/350 +f 653/850/349 606/852/350 605/853/349 +f 654/851/350 655/854/351 607/855/351 +f 654/851/350 607/855/351 606/852/350 +f 655/854/351 656/856/352 608/857/352 +f 655/854/351 608/857/352 607/855/351 +f 656/856/352 657/858/353 609/859/353 +f 656/856/352 609/859/353 608/857/352 +f 657/858/353 658/860/354 610/861/355 +f 657/858/353 610/861/355 609/859/353 +f 658/862/354 659/863/356 611/864/356 +f 658/862/354 611/864/356 610/865/355 +f 659/866/356 652/846/348 604/849/348 +f 659/866/356 604/849/348 611/867/356 +f 661/868/357 660/869/358 612/870/358 +f 661/868/357 612/870/358 613/871/357 +f 662/872/91 661/873/357 613/874/357 +f 662/872/91 613/874/357 614/875/91 +f 663/876/359 662/872/91 614/875/91 +f 663/876/359 614/875/91 615/877/360 +f 664/878/361 663/879/359 615/880/360 +f 664/878/361 615/880/360 616/881/361 +f 665/882/362 664/878/361 616/881/361 +f 665/882/362 616/881/361 617/883/363 +f 666/884/78 665/882/362 617/883/363 +f 666/884/78 617/883/363 618/885/78 +f 667/886/364 666/887/78 618/888/78 +f 667/886/364 618/888/78 619/889/364 +f 660/869/358 667/890/364 619/891/364 +f 660/869/358 619/891/364 612/870/358 +f 668/892/365 669/893/366 621/894/366 +f 668/892/365 621/894/366 620/895/365 +f 669/893/366 670/896/367 622/897/367 +f 669/893/366 622/897/367 621/894/366 +f 670/896/367 671/898/368 623/899/368 +f 670/896/367 623/899/368 622/897/367 +f 671/898/368 672/900/369 624/901/369 +f 671/898/368 624/901/369 623/899/368 +f 672/900/369 673/902/370 625/903/370 +f 672/900/369 625/903/370 624/901/369 +f 673/902/370 674/904/371 626/905/371 +f 673/902/370 626/905/371 625/903/370 +f 674/904/371 675/906/372 627/907/372 +f 674/904/371 627/907/372 626/905/371 +f 675/906/372 668/892/365 620/895/365 +f 675/906/372 620/895/365 627/907/372 +f 677/908/357 676/909/358 628/910/373 +f 677/908/357 628/910/373 629/911/374 +f 678/912/91 677/913/357 629/914/374 +f 678/912/91 629/914/374 630/915/375 +f 679/916/360 678/912/91 630/915/375 +f 679/916/360 630/915/375 631/917/376 +f 680/918/361 679/919/360 631/920/376 +f 680/918/361 631/920/376 632/921/377 +f 681/922/363 680/918/361 632/921/377 +f 681/922/363 632/921/377 633/923/378 +f 682/924/78 681/922/363 633/923/378 +f 682/924/78 633/923/378 634/925/379 +f 683/926/364 682/927/78 634/779/379 +f 683/926/364 634/779/379 635/776/380 +f 676/909/358 683/928/364 635/929/380 +f 676/909/358 635/929/380 628/910/373 +f 694/796/381 697/930/382 696/931/383 +f 694/796/381 696/931/383 695/932/384 +f 692/933/385 699/934/386 698/935/387 +f 692/933/385 698/935/387 693/795/388 +f 693/795/388 698/935/387 697/930/382 +f 693/795/388 697/930/382 694/796/381 f 636 637 o NW_pillar_base_Cube.007 v -0.400000 0.000003 -0.500000 @@ -3062,12 +3055,12 @@ vn -0.000001 -0.000001 1.000000 usemtl wall_material_stonewall_diffuse.jpg s off -f 739/936/396 742/937/396 741/938/396 -f 739/936/396 741/938/396 740/939/396 -f 736/940/397 739/941/397 740/942/397 -f 736/940/397 740/942/397 737/943/397 -f 737/944/398 740/945/398 741/946/398 -f 737/944/398 741/946/398 738/947/398 +f 739/936/389 742/937/389 741/938/389 +f 739/936/389 741/938/389 740/939/389 +f 736/940/390 739/941/390 740/942/390 +f 736/940/390 740/942/390 737/943/390 +f 737/944/391 740/945/391 741/946/391 +f 737/944/391 741/946/391 738/947/391 o NE_pillar_base_Cube.007 v 0.500000 0.000003 -0.400000 v 0.400000 0.000003 -0.400000 @@ -3092,12 +3085,12 @@ vn -1.000000 -0.000001 -0.000001 usemtl wall_material_stonewall_diffuse.jpg s off -f 746/948/396 749/949/396 748/950/396 -f 746/948/396 748/950/396 747/951/396 -f 743/952/399 746/953/399 747/954/399 -f 743/952/399 747/954/399 744/955/399 -f 744/956/400 747/957/400 748/958/400 -f 744/956/400 748/958/400 745/959/400 +f 746/948/389 749/949/389 748/950/389 +f 746/948/389 748/950/389 747/951/389 +f 743/952/392 746/953/392 747/954/392 +f 743/952/392 747/954/392 744/955/392 +f 744/956/393 747/957/393 748/958/393 +f 744/956/393 748/958/393 745/959/393 o NE_pillar_cap_Cube.007 v 0.400000 1.000003 -0.500000 v 0.400000 1.000003 -0.400000 @@ -3122,12 +3115,12 @@ vn 0.000000 -0.000001 1.000000 usemtl wall_material_stonewall_diffuse.jpg s off -f 753/960/401 756/961/401 755/962/401 -f 753/960/401 755/962/401 754/963/401 -f 750/964/326 753/965/326 754/966/326 -f 750/964/326 754/966/326 751/967/326 -f 751/968/402 754/969/402 755/970/402 -f 751/968/402 755/970/402 752/971/402 +f 753/960/394 756/961/394 755/962/394 +f 753/960/394 755/962/394 754/963/394 +f 750/964/319 753/965/319 754/966/319 +f 750/964/319 754/966/319 751/967/319 +f 751/968/395 754/969/395 755/970/395 +f 751/968/395 755/970/395 752/971/395 o NW_pillar_cap_Cube.007 v -0.500000 1.000003 -0.400000 v -0.400000 1.000003 -0.400000 @@ -3152,12 +3145,12 @@ vn 1.000000 -0.000001 -0.000000 usemtl wall_material_stonewall_diffuse.jpg s off -f 760/972/403 763/973/403 762/974/403 -f 760/972/403 762/974/403 761/975/403 -f 757/976/141 760/977/141 761/978/141 -f 757/976/141 761/978/141 758/979/141 -f 758/980/404 761/981/404 762/982/404 -f 758/980/404 762/982/404 759/983/404 +f 760/972/396 763/973/396 762/974/396 +f 760/972/396 762/974/396 761/975/396 +f 757/976/134 760/977/134 761/978/134 +f 757/976/134 761/978/134 758/979/134 +f 758/980/397 761/981/397 762/982/397 +f 758/980/397 762/982/397 759/983/397 o SW_pillar_base_Cube.007 v -0.500000 0.000003 0.400000 v -0.400000 0.000003 0.400000 @@ -3182,12 +3175,12 @@ vn 1.000000 -0.000001 0.000001 usemtl wall_material_stonewall_diffuse.jpg s off -f 767/984/396 770/985/396 769/986/396 -f 767/984/396 769/986/396 768/987/396 -f 764/988/405 767/989/405 768/990/405 -f 764/988/405 768/990/405 765/991/405 -f 765/992/406 768/993/406 769/994/406 -f 765/992/406 769/994/406 766/995/406 +f 767/984/389 770/985/389 769/986/389 +f 767/984/389 769/986/389 768/987/389 +f 764/988/398 767/989/398 768/990/398 +f 764/988/398 768/990/398 765/991/398 +f 765/992/399 768/993/399 769/994/399 +f 765/992/399 769/994/399 766/995/399 o SW_pillar_cap_Cube.007 v -0.400000 1.000003 0.500000 v -0.400000 1.000003 0.400000 @@ -3211,12 +3204,12 @@ vn 0.000000 -1.000000 0.000000 usemtl wall_material_stonewall_diffuse.jpg s off -f 774/996/407 777/997/407 776/998/407 -f 774/996/407 776/998/407 775/999/407 -f 771/1000/249 774/1001/249 775/1002/249 -f 771/1000/249 775/1002/249 772/1003/249 -f 772/1004/172 775/1005/172 776/1006/172 -f 772/1004/172 776/1006/172 773/1007/172 +f 774/996/400 777/997/400 776/998/400 +f 774/996/400 776/998/400 775/999/400 +f 771/1000/242 774/1001/242 775/1002/242 +f 771/1000/242 775/1002/242 772/1003/242 +f 772/1004/165 775/1005/165 776/1006/165 +f 772/1004/165 776/1006/165 773/1007/165 o NW_pillar_Cylinder.005 v -0.425000 0.000001 -0.500000 v -0.430709 0.000001 -0.471299 @@ -3320,54 +3313,54 @@ vn 0.991821 0.036134 0.122166 usemtl wall_material_stonewall_diffuse.jpg s 1 -f 779/1008/408 789/1009/409 790/1010/410 -f 779/1008/408 790/1010/410 780/1011/411 -f 780/1011/411 790/1010/410 791/1012/412 -f 780/1011/411 791/1012/412 781/1013/413 -f 789/1009/409 794/1014/414 795/1015/415 -f 789/1009/409 795/1015/415 790/1010/410 -f 790/1010/410 795/1015/415 796/1016/416 -f 790/1010/410 796/1016/416 791/1012/412 -f 794/1014/414 799/1017/417 800/1018/418 -f 794/1014/414 800/1018/418 795/1015/415 -f 799/1017/417 784/1019/419 785/1020/420 -f 799/1017/417 785/1020/420 800/1018/418 -f 795/1015/415 800/1018/418 801/1021/421 -f 795/1015/415 801/1021/421 796/1016/416 -f 800/1018/418 785/1020/420 786/1022/422 -f 800/1018/418 786/1022/422 801/1021/421 -f 791/1012/412 805/1023/423 803/1024/424 -f 791/1012/412 803/1024/424 781/1013/413 -f 805/1023/423 792/1025/76 782/1026/75 -f 805/1023/423 782/1026/75 803/1024/424 -f 796/1016/416 806/1027/425 805/1023/423 -f 796/1016/416 805/1023/423 791/1012/412 -f 806/1027/425 797/1028/78 792/1025/76 -f 806/1027/425 792/1025/76 805/1023/423 -f 801/1021/421 807/1029/426 806/1027/425 -f 801/1021/421 806/1027/425 796/1016/416 -f 807/1029/426 802/1030/80 797/1028/78 -f 807/1029/426 797/1028/78 806/1027/425 -f 786/1022/422 804/1031/427 807/1029/426 -f 786/1022/422 807/1029/426 801/1021/421 -f 804/1031/427 787/1032/82 802/1030/80 -f 804/1031/427 802/1030/80 807/1029/426 -f 808/1033/428 778/1034/429 788/1035/430 -f 808/1033/428 788/1035/430 810/1036/431 -f 810/1036/431 789/1009/409 779/1008/408 -f 810/1036/431 779/1008/408 808/1033/428 -f 793/1037/432 811/1038/433 810/1036/431 -f 793/1037/432 810/1036/431 788/1035/430 -f 811/1038/433 794/1014/414 789/1009/409 -f 811/1038/433 789/1009/409 810/1036/431 -f 798/1039/434 812/1040/435 811/1038/433 -f 798/1039/434 811/1038/433 793/1037/432 -f 812/1040/435 799/1017/417 794/1014/414 -f 812/1040/435 794/1014/414 811/1038/433 -f 783/1041/436 809/1042/437 812/1040/435 -f 783/1041/436 812/1040/435 798/1039/434 -f 809/1042/437 784/1019/419 799/1017/417 -f 809/1042/437 799/1017/417 812/1040/435 +f 779/1008/401 789/1009/402 790/1010/403 +f 779/1008/401 790/1010/403 780/1011/404 +f 780/1011/404 790/1010/403 791/1012/405 +f 780/1011/404 791/1012/405 781/1013/406 +f 789/1009/402 794/1014/407 795/1015/408 +f 789/1009/402 795/1015/408 790/1010/403 +f 790/1010/403 795/1015/408 796/1016/409 +f 790/1010/403 796/1016/409 791/1012/405 +f 794/1014/407 799/1017/410 800/1018/411 +f 794/1014/407 800/1018/411 795/1015/408 +f 799/1017/410 784/1019/412 785/1020/413 +f 799/1017/410 785/1020/413 800/1018/411 +f 795/1015/408 800/1018/411 801/1021/414 +f 795/1015/408 801/1021/414 796/1016/409 +f 800/1018/411 785/1020/413 786/1022/415 +f 800/1018/411 786/1022/415 801/1021/414 +f 791/1012/405 805/1023/416 803/1024/417 +f 791/1012/405 803/1024/417 781/1013/406 +f 805/1023/416 792/1025/69 782/1026/68 +f 805/1023/416 782/1026/68 803/1024/417 +f 796/1016/409 806/1027/418 805/1023/416 +f 796/1016/409 805/1023/416 791/1012/405 +f 806/1027/418 797/1028/71 792/1025/69 +f 806/1027/418 792/1025/69 805/1023/416 +f 801/1021/414 807/1029/419 806/1027/418 +f 801/1021/414 806/1027/418 796/1016/409 +f 807/1029/419 802/1030/73 797/1028/71 +f 807/1029/419 797/1028/71 806/1027/418 +f 786/1022/415 804/1031/420 807/1029/419 +f 786/1022/415 807/1029/419 801/1021/414 +f 804/1031/420 787/1032/75 802/1030/73 +f 804/1031/420 802/1030/73 807/1029/419 +f 808/1033/421 778/1034/422 788/1035/423 +f 808/1033/421 788/1035/423 810/1036/424 +f 810/1036/424 789/1009/402 779/1008/401 +f 810/1036/424 779/1008/401 808/1033/421 +f 793/1037/425 811/1038/426 810/1036/424 +f 793/1037/425 810/1036/424 788/1035/423 +f 811/1038/426 794/1014/407 789/1009/402 +f 811/1038/426 789/1009/402 810/1036/424 +f 798/1039/427 812/1040/428 811/1038/426 +f 798/1039/427 811/1038/426 793/1037/425 +f 812/1040/428 799/1017/410 794/1014/407 +f 812/1040/428 794/1014/407 811/1038/426 +f 783/1041/429 809/1042/430 812/1040/428 +f 783/1041/429 812/1040/428 798/1039/427 +f 809/1042/430 784/1019/412 799/1017/410 +f 809/1042/430 799/1017/410 812/1040/428 o SW_pillar_Cylinder.005 v -0.500000 0.000001 0.425000 v -0.471299 0.000001 0.430709 @@ -3471,54 +3464,54 @@ vn 0.122166 0.036134 -0.991821 usemtl wall_material_stonewall_diffuse.jpg s 1 -f 814/1043/438 824/1044/439 825/1045/440 -f 814/1043/438 825/1045/440 815/1046/441 -f 815/1046/441 825/1045/440 826/1047/442 -f 815/1046/441 826/1047/442 816/1048/443 -f 824/1044/439 829/1049/444 830/1050/445 -f 824/1044/439 830/1050/445 825/1045/440 -f 825/1045/440 830/1050/445 831/1051/446 -f 825/1045/440 831/1051/446 826/1047/442 -f 829/1049/444 834/1052/447 835/1053/448 -f 829/1049/444 835/1053/448 830/1050/445 -f 834/1052/447 819/1054/449 820/1055/450 -f 834/1052/447 820/1055/450 835/1053/448 -f 830/1050/445 835/1053/448 836/1056/451 -f 830/1050/445 836/1056/451 831/1051/446 -f 835/1053/448 820/1055/450 821/1057/452 -f 835/1053/448 821/1057/452 836/1056/451 -f 826/1047/442 840/1058/453 838/1059/454 -f 826/1047/442 838/1059/454 816/1048/443 -f 840/1058/453 827/1060/430 817/1061/429 -f 840/1058/453 817/1061/429 838/1059/454 -f 831/1051/446 841/1062/455 840/1058/453 -f 831/1051/446 840/1058/453 826/1047/442 -f 841/1062/455 832/1063/432 827/1060/430 -f 841/1062/455 827/1060/430 840/1058/453 -f 836/1056/451 842/1064/456 841/1062/455 -f 836/1056/451 841/1062/455 831/1051/446 -f 842/1064/456 837/1065/434 832/1063/432 -f 842/1064/456 832/1063/432 841/1062/455 -f 821/1057/452 839/1066/457 842/1064/456 -f 821/1057/452 842/1064/456 836/1056/451 -f 839/1066/457 822/1067/436 837/1065/434 -f 839/1066/457 837/1065/434 842/1064/456 -f 843/1068/458 813/1069/459 823/1070/460 -f 843/1068/458 823/1070/460 845/1071/461 -f 845/1071/461 824/1044/439 814/1043/438 -f 845/1071/461 814/1043/438 843/1068/458 -f 828/1072/462 846/1073/463 845/1071/461 -f 828/1072/462 845/1071/461 823/1070/460 -f 846/1073/463 829/1049/444 824/1044/439 -f 846/1073/463 824/1044/439 845/1071/461 -f 833/1074/464 847/1075/465 846/1073/463 -f 833/1074/464 846/1073/463 828/1072/462 -f 847/1075/465 834/1052/447 829/1049/444 -f 847/1075/465 829/1049/444 846/1073/463 -f 818/1076/466 844/1077/467 847/1075/465 -f 818/1076/466 847/1075/465 833/1074/464 -f 844/1077/467 819/1054/449 834/1052/447 -f 844/1077/467 834/1052/447 847/1075/465 +f 814/1043/431 824/1044/432 825/1045/433 +f 814/1043/431 825/1045/433 815/1046/434 +f 815/1046/434 825/1045/433 826/1047/435 +f 815/1046/434 826/1047/435 816/1048/436 +f 824/1044/432 829/1049/437 830/1050/438 +f 824/1044/432 830/1050/438 825/1045/433 +f 825/1045/433 830/1050/438 831/1051/439 +f 825/1045/433 831/1051/439 826/1047/435 +f 829/1049/437 834/1052/440 835/1053/441 +f 829/1049/437 835/1053/441 830/1050/438 +f 834/1052/440 819/1054/442 820/1055/443 +f 834/1052/440 820/1055/443 835/1053/441 +f 830/1050/438 835/1053/441 836/1056/444 +f 830/1050/438 836/1056/444 831/1051/439 +f 835/1053/441 820/1055/443 821/1057/445 +f 835/1053/441 821/1057/445 836/1056/444 +f 826/1047/435 840/1058/446 838/1059/447 +f 826/1047/435 838/1059/447 816/1048/436 +f 840/1058/446 827/1060/423 817/1061/422 +f 840/1058/446 817/1061/422 838/1059/447 +f 831/1051/439 841/1062/448 840/1058/446 +f 831/1051/439 840/1058/446 826/1047/435 +f 841/1062/448 832/1063/425 827/1060/423 +f 841/1062/448 827/1060/423 840/1058/446 +f 836/1056/444 842/1064/449 841/1062/448 +f 836/1056/444 841/1062/448 831/1051/439 +f 842/1064/449 837/1065/427 832/1063/425 +f 842/1064/449 832/1063/425 841/1062/448 +f 821/1057/445 839/1066/450 842/1064/449 +f 821/1057/445 842/1064/449 836/1056/444 +f 839/1066/450 822/1067/429 837/1065/427 +f 839/1066/450 837/1065/427 842/1064/449 +f 843/1068/451 813/1069/452 823/1070/453 +f 843/1068/451 823/1070/453 845/1071/454 +f 845/1071/454 824/1044/432 814/1043/431 +f 845/1071/454 814/1043/431 843/1068/451 +f 828/1072/455 846/1073/456 845/1071/454 +f 828/1072/455 845/1071/454 823/1070/453 +f 846/1073/456 829/1049/437 824/1044/432 +f 846/1073/456 824/1044/432 845/1071/454 +f 833/1074/457 847/1075/458 846/1073/456 +f 833/1074/457 846/1073/456 828/1072/455 +f 847/1075/458 834/1052/440 829/1049/437 +f 847/1075/458 829/1049/437 846/1073/456 +f 818/1076/459 844/1077/460 847/1075/458 +f 818/1076/459 847/1075/458 833/1074/457 +f 844/1077/460 819/1054/442 834/1052/440 +f 844/1077/460 834/1052/440 847/1075/458 o SE_pillar_cap_Cube.007 v 0.500000 1.000003 0.400000 v 0.400000 1.000003 0.400000 @@ -3541,12 +3534,12 @@ vt 0.586730 0.531981 usemtl wall_material_stonewall_diffuse.jpg s off -f 851/1078/407 854/1079/407 853/1080/407 -f 851/1078/407 853/1080/407 852/1081/407 -f 848/1082/172 851/1083/172 852/1084/172 -f 848/1082/172 852/1084/172 849/1085/172 -f 849/1086/326 852/1087/326 853/1088/326 -f 849/1086/326 853/1088/326 850/1089/326 +f 851/1078/400 854/1079/400 853/1080/400 +f 851/1078/400 853/1080/400 852/1081/400 +f 848/1082/165 851/1083/165 852/1084/165 +f 848/1082/165 852/1084/165 849/1085/165 +f 849/1086/319 852/1087/319 853/1088/319 +f 849/1086/319 853/1088/319 850/1089/319 o SE_pillar_base_Cube.007 v 0.400000 0.000003 0.500000 v 0.400000 0.000003 0.400000 @@ -3571,12 +3564,12 @@ vn 0.000001 0.000000 -1.000000 usemtl wall_material_stonewall_diffuse.jpg s off -f 858/1090/396 861/1091/396 860/1092/396 -f 858/1090/396 860/1092/396 859/1093/396 -f 855/1094/468 858/1095/468 859/1096/468 -f 855/1094/468 859/1096/468 856/1097/468 -f 856/1098/469 859/1099/469 860/1100/469 -f 856/1098/469 860/1100/469 857/1101/469 +f 858/1090/389 861/1091/389 860/1092/389 +f 858/1090/389 860/1092/389 859/1093/389 +f 855/1094/461 858/1095/461 859/1096/461 +f 855/1094/461 859/1096/461 856/1097/461 +f 856/1098/462 859/1099/462 860/1100/462 +f 856/1098/462 860/1100/462 857/1101/462 o SE_pillar_Cylinder.005 v 0.425000 0.000001 0.500000 v 0.430709 0.000001 0.471299 @@ -3675,54 +3668,54 @@ vn -0.991821 0.036134 -0.122166 usemtl wall_material_stonewall_diffuse.jpg s 1 -f 863/1102/470 873/1103/471 874/1104/472 -f 863/1102/470 874/1104/472 864/1105/473 -f 864/1105/473 874/1104/472 875/1106/474 -f 864/1105/473 875/1106/474 865/1107/475 -f 873/1103/471 878/1108/476 879/1109/477 -f 873/1103/471 879/1109/477 874/1104/472 -f 874/1104/472 879/1109/477 880/1110/478 -f 874/1104/472 880/1110/478 875/1106/474 -f 878/1108/476 883/1111/479 884/1112/480 -f 878/1108/476 884/1112/480 879/1109/477 -f 883/1111/479 868/1113/481 869/1114/482 -f 883/1111/479 869/1114/482 884/1112/480 -f 879/1109/477 884/1112/480 885/1115/483 -f 879/1109/477 885/1115/483 880/1110/478 -f 884/1112/480 869/1114/482 870/1116/484 -f 884/1112/480 870/1116/484 885/1115/483 -f 875/1106/474 889/1117/485 887/1118/486 -f 875/1106/474 887/1118/486 865/1107/475 -f 889/1117/485 876/1119/460 866/1120/459 -f 889/1117/485 866/1120/459 887/1118/486 -f 880/1110/478 890/1121/487 889/1117/485 -f 880/1110/478 889/1117/485 875/1106/474 -f 890/1121/487 881/1122/462 876/1119/460 -f 890/1121/487 876/1119/460 889/1117/485 -f 885/1115/483 891/1123/488 890/1121/487 -f 885/1115/483 890/1121/487 880/1110/478 -f 891/1123/488 886/1124/464 881/1122/462 -f 891/1123/488 881/1122/462 890/1121/487 -f 870/1116/484 888/1125/489 891/1123/488 -f 870/1116/484 891/1123/488 885/1115/483 -f 888/1125/489 871/1126/466 886/1124/464 -f 888/1125/489 886/1124/464 891/1123/488 -f 892/1127/490 862/1128/67 872/1129/66 -f 892/1127/490 872/1129/66 894/1130/491 -f 894/1130/491 873/1103/471 863/1102/470 -f 894/1130/491 863/1102/470 892/1127/490 -f 877/1131/69 895/1132/492 894/1130/491 -f 877/1131/69 894/1130/491 872/1129/66 -f 895/1132/492 878/1108/476 873/1103/471 -f 895/1132/492 873/1103/471 894/1130/491 -f 882/1133/71 896/1134/493 895/1132/492 -f 882/1133/71 895/1132/492 877/1131/69 -f 896/1134/493 883/1111/479 878/1108/476 -f 896/1134/493 878/1108/476 895/1132/492 -f 867/1135/73 893/1136/494 896/1134/493 -f 867/1135/73 896/1134/493 882/1133/71 -f 893/1136/494 868/1113/481 883/1111/479 -f 893/1136/494 883/1111/479 896/1134/493 +f 863/1102/463 873/1103/464 874/1104/465 +f 863/1102/463 874/1104/465 864/1105/466 +f 864/1105/466 874/1104/465 875/1106/467 +f 864/1105/466 875/1106/467 865/1107/468 +f 873/1103/464 878/1108/469 879/1109/470 +f 873/1103/464 879/1109/470 874/1104/465 +f 874/1104/465 879/1109/470 880/1110/471 +f 874/1104/465 880/1110/471 875/1106/467 +f 878/1108/469 883/1111/472 884/1112/473 +f 878/1108/469 884/1112/473 879/1109/470 +f 883/1111/472 868/1113/474 869/1114/475 +f 883/1111/472 869/1114/475 884/1112/473 +f 879/1109/470 884/1112/473 885/1115/476 +f 879/1109/470 885/1115/476 880/1110/471 +f 884/1112/473 869/1114/475 870/1116/477 +f 884/1112/473 870/1116/477 885/1115/476 +f 875/1106/467 889/1117/478 887/1118/479 +f 875/1106/467 887/1118/479 865/1107/468 +f 889/1117/478 876/1119/453 866/1120/452 +f 889/1117/478 866/1120/452 887/1118/479 +f 880/1110/471 890/1121/480 889/1117/478 +f 880/1110/471 889/1117/478 875/1106/467 +f 890/1121/480 881/1122/455 876/1119/453 +f 890/1121/480 876/1119/453 889/1117/478 +f 885/1115/476 891/1123/481 890/1121/480 +f 885/1115/476 890/1121/480 880/1110/471 +f 891/1123/481 886/1124/457 881/1122/455 +f 891/1123/481 881/1122/455 890/1121/480 +f 870/1116/477 888/1125/482 891/1123/481 +f 870/1116/477 891/1123/481 885/1115/476 +f 888/1125/482 871/1126/459 886/1124/457 +f 888/1125/482 886/1124/457 891/1123/481 +f 892/1127/483 862/1128/60 872/1129/59 +f 892/1127/483 872/1129/59 894/1130/484 +f 894/1130/484 873/1103/464 863/1102/463 +f 894/1130/484 863/1102/463 892/1127/483 +f 877/1131/62 895/1132/485 894/1130/484 +f 877/1131/62 894/1130/484 872/1129/59 +f 895/1132/485 878/1108/469 873/1103/464 +f 895/1132/485 873/1103/464 894/1130/484 +f 882/1133/64 896/1134/486 895/1132/485 +f 882/1133/64 895/1132/485 877/1131/62 +f 896/1134/486 883/1111/472 878/1108/469 +f 896/1134/486 878/1108/469 895/1132/485 +f 867/1135/66 893/1136/487 896/1134/486 +f 867/1135/66 896/1134/486 882/1133/64 +f 893/1136/487 868/1113/474 883/1111/472 +f 893/1136/487 883/1111/472 896/1134/486 o NORTH_wall_Cube.004 v 0.500000 0.000001 -0.500000 v -0.500000 0.000001 -0.500000 @@ -3734,8 +3727,8 @@ vt -0.240882 1.240882 usemtl wall_material_stonewall_diffuse.jpg s off -f 898/1137/141 897/1138/141 899/1139/141 -f 898/1137/141 899/1139/141 900/1140/141 +f 898/1137/134 897/1138/134 899/1139/134 +f 898/1137/134 899/1139/134 900/1140/134 o WEST_wall_Cube.003 v -0.500000 0.000001 0.500000 v -0.500000 0.000001 -0.500000 @@ -3747,8 +3740,8 @@ vt -0.235062 1.235062 usemtl wall_material_stonewall_diffuse.jpg s off -f 901/1141/98 902/1142/98 904/1143/98 -f 901/1141/98 904/1143/98 903/1144/98 +f 901/1141/91 902/1142/91 904/1143/91 +f 901/1141/91 904/1143/91 903/1144/91 o SOUTH_wall_Cube.002 v 0.500000 0.000001 0.500000 v -0.500000 0.000001 0.500000 @@ -3760,8 +3753,8 @@ vt -0.233088 1.233088 usemtl wall_material_stonewall_diffuse.jpg s off -f 905/1145/90 906/1146/90 908/1147/90 -f 905/1145/90 908/1147/90 907/1148/90 +f 905/1145/83 906/1146/83 908/1147/83 +f 905/1145/83 908/1147/83 907/1148/83 o EAST_wall_Cube.001 v 0.500000 0.000001 -0.500000 v 0.500000 0.000001 0.500000 @@ -3773,8 +3766,8 @@ vt -0.250000 1.250000 usemtl wall_material_stonewall_diffuse.jpg s off -f 909/1149/85 910/1150/85 912/1151/85 -f 909/1149/85 912/1151/85 911/1152/85 +f 909/1149/78 910/1150/78 912/1151/78 +f 909/1149/78 912/1151/78 911/1152/78 o BasicTile_Cube v -0.500000 1.000001 -0.500000 v -0.500000 1.000001 0.500000 @@ -3793,7 +3786,7 @@ vt -0.250000 1.250000 usemtl floor_material_floor_diffuse.jpg s off -f 914/1153/407 913/1154/407 916/1155/407 -f 914/1153/407 916/1155/407 915/1156/407 -f 920/1157/396 917/1158/396 918/1155/396 -f 920/1157/396 918/1155/396 919/1159/396 +f 914/1153/400 913/1154/400 916/1155/400 +f 914/1153/400 916/1155/400 915/1156/400 +f 920/1157/389 917/1158/389 918/1155/389 +f 920/1157/389 918/1155/389 919/1159/389 diff -r 0cd55268eaf4 -r 0357994effe2 prototype/sdr/deferred_omni.p.glsl --- a/prototype/sdr/deferred_omni.p.glsl Tue Aug 28 02:18:19 2012 +0300 +++ b/prototype/sdr/deferred_omni.p.glsl Tue Aug 28 03:18:47 2012 +0300 @@ -1,6 +1,9 @@ uniform sampler2D mrt0, mrt1, mrt2, mrt3; uniform vec2 tex_scale, fb_size; +uniform vec3 light_color; +uniform float light_radius; + varying vec3 ltpos; void main() @@ -15,16 +18,14 @@ float shin = texel3.w; vec3 ldir = ltpos - pos; - float dist = length(ldir); + float light_dist = length(ldir); ldir = normalize(ldir); float ndotl = dot(norm, ldir); vec3 color = dcol * ndotl; - float atten = 1.0; - if(dist > 0.2) { - atten = 0.0; - } + float atten = 1.0 - light_dist / light_radius; + atten = clamp(atten, 0.0, 1.0); - gl_FragColor = vec4(color, 1.0); + gl_FragColor = vec4(color * light_color * atten, 1.0); } diff -r 0cd55268eaf4 -r 0357994effe2 prototype/sdr/mrt.p.glsl --- a/prototype/sdr/mrt.p.glsl Tue Aug 28 02:18:19 2012 +0300 +++ b/prototype/sdr/mrt.p.glsl Tue Aug 28 03:18:47 2012 +0300 @@ -21,5 +21,5 @@ gl_FragData[0] = vec4(pos, 0.0); gl_FragData[1] = vec4(norm, 0.0); gl_FragData[2] = vec4(diffuse, sstr); - gl_FragData[3] = vec4(0.0, 0.0, 0.0, 0.0); + //gl_FragData[3] = vec4(0.0, 0.0, 0.0, 0.0); } diff -r 0cd55268eaf4 -r 0357994effe2 prototype/src/light.cc --- a/prototype/src/light.cc Tue Aug 28 02:18:19 2012 +0300 +++ b/prototype/src/light.cc Tue Aug 28 03:18:47 2012 +0300 @@ -1,5 +1,6 @@ #include "opengl.h" #include "light.h" +#include "renderer.h" Light::Light(const Color &col) : color(col) @@ -58,6 +59,7 @@ PointLight::PointLight() + : Light(Color(1.0, 1.0, 1.0)) { atten[0] = 1.0f; atten[1] = 0.0f; @@ -108,6 +110,17 @@ void PointLight::draw() const { + unsigned int sdr = get_deferred_shader(); + if(sdr) { + int loc; + if((loc = glGetUniformLocation(sdr, "light_radius")) != -1) { + glUniform1f(loc, radius); + } + if((loc = glGetUniformLocation(sdr, "light_color")) != -1) { + glUniform3f(loc, color.x, color.y, color.z); + } + } + glMatrixMode(GL_MODELVIEW); glPushMatrix(); glTranslatef(pos.x, pos.y, pos.z); diff -r 0cd55268eaf4 -r 0357994effe2 prototype/src/renderer.cc --- a/prototype/src/renderer.cc Tue Aug 28 02:18:19 2012 +0300 +++ b/prototype/src/renderer.cc Tue Aug 28 03:18:47 2012 +0300 @@ -97,6 +97,11 @@ glDeleteFramebuffersEXT(1, &fbo); } +unsigned int get_deferred_shader(void) +{ + return deferred_omni; +} + void resize_renderer(int xsz, int ysz) { fb_xsz = xsz; @@ -140,14 +145,14 @@ // post-process lighting - glPushAttrib(GL_ENABLE_BIT); + glPushAttrib(GL_ENABLE_BIT | GL_POLYGON_BIT); glEnable(GL_BLEND); glBlendFunc(GL_ONE, GL_ONE); glDisable(GL_LIGHTING); - glDisable(GL_CULL_FACE); glDisable(GL_DEPTH_TEST); + glCullFace(GL_FRONT); glUseProgram(deferred_omni); for(int i=0; i