]> git.tdb.fi Git - r2c2.git/commitdiff
Render ties between rails on tracks
authorMikko Rasa <tdb@tdb.fi>
Sat, 23 Nov 2013 15:36:22 +0000 (17:36 +0200)
committerMikko Rasa <tdb@tdb.fi>
Sat, 23 Nov 2013 15:36:22 +0000 (17:36 +0200)
data/bumper.object
data/track.technique
gfx.blend
source/3d/tracktype.cpp
source/3d/tracktype.h
source/libr2c2/trackappearance.cpp
source/libr2c2/trackappearance.h
tracks.dat

index e8ee76472bcb16c107aceb8416b7bb5a57bd3af0..bfdabd083348b72aa8274eda46727a10d8c3c9ec 100644 (file)
@@ -1,24 +1,23 @@
 mesh
 {
-       winding COUNTERCLOCKWISE;
        vertices NORMAL3 TEXCOORD2 VERTEX3
        {
                normal3 0 0 1;
-               texcoord2 0.1 0.5;
-               vertex3 0.055 0.014 0.008;
-               vertex3 0.055 -0.014 0.008;
-               vertex3 -1.49012e-08 -0.014 0.008;
-               vertex3 7.45058e-09 0.014 0.008;
-               normal3 0.0656471 0.781076 0.620976;
+               texcoord2 0.0833333 0.5;
+               vertex3 0.055 0.014 0.0075;
+               vertex3 0.055 -0.014 0.0075;
+               vertex3 -1.49012e-08 -0.014 0.0075;
+               vertex3 7.45058e-09 0.014 0.0075;
+               normal3 0.134663 0.736054 0.663393;
                vertex3 0.081 0.02 9.31323e-10;
-               normal3 2.62962e-07 0.8 0.6;
+               normal3 2.56228e-07 0.780869 0.624695;
                vertex3 7.45058e-09 0.02 9.31323e-10;
-               normal3 0.0656456 -0.781076 0.620975;
+               normal3 0.134661 -0.736055 0.663392;
                vertex3 0.081 -0.02 9.31323e-10;
-               normal3 -8.76539e-08 -0.8 0.6;
+               normal3 -8.35525e-08 -0.780869 0.624695;
                vertex3 -1.49012e-08 -0.02 9.31323e-10;
                normal3 0 -1 0;
-               texcoord2 0.3 0.5;
+               texcoord2 0.25 0.5;
                vertex3 7.45058e-09 -0.00975 0.008;
                normal3 0 -0.755454 0.655202;
                vertex3 7.45058e-09 -0.00975 0.0083;
@@ -115,41 +114,41 @@ mesh
                vertex3 7.45058e-09 0.00775 0.0083;
                normal3 0 -1 0;
                vertex3 7.45058e-09 0.00775 0.008;
-               normal3 0.366542 0.639382 0.675898;
-               texcoord2 0.1 0.5;
+               normal3 0.363878 0.621162 0.694083;
+               texcoord2 0.0833333 0.5;
                vertex3 0.0825 0.0195981 9.31323e-10;
-               normal3 0.646602 0.399223 0.650021;
+               normal3 0.61509 0.417842 0.668635;
                vertex3 0.0835981 0.0185 9.31323e-10;
-               normal3 0.366538 -0.639384 0.675898;
+               normal3 0.363875 -0.621164 0.694082;
                vertex3 0.0825 -0.0195981 9.31323e-10;
-               normal3 0.646601 -0.399223 0.650021;
+               normal3 0.615089 -0.417843 0.668635;
                vertex3 0.0835981 -0.0185 9.31323e-10;
-               normal3 0.78707 -0.0566645 0.614255;
+               normal3 0.784777 -0.0472288 0.617976;
                vertex3 0.087 -0.00500001 9.31323e-10;
-               normal3 0.787071 0.0566642 0.614255;
+               normal3 0.784778 0.0472283 0.617975;
                vertex3 0.087 0.00499999 9.31323e-10;
-               normal3 0.773259 -0.188548 0.605409;
+               normal3 0.766546 -0.193783 0.612255;
                vertex3 0.086 -0.012 9.31323e-10;
-               normal3 0.773259 0.188549 0.605409;
+               normal3 0.766546 0.193784 0.612255;
                vertex3 0.086 0.012 9.31323e-10;
-               normal3 0.308076 -0.542522 0.78151;
-               vertex3 0.0765 -0.0111981 0.0112;
-               normal3 0.0848464 -0.674354 0.733518;
-               vertex3 0.075 -0.0116 0.0112;
-               normal3 0.549945 -0.326109 0.768904;
-               vertex3 0.0775981 -0.0101 0.0112;
-               normal3 0.308079 0.54252 0.781511;
-               vertex3 0.0765 0.0111981 0.0112;
-               normal3 0.0848482 0.674353 0.733518;
-               vertex3 0.075 0.0116 0.0112;
-               normal3 0.549945 0.32611 0.768904;
-               vertex3 0.0775981 0.0101 0.0112;
-               normal3 0.704971 0.10493 0.701431;
-               vertex3 0.078 0.0086 0.0112;
-               normal3 0.704972 -0.104929 0.701431;
-               vertex3 0.078 -0.00860001 0.0112;
+               normal3 0.316069 -0.542179 0.778552;
+               vertex3 0.0765 -0.0105981 0.0112;
+               normal3 0.0871912 -0.664503 0.742182;
+               vertex3 0.075 -0.011 0.0112;
+               normal3 0.562723 -0.327726 0.758906;
+               vertex3 0.0775981 -0.00950002 0.0112;
+               normal3 0.316072 0.542177 0.778552;
+               vertex3 0.0765 0.0105981 0.0112;
+               normal3 0.087193 0.664502 0.742182;
+               vertex3 0.075 0.011 0.0112;
+               normal3 0.562723 0.327726 0.758906;
+               vertex3 0.0775981 0.0095 0.0112;
+               normal3 0.677721 0.117344 0.725896;
+               vertex3 0.078 0.008 0.0112;
+               normal3 0.677721 -0.117342 0.725896;
+               vertex3 0.078 -0.00800001 0.0112;
                normal3 1 0 0;
-               texcoord2 0.5 0.5;
+               texcoord2 0.416667 0.5;
                vertex3 0.045 -0.0073 0.0108;
                vertex3 0.045 -0.0073 0.00880001;
                vertex3 0.045 -0.0103 0.00880001;
@@ -192,7 +191,7 @@ mesh
                vertex3 0.0195 -0.0108 0.0158;
                normal3 0.298275 0 0.95448;
                vertex3 0.0365 -0.0108 0.0153;
-               normal3 -1.82063e-07 1 1.47927e-07;
+               normal3 -1.66031e-07 1 1.34901e-07;
                vertex3 0.0365 -0.00779999 0.0153;
                normal3 1 0 0;
                vertex3 0.0445 -0.0108 0.0128;
@@ -206,7 +205,7 @@ mesh
                vertex3 0.035 -0.00779999 0.0133;
                normal3 0 -1 0;
                vertex3 0.023 -0.0108 0.0258;
-               normal3 -7.76099e-08 -1 -3.8805e-07;
+               normal3 -1.59299e-07 -1 -7.96498e-07;
                vertex3 0.0205 -0.0108 0.0193;
                normal3 0 -1 0;
                vertex3 0.0195 -0.0108 0.0203;
@@ -215,45 +214,45 @@ mesh
                vertex3 0.0265 -0.0108 0.0233;
                normal3 0.976187 0 -0.21693;
                vertex3 0.023 -0.0108 0.0193;
-               normal3 1.44133e-07 1 7.20665e-07;
+               normal3 1.07029e-07 1 5.35143e-07;
                vertex3 0.023 -0.0078 0.0193;
                normal3 0.581238 0 0.813734;
                vertex3 0.0265 -0.0078 0.0233;
                normal3 0 0 1;
                vertex3 0.0195 -0.0078 0.0258;
-               normal3 -0.707105 0 -0.707108;
+               normal3 -0.707106 0 -0.707108;
                vertex3 0.0195 -0.0078 0.0203;
                vertex3 0.0205 -0.0078 0.0193;
                normal3 0.581238 0 0.813734;
                vertex3 0.023 -0.0078 0.0258;
-               normal3 9.80338e-08 -1 -7.96528e-08;
+               normal3 1.80451e-07 -1 -1.46617e-07;
                vertex3 0.02475 -0.0108 0.0213;
                normal3 0.752575 0 -0.658506;
                vertex3 0.02475 -0.0078 0.0213;
                normal3 -0.615271 0 -0.788315;
                vertex3 0.02475 0.0078 0.0213;
-               normal3 9.80338e-08 1 -7.96528e-08;
+               normal3 1.80451e-07 1 -1.46617e-07;
                vertex3 0.02475 0.0108 0.0213;
                normal3 0 -1 0;
                vertex3 0.023 0.0078 0.0258;
-               normal3 7.20664e-08 -1 3.60332e-07;
+               normal3 1.47921e-07 -1 7.39605e-07;
                vertex3 0.0205 0.0078 0.0193;
                normal3 0 -1 0;
                vertex3 0.0195 0.0078 0.0203;
                vertex3 0.0195 0.0078 0.0258;
                normal3 0.624695 0 0.780869;
                vertex3 0.0265 0.0078 0.0233;
-               normal3 1.44133e-07 -1 7.20665e-07;
+               normal3 1.07029e-07 -1 5.35143e-07;
                vertex3 0.023 0.0078 0.0193;
                normal3 0.752575 0 -0.658506;
                vertex3 0.023 0.0108 0.0193;
-               normal3 1.96068e-07 1 -1.59306e-07;
+               normal3 2.05129e-07 1 -1.66668e-07;
                vertex3 0.0265 0.0108 0.0233;
                normal3 0 0 1;
                vertex3 0.0195 0.0108 0.0258;
-               normal3 -0.707105 0 -0.707108;
+               normal3 -0.707106 0 -0.707108;
                vertex3 0.0195 0.0108 0.0203;
-               normal3 -7.76099e-08 1 -3.8805e-07;
+               normal3 -1.59299e-07 1 -7.96498e-07;
                vertex3 0.0205 0.0108 0.0193;
                normal3 0 1 0;
                vertex3 0.023 0.0108 0.0258;
@@ -263,7 +262,7 @@ mesh
                vertex3 0.036 0.0078 0.0108;
                normal3 9.25541e-08 1 3.33195e-06;
                vertex3 0.036 0.0108 0.0108;
-               normal3 1.61563e-07 1 1.00445e-06;
+               normal3 2.24497e-07 1 1.03687e-06;
                vertex3 0.035 0.0108 0.0133;
                normal3 0.298275 0 0.95448;
                vertex3 0.0445 0.00779999 0.0128;
@@ -271,35 +270,35 @@ mesh
                vertex3 0.0445 0.0078 0.0108;
                normal3 9.25541e-08 1 3.33195e-06;
                vertex3 0.0445 0.0108 0.0108;
-               normal3 4.62771e-08 1 1.66597e-06;
+               normal3 8.019e-08 1 2.88684e-06;
                vertex3 0.0445 0.0108 0.0128;
                normal3 0.624695 0 0.780869;
                vertex3 0.0365 0.00779999 0.0153;
-               normal3 1.96068e-07 1 -1.59306e-07;
+               normal3 1.78803e-07 1 -1.45278e-07;
                vertex3 0.0365 0.0108 0.0153;
-               normal3 -1.5522e-07 1 -7.76101e-07;
+               normal3 -1.3941e-07 1 -6.97051e-07;
                vertex3 0.0195 0.0108 0.0158;
                normal3 -0.961525 0 0.274719;
                vertex3 0.0195 0.00779999 0.0158;
-               normal3 1.09568e-07 1 4.49229e-06;
+               normal3 1.08093e-07 1 4.53211e-06;
                vertex3 0.023 0.0108 0.0118;
-               normal3 0 1 7.45063e-06;
+               normal3 0 1 7.45064e-06;
                vertex3 0.023 0.0108 0.0108;
-               normal3 0 -1 -7.45063e-06;
+               normal3 0 -1 -7.45064e-06;
                vertex3 0.023 0.0078 0.0108;
-               normal3 -1.09568e-07 -1 -4.49229e-06;
+               normal3 -1.08093e-07 -1 -4.53211e-06;
                vertex3 0.023 0.00779999 0.0118;
                normal3 0.976187 0 -0.21693;
                vertex3 0.022 0.00779999 0.0148;
-               normal3 -3.04349e-08 1 -6.08524e-09;
+               normal3 -2.79745e-08 1 6.68081e-08;
                vertex3 0.022 0.0108 0.0148;
-               normal3 1.09568e-07 1 7.66973e-07;
+               normal3 1.81942e-07 1 1.2736e-06;
                vertex3 0.016 0.0108 0.0128;
-               normal3 1.09568e-07 1 4.49229e-06;
+               normal3 1.9934e-07 1 2.06842e-06;
                vertex3 0.016 0.0108 0.0108;
-               normal3 -1.09568e-07 -1 -4.49229e-06;
+               normal3 -1.9934e-07 -1 -2.06842e-06;
                vertex3 0.016 0.0078 0.0108;
-               normal3 -1.09568e-07 -1 -7.66973e-07;
+               normal3 -1.81942e-07 -1 -1.2736e-06;
                vertex3 0.016 0.00779999 0.0128;
                normal3 -1 0 0;
                vertex3 0.012 0.0073 0.0108;
@@ -326,7 +325,7 @@ mesh
                normal3 0 -1 0;
                vertex3 0.045 0.0073 0.0108;
                normal3 0 1 0;
-               texcoord2 0.9 0.5;
+               texcoord2 0.75 0.5;
                vertex3 0.0195 0.015 0.0258;
                vertex3 0.0195 0.015 0.0203;
                vertex3 0.0165 0.015 0.0203;
@@ -339,24 +338,25 @@ mesh
                normal3 1 -4.65661e-08 -2.53997e-07;
                vertex3 0.0195 0.005 0.0203;
                normal3 1 -4.65661e-08 -4.23328e-07;
-               texcoord2 0.7 0.5;
+               texcoord2 0.583333 0.5;
                vertex3 0.0195 -0.005 0.0203;
+               normal3 1 -4.65661e-08 -4.23328e-07;
                vertex3 0.0195 -0.005 0.0258;
                normal3 1 -4.65661e-08 -2.53997e-07;
-               texcoord2 0.9 0.5;
+               texcoord2 0.75 0.5;
                vertex3 0.0195 0.005 0.0258;
                normal3 -4.65661e-07 4.65661e-08 -1;
                vertex3 0.0165 0.005 0.0203;
                normal3 -7.76102e-07 4.65662e-08 -1;
-               texcoord2 0.7 0.5;
+               texcoord2 0.583333 0.5;
                vertex3 0.0165 -0.005 0.0203;
                normal3 -1 -9.31323e-08 3.38663e-07;
                vertex3 0.0165 -0.005 0.0258;
                normal3 -1 -4.65661e-08 8.46657e-08;
-               texcoord2 0.9 0.5;
+               texcoord2 0.75 0.5;
                vertex3 0.0165 0.005 0.0258;
                normal3 1 0 0;
-               texcoord2 0.5 0.5;
+               texcoord2 0.416667 0.5;
                vertex3 0.0385 0.0078 0.0138;
                vertex3 0.0385 0.0078 0.0108;
                normal3 -1.86265e-06 2.38801e-07 -1;
@@ -411,21 +411,21 @@ mesh
                vertex3 0.0165 -0.00948236 0.0252319;
                normal3 -0.447214 0.632455 0.632456;
                vertex3 0.0155 -0.00893934 0.0243607;
-               normal3 -0.447214 0.86395 0.231495;
+               normal3 -0.447214 0.86395 0.231494;
                vertex3 0.0155 -0.00855111 0.0236882;
-               normal3 -0.447214 0.86395 -0.231495;
+               normal3 -0.447214 0.86395 -0.231494;
                vertex3 0.0155 -0.00855111 0.0229118;
-               normal3 -0.447214 0.632456 -0.632455;
+               normal3 -0.447214 0.632456 -0.632456;
                vertex3 0.0155 -0.00893934 0.0222393;
                normal3 -0.447214 0.231495 -0.86395;
                vertex3 0.0155 -0.00961177 0.0218511;
                normal3 -0.447214 -0.231495 -0.86395;
                vertex3 0.0155 -0.0103882 0.0218511;
-               normal3 -0.447214 -0.632456 -0.632455;
+               normal3 -0.447214 -0.632456 -0.632456;
                vertex3 0.0155 -0.0110607 0.0222393;
-               normal3 -0.447214 -0.86395 -0.231495;
+               normal3 -0.447214 -0.86395 -0.231494;
                vertex3 0.0155 -0.0114489 0.0229118;
-               normal3 -0.447214 -0.863951 0.231494;
+               normal3 -0.447214 -0.86395 0.231494;
                vertex3 0.0155 -0.0114489 0.0236882;
                normal3 -0.447214 -0.632456 0.632455;
                vertex3 0.0155 -0.0110607 0.0243607;
@@ -458,7 +458,7 @@ mesh
                vertex3 0.0115 -0.00966354 0.0220443;
                normal3 0 -0.25882 -0.965926;
                vertex3 0.0115 -0.0103365 0.0220443;
-               normal3 0 -0.707108 -0.707106;
+               normal3 0 -0.707107 -0.707106;
                vertex3 0.0115 -0.0109192 0.0223808;
                normal3 0 -0.965926 -0.258819;
                vertex3 0.0115 -0.0112557 0.0229635;
@@ -466,7 +466,7 @@ mesh
                vertex3 0.0115 -0.0112557 0.0236365;
                normal3 0 -0.707108 0.707106;
                vertex3 0.0115 -0.0109192 0.0242192;
-               normal3 0 -0.258821 0.965925;
+               normal3 0 -0.258821 0.965926;
                vertex3 0.0115 -0.0103365 0.0245557;
                normal3 0 0.25882 0.965926;
                vertex3 0.0115 -0.00966354 0.0245557;
@@ -524,7 +524,7 @@ mesh
                vertex3 0.00900001 -0.00871307 0.0245869;
                normal3 -4.82087e-07 0.965926 0.258819;
                vertex3 0.00900001 -0.00824203 0.023771;
-               normal3 4.82089e-07 -0.707108 -0.707106;
+               normal3 4.8411e-07 -0.707107 -0.707106;
                vertex3 0.00900001 -0.0112869 0.0220131;
                normal3 0 -0.965926 -0.258819;
                vertex3 0.00900001 -0.011758 0.022829;
@@ -538,13 +538,13 @@ mesh
                vertex3 0.00900001 -0.00952895 0.025058;
                normal3 -1 0 0;
                vertex3 0.00900001 -0.01 0.0233;
-               normal3 4.8209e-07 -0.25882 -0.965926;
+               normal3 4.84111e-07 -0.258821 -0.965926;
                vertex3 0.00900001 -0.010471 0.021542;
-               normal3 1.11869e-07 0.258819 -0.965926;
+               normal3 1.24931e-07 0.258819 -0.965926;
                vertex3 0.00900001 -0.00952895 0.021542;
-               normal3 7.23132e-07 0.707107 -0.707107;
+               normal3 7.33971e-07 0.707106 -0.707107;
                vertex3 0.00900001 -0.00871307 0.0220131;
-               normal3 1.29177e-07 0.965926 -0.258819;
+               normal3 1.26958e-07 0.965925 -0.258821;
                vertex3 0.00900001 -0.00824203 0.022829;
                normal3 -1 0 0;
                vertex3 0.00900001 0.011758 0.022829;
@@ -570,15 +570,15 @@ mesh
                vertex3 0.00950001 0.00824203 0.023771;
                normal3 0 -0.965926 -0.258819;
                vertex3 0.00950001 0.00824203 0.022829;
-               normal3 4.82089e-07 -0.707108 -0.707106;
+               normal3 4.8411e-07 -0.707107 -0.707106;
                vertex3 0.00950001 0.00871308 0.0220131;
-               normal3 4.8209e-07 -0.25882 -0.965926;
+               normal3 4.84109e-07 -0.258819 -0.965926;
                vertex3 0.00950001 0.00952895 0.021542;
-               normal3 1.11869e-07 0.258819 -0.965926;
+               normal3 1.24932e-07 0.25882 -0.965926;
                vertex3 0.00950001 0.010471 0.021542;
-               normal3 7.23132e-07 0.707107 -0.707107;
+               normal3 7.33973e-07 0.707107 -0.707106;
                vertex3 0.00950001 0.0112869 0.0220131;
-               normal3 1.29177e-07 0.965926 -0.258819;
+               normal3 1.26948e-07 0.965926 -0.258818;
                vertex3 0.00950001 0.011758 0.022829;
                normal3 0 0.707107 0.707106;
                vertex3 0.00950001 0.0112869 0.0245869;
@@ -636,7 +636,7 @@ mesh
                vertex3 0.0115 0.0112557 0.0236365;
                normal3 0 0.25882 0.965926;
                vertex3 0.0155 0.0103365 0.0245557;
-               normal3 0 -0.258821 0.965925;
+               normal3 0 -0.258821 0.965926;
                vertex3 0.0155 0.00966354 0.0245557;
                normal3 0 -0.707108 0.707106;
                vertex3 0.0155 0.00908077 0.0242192;
@@ -644,7 +644,7 @@ mesh
                vertex3 0.0155 0.00874431 0.0236365;
                normal3 0 -0.965926 -0.258819;
                vertex3 0.0155 0.00874431 0.0229635;
-               normal3 0 -0.707108 -0.707106;
+               normal3 0 -0.707107 -0.707106;
                vertex3 0.0155 0.00908077 0.0223808;
                normal3 0 -0.25882 -0.965926;
                vertex3 0.0155 0.00966354 0.0220443;
@@ -695,81 +695,181 @@ mesh
                vertex3 0.0165 0.0119319 0.0238176;
                normal3 -0.447214 0.632455 0.632456;
                vertex3 0.0165 0.0114142 0.0247142;
-               normal3 0.178751 -0.319872 0.930446;
-               texcoord2 0.1 0.5;
-               vertex3 0.074 -0.00859809 0.0132;
-               normal3 0.0517699 -0.410228 0.910513;
-               vertex3 0.0725 -0.00900001 0.0132;
-               normal3 0.322167 -0.179415 0.929526;
-               vertex3 0.0750981 -0.00750002 0.0132;
-               normal3 0.178753 0.319871 0.930446;
-               vertex3 0.074 0.00859808 0.0132;
-               normal3 0.051771 0.410227 0.910513;
-               vertex3 0.0725 0.009 0.0132;
-               normal3 0.322166 0.179416 0.929526;
-               vertex3 0.0750981 0.0075 0.0132;
-               normal3 0.416806 -0.0524188 0.907483;
-               vertex3 0.0755 -0.00600001 0.0132;
-               normal3 0.416805 0.0524203 0.907483;
-               vertex3 0.0755 0.006 0.0132;
-               normal3 -0.416804 0.0524221 0.907483;
-               vertex3 0.0595 0.00600001 0.0132;
-               normal3 -0.322165 0.179418 0.929526;
-               vertex3 0.0599019 0.00749999 0.0132;
-               normal3 -0.178753 0.319872 0.930446;
-               vertex3 0.061 0.00859806 0.0132;
-               normal3 -0.0517715 0.410227 0.910513;
-               vertex3 0.0625 0.00899998 0.0132;
-               normal3 -0.0785041 0.649879 0.755972;
-               vertex3 0.06 0.0116 0.0112;
-               normal3 -0.27017 0.484986 0.831743;
-               vertex3 0.0585 0.0111981 0.0112;
-               normal3 -0.495229 0.273148 0.824705;
-               vertex3 0.0574019 0.0101 0.0112;
-               normal3 -0.678337 0.0814003 0.730228;
-               vertex3 0.057 0.00860001 0.0112;
-               normal3 -0.678337 -0.0814 0.730228;
-               vertex3 0.057 -0.00860001 0.0112;
-               normal3 -0.495229 -0.273147 0.824705;
-               vertex3 0.0574019 -0.0101 0.0112;
-               normal3 -0.27017 -0.484985 0.831744;
-               vertex3 0.0585 -0.0111981 0.0112;
-               normal3 -0.0785041 -0.649879 0.755972;
-               vertex3 0.06 -0.0116 0.0112;
-               normal3 -0.0517715 -0.410227 0.910513;
-               vertex3 0.0625 -0.00899998 0.0132;
-               normal3 -0.178753 -0.319872 0.930446;
-               vertex3 0.061 -0.00859807 0.0132;
-               normal3 -0.322165 -0.179418 0.929526;
-               vertex3 0.0599019 -0.0075 0.0132;
-               normal3 -0.416804 -0.0524221 0.907483;
-               vertex3 0.0595 -0.00600001 0.0132;
-               normal3 -0.129419 -0.0447985 0.990578;
-               vertex3 0.0615 -0.00600001 0.0137;
-               normal3 -0.0559446 -0.16162 0.985266;
-               vertex3 0.0625 -0.00699998 0.0137;
-               normal3 -0.0559446 0.16162 0.985266;
-               vertex3 0.0625 0.00699998 0.0137;
-               normal3 -0.129419 0.0447985 0.990578;
-               vertex3 0.0615 0.00600001 0.0137;
-               normal3 0.129419 0.0447977 0.990578;
-               vertex3 0.0735 0.006 0.0137;
-               normal3 0.129418 -0.0447972 0.990578;
-               vertex3 0.0735 -0.00600001 0.0137;
-               normal3 0.0559444 0.16162 0.985266;
-               vertex3 0.0725 0.007 0.0137;
-               normal3 0.0559437 -0.16162 0.985266;
-               vertex3 0.0725 -0.00700001 0.0137;
-               normal3 -0.393406 0.530239 0.751052;
-               vertex3 0.055 0.014 0.008;
-               normal3 -0.393406 -0.530238 0.751052;
-               vertex3 0.055 -0.014 0.008;
-               normal3 -8.76539e-08 -0.8 0.6;
-               vertex3 -1.49012e-08 -0.014 0.008;
-               normal3 2.62962e-07 0.8 0.6;
-               vertex3 7.45058e-09 0.014 0.008;
+               normal3 0.185457 -0.341047 0.921571;
+               texcoord2 0.0833333 0.5;
+               vertex3 0.074 -0.00799809 0.0132;
+               normal3 0.0396088 -0.431312 0.901333;
+               vertex3 0.0725 -0.00840001 0.0132;
+               normal3 0.344992 -0.185185 0.920156;
+               vertex3 0.0750981 -0.00690002 0.0132;
+               normal3 0.185459 0.341046 0.921571;
+               vertex3 0.074 0.00799808 0.0132;
+               normal3 0.0396097 0.431312 0.901333;
+               vertex3 0.0725 0.0084 0.0132;
+               normal3 0.34499 0.185187 0.920156;
+               vertex3 0.0750981 0.0069 0.0132;
+               normal3 0.439551 -0.0393483 0.897355;
+               vertex3 0.0755 -0.00540001 0.0132;
+               normal3 0.439551 0.0393493 0.897355;
+               vertex3 0.0755 0.0054 0.0132;
+               normal3 -0.43955 0.0393508 0.897355;
+               vertex3 0.0595 0.00540001 0.0132;
+               normal3 -0.344989 0.185188 0.920157;
+               vertex3 0.0599019 0.00689999 0.0132;
+               normal3 -0.185458 0.341047 0.921571;
+               vertex3 0.061 0.00799806 0.0132;
+               normal3 -0.0396105 0.431312 0.901333;
+               vertex3 0.0625 0.00839998 0.0132;
+               normal3 -0.0709727 0.657567 0.750046;
+               vertex3 0.06 0.011 0.0112;
+               normal3 -0.27617 0.497645 0.822241;
+               vertex3 0.0585 0.0105981 0.0112;
+               normal3 -0.531363 0.276057 0.800903;
+               vertex3 0.0574019 0.0095 0.0112;
+               normal3 -0.726187 0.0713506 0.683784;
+               vertex3 0.057 0.00800001 0.0112;
+               normal3 -0.726187 -0.0713503 0.683785;
+               vertex3 0.057 -0.00800001 0.0112;
+               normal3 -0.531362 -0.276057 0.800904;
+               vertex3 0.0574019 -0.0095 0.0112;
+               normal3 -0.276169 -0.497644 0.822241;
+               vertex3 0.0585 -0.0105981 0.0112;
+               normal3 -0.0709726 -0.657567 0.750046;
+               vertex3 0.06 -0.011 0.0112;
+               normal3 -0.0396105 -0.431312 0.901333;
+               vertex3 0.0625 -0.00839998 0.0132;
+               normal3 -0.185458 -0.341047 0.921571;
+               vertex3 0.061 -0.00799807 0.0132;
+               normal3 -0.344989 -0.185188 0.920157;
+               vertex3 0.0599019 -0.0069 0.0132;
+               normal3 -0.43955 -0.0393508 0.897355;
+               vertex3 0.0595 -0.00540001 0.0132;
+               normal3 -0.130453 -0.0482226 0.990281;
+               vertex3 0.0615 -0.00540001 0.0137;
+               normal3 -0.0482221 -0.130453 0.990281;
+               vertex3 0.0625 -0.00639998 0.0137;
+               normal3 -0.0482221 0.130453 0.990281;
+               vertex3 0.0625 0.00639998 0.0137;
+               normal3 -0.130453 0.0482226 0.990281;
+               vertex3 0.0615 0.00540001 0.0137;
+               normal3 0.130453 0.0482217 0.990281;
+               vertex3 0.0735 0.0054 0.0137;
+               normal3 0.130452 -0.0482214 0.990281;
+               vertex3 0.0735 -0.00540001 0.0137;
+               normal3 0.0482219 0.130453 0.990281;
+               vertex3 0.0725 0.0064 0.0137;
+               normal3 0.0482214 -0.130453 0.990281;
+               vertex3 0.0725 -0.00640001 0.0137;
+               normal3 -1 0 0;
+               texcoord2 0.916667 0.5;
+               vertex3 0.00280001 -0.0135 0.0075;
+               vertex3 0.00280001 0.0135 0.0075;
+               normal3 0 1 0;
+               vertex3 0.005 0.0135 0.0075;
+               normal3 1 0 0;
+               vertex3 0.005 -0.0135 0.0075;
+               normal3 -1 0 0;
+               vertex3 0.00280001 -0.0135 0.008;
+               vertex3 0.00280001 0.0135 0.008;
+               normal3 0 1 0;
+               vertex3 0.005 0.0135 0.008;
+               normal3 1 0 0;
+               vertex3 0.005 -0.0135 0.008;
+               normal3 -1 0 0;
+               vertex3 0.0106 -0.0135 0.0075;
+               vertex3 0.0106 0.0135 0.0075;
+               normal3 0 1 0;
+               vertex3 0.0128 0.0135 0.0075;
+               normal3 1 0 0;
+               vertex3 0.0128 -0.0135 0.0075;
+               normal3 -1 0 0;
+               vertex3 0.0106 -0.0135 0.008;
+               vertex3 0.0106 0.0135 0.008;
+               normal3 0 1 0;
+               vertex3 0.0128 0.0135 0.008;
+               normal3 1 0 0;
+               vertex3 0.0128 -0.0135 0.008;
+               normal3 -1 0 0;
+               vertex3 0.0184 -0.0135 0.0075;
+               vertex3 0.0184 0.0135 0.0075;
+               normal3 0 1 0;
+               vertex3 0.0206 0.0135 0.0075;
+               normal3 1 0 0;
+               vertex3 0.0206 -0.0135 0.0075;
+               normal3 -1 0 0;
+               vertex3 0.0184 -0.0135 0.008;
+               vertex3 0.0184 0.0135 0.008;
+               normal3 0 1 0;
+               vertex3 0.0206 0.0135 0.008;
+               normal3 1 0 0;
+               vertex3 0.0206 -0.0135 0.008;
+               normal3 -1 0 0;
+               vertex3 0.0262 -0.0135 0.0075;
+               vertex3 0.0262 0.0135 0.0075;
+               normal3 0 1 0;
+               vertex3 0.0284 0.0135 0.0075;
+               normal3 1 0 0;
+               vertex3 0.0284 -0.0135 0.0075;
+               normal3 -1 0 0;
+               vertex3 0.0262 -0.0135 0.008;
+               vertex3 0.0262 0.0135 0.008;
+               normal3 0 1 0;
+               vertex3 0.0284 0.0135 0.008;
+               normal3 1 0 0;
+               vertex3 0.0284 -0.0135 0.008;
+               normal3 -1 0 0;
+               vertex3 0.034 -0.0135 0.0075;
+               vertex3 0.034 0.0135 0.0075;
+               normal3 0 1 0;
+               vertex3 0.0362 0.0135 0.0075;
+               normal3 1 0 0;
+               vertex3 0.0362 -0.0135 0.0075;
+               normal3 -1 0 0;
+               vertex3 0.034 -0.0135 0.008;
+               vertex3 0.034 0.0135 0.008;
+               normal3 0 1 0;
+               vertex3 0.0362 0.0135 0.008;
+               normal3 1 0 0;
+               vertex3 0.0362 -0.0135 0.008;
+               normal3 -1 0 0;
+               vertex3 0.0418 -0.0135 0.0075;
+               vertex3 0.0418 0.0135 0.0075;
+               normal3 0 1 0;
+               vertex3 0.044 0.0135 0.0075;
+               normal3 1 0 0;
+               vertex3 0.044 -0.0135 0.0075;
+               normal3 -1 0 0;
+               vertex3 0.0418 -0.0135 0.008;
+               vertex3 0.0418 0.0135 0.008;
+               normal3 0 1 0;
+               vertex3 0.044 0.0135 0.008;
+               normal3 1 0 0;
+               vertex3 0.044 -0.0135 0.008;
+               normal3 -1 0 0;
+               vertex3 0.0496 -0.0135 0.0075;
+               vertex3 0.0496 0.0135 0.0075;
+               normal3 0 1 0;
+               vertex3 0.0518 0.0135 0.0075;
+               normal3 1 0 0;
+               vertex3 0.0518 -0.0135 0.0075;
+               normal3 -1 0 0;
+               vertex3 0.0496 -0.0135 0.008;
+               vertex3 0.0496 0.0135 0.008;
+               normal3 0 1 0;
+               vertex3 0.0518 0.0135 0.008;
+               normal3 1 0 0;
+               vertex3 0.0518 -0.0135 0.008;
+               normal3 -0.173574 0.71291 0.679434;
+               texcoord2 0.0833333 0.5;
+               vertex3 0.055 0.014 0.0075;
+               normal3 -0.173574 -0.71291 0.679434;
+               vertex3 0.055 -0.014 0.0075;
+               normal3 -8.35525e-08 -0.780869 0.624695;
+               vertex3 -1.49012e-08 -0.014 0.0075;
+               normal3 2.56228e-07 0.780869 0.624695;
+               vertex3 7.45058e-09 0.014 0.0075;
                normal3 0 0 1;
-               texcoord2 0.5 0.5;
+               texcoord2 0.416667 0.5;
                vertex3 0.045 -0.0073 0.0108;
                normal3 0 1 0;
                vertex3 0.045 -0.0073 0.0108;
@@ -833,45 +933,45 @@ mesh
                vertex3 0.012 -0.0073 0.0108;
                normal3 -0.650791 0 0.759257;
                vertex3 0.016 -0.00779999 0.0128;
-               normal3 -1.09568e-07 1 -7.66973e-07;
+               normal3 -1.81942e-07 1 -1.2736e-06;
                vertex3 0.016 -0.00779999 0.0128;
-               normal3 -1.09568e-07 1 -4.49229e-06;
+               normal3 -1.9934e-07 1 -2.06842e-06;
                vertex3 0.016 -0.0078 0.0108;
-               normal3 1.09568e-07 -1 4.49229e-06;
+               normal3 1.9934e-07 -1 2.06842e-06;
                vertex3 0.016 -0.0108 0.0108;
                normal3 -0.650791 0 0.759257;
                vertex3 0.016 -0.0108 0.0128;
-               normal3 1.09568e-07 -1 7.66973e-07;
+               normal3 1.81942e-07 -1 1.2736e-06;
                vertex3 0.016 -0.0108 0.0128;
-               normal3 -3.04349e-08 -1 -6.08524e-09;
+               normal3 -2.79745e-08 -1 6.68081e-08;
                vertex3 0.022 -0.0108 0.0148;
                normal3 0.976187 0 -0.21693;
                vertex3 0.022 -0.0108 0.0148;
-               normal3 2.30435e-08 1 -3.0872e-08;
+               normal3 1.85949e-08 1 -1.13707e-07;
                vertex3 0.022 -0.00779999 0.0148;
                normal3 0.976187 0 -0.21693;
                vertex3 0.022 -0.00779999 0.0148;
                normal3 1 0 0;
                vertex3 0.023 -0.00779999 0.0118;
-               normal3 -1.09568e-07 1 -4.49229e-06;
+               normal3 -1.08093e-07 1 -4.53211e-06;
                vertex3 0.023 -0.00779999 0.0118;
-               normal3 0 1 -7.45063e-06;
+               normal3 0 1 -7.45064e-06;
                vertex3 0.023 -0.0078 0.0108;
-               normal3 0 -1 7.45063e-06;
+               normal3 0 -1 7.45064e-06;
                vertex3 0.023 -0.0108 0.0108;
                normal3 1 0 0;
                vertex3 0.023 -0.0108 0.0118;
-               normal3 1.09568e-07 -1 4.49229e-06;
+               normal3 1.08093e-07 -1 4.53211e-06;
                vertex3 0.023 -0.0108 0.0118;
-               normal3 1.44133e-07 1 7.20665e-07;
+               normal3 1.29452e-07 1 6.47262e-07;
                vertex3 0.0195 -0.00779999 0.0158;
                normal3 -0.961525 0 0.274719;
                vertex3 0.0195 -0.00779999 0.0158;
-               normal3 -1.5522e-07 -1 -7.76101e-07;
+               normal3 -1.3941e-07 -1 -6.97051e-07;
                vertex3 0.0195 -0.0108 0.0158;
                normal3 -0.961525 0 0.274719;
                vertex3 0.0195 -0.0108 0.0158;
-               normal3 1.96068e-07 -1 -1.59306e-07;
+               normal3 1.78803e-07 -1 -1.45278e-07;
                vertex3 0.0365 -0.0108 0.0153;
                normal3 0.624695 0 0.780869;
                vertex3 0.0365 -0.0108 0.0153;
@@ -881,17 +981,17 @@ mesh
                vertex3 0.0365 -0.00779999 0.0153;
                normal3 0.298275 0 0.95448;
                vertex3 0.0445 -0.0108 0.0128;
-               normal3 4.62771e-08 -1 1.66597e-06;
+               normal3 8.019e-08 -1 2.88684e-06;
                vertex3 0.0445 -0.0108 0.0128;
                normal3 9.25541e-08 -1 3.33195e-06;
                vertex3 0.0445 -0.0108 0.0108;
                normal3 -9.25541e-08 1 -3.33195e-06;
                vertex3 0.0445 -0.0078 0.0108;
-               normal3 -4.62771e-08 1 -1.66597e-06;
+               normal3 -8.019e-08 1 -2.88684e-06;
                vertex3 0.0445 -0.00779999 0.0128;
                normal3 0.298275 0 0.95448;
                vertex3 0.0445 -0.00779999 0.0128;
-               normal3 1.61563e-07 -1 1.00445e-06;
+               normal3 2.24497e-07 -1 1.03687e-06;
                vertex3 0.035 -0.0108 0.0133;
                normal3 -0.615271 0 -0.788315;
                vertex3 0.035 -0.0108 0.0133;
@@ -899,7 +999,7 @@ mesh
                vertex3 0.036 -0.0108 0.0108;
                normal3 -9.25541e-08 1 -3.33195e-06;
                vertex3 0.036 -0.0078 0.0108;
-               normal3 -1.52227e-07 1 -1.01203e-06;
+               normal3 -2.10828e-07 1 -1.04798e-06;
                vertex3 0.035 -0.00779999 0.0133;
                normal3 -0.615271 0 -0.788315;
                vertex3 0.035 -0.00779999 0.0133;
@@ -907,19 +1007,19 @@ mesh
                vertex3 0.023 -0.0108 0.0258;
                normal3 0 0 1;
                vertex3 0.023 -0.0108 0.0258;
-               normal3 -0.707105 0 -0.707108;
+               normal3 -0.707106 0 -0.707108;
                vertex3 0.0205 -0.0108 0.0193;
                normal3 -0.961525 0 0.274719;
                vertex3 0.0205 -0.0108 0.0193;
-               normal3 -0.707105 0 -0.707108;
+               normal3 -0.707106 0 -0.707108;
                vertex3 0.0195 -0.0108 0.0203;
                normal3 0 0 1;
                vertex3 0.0195 -0.0108 0.0258;
-               normal3 1.96068e-07 -1 -1.59306e-07;
+               normal3 2.05129e-07 -1 -1.66668e-07;
                vertex3 0.0265 -0.0108 0.0233;
                normal3 0.624695 0 0.780869;
                vertex3 0.0265 -0.0108 0.0233;
-               normal3 -1.5522e-07 -1 -7.76101e-07;
+               normal3 -1.15262e-07 -1 -5.76308e-07;
                vertex3 0.023 -0.0108 0.0193;
                normal3 0.752575 0 -0.658506;
                vertex3 0.023 -0.0108 0.0193;
@@ -927,14 +1027,14 @@ mesh
                vertex3 0.023 -0.0078 0.0193;
                normal3 0.752575 0 -0.658506;
                vertex3 0.023 -0.0078 0.0193;
-               normal3 -1.82063e-07 1 1.47927e-07;
+               normal3 -1.90477e-07 1 1.54763e-07;
                vertex3 0.0265 -0.0078 0.0233;
                normal3 0.624695 0 0.780869;
                vertex3 0.0265 -0.0078 0.0233;
                normal3 0 1 0;
                vertex3 0.0195 -0.0078 0.0258;
                vertex3 0.0195 -0.0078 0.0203;
-               normal3 7.20664e-08 1 3.60332e-07;
+               normal3 1.47921e-07 1 7.39605e-07;
                vertex3 0.0205 -0.0078 0.0193;
                normal3 -0.961525 0 0.274719;
                vertex3 0.0205 -0.0078 0.0193;
@@ -946,11 +1046,11 @@ mesh
                vertex3 0.02475 -0.0108 0.0213;
                normal3 -0.615271 0 -0.788315;
                vertex3 0.02475 -0.0108 0.0213;
-               normal3 -9.10314e-08 1 7.39633e-08;
+               normal3 -1.67562e-07 1 1.36145e-07;
                vertex3 0.02475 -0.0078 0.0213;
                normal3 -0.615271 0 -0.788315;
                vertex3 0.02475 -0.0078 0.0213;
-               normal3 -9.10314e-08 -1 7.39633e-08;
+               normal3 -1.67562e-07 -1 1.36145e-07;
                vertex3 0.02475 0.0078 0.0213;
                normal3 0.752575 0 -0.658506;
                vertex3 0.02475 0.0078 0.0213;
@@ -964,12 +1064,12 @@ mesh
                vertex3 0.023 0.0078 0.0258;
                normal3 -0.961525 0 0.274719;
                vertex3 0.0205 0.0078 0.0193;
-               normal3 -0.707105 0 -0.707108;
+               normal3 -0.707106 0 -0.707108;
                vertex3 0.0205 0.0078 0.0193;
                vertex3 0.0195 0.0078 0.0203;
                normal3 0 0 1;
                vertex3 0.0195 0.0078 0.0258;
-               normal3 -1.82063e-07 -1 1.47927e-07;
+               normal3 -1.90477e-07 -1 1.54763e-07;
                vertex3 0.0265 0.0078 0.0233;
                normal3 0.581238 0 0.813734;
                vertex3 0.0265 0.0078 0.0233;
@@ -977,7 +1077,7 @@ mesh
                vertex3 0.023 0.0078 0.0193;
                normal3 0.976187 0 -0.21693;
                vertex3 0.023 0.0078 0.0193;
-               normal3 -1.5522e-07 1 -7.76101e-07;
+               normal3 -1.15262e-07 1 -5.76308e-07;
                vertex3 0.023 0.0108 0.0193;
                normal3 0.976187 0 -0.21693;
                vertex3 0.023 0.0108 0.0193;
@@ -990,13 +1090,13 @@ mesh
                vertex3 0.0195 0.0108 0.0203;
                normal3 -0.961525 0 0.274719;
                vertex3 0.0205 0.0108 0.0193;
-               normal3 -0.707105 0 -0.707108;
+               normal3 -0.707106 0 -0.707108;
                vertex3 0.0205 0.0108 0.0193;
                normal3 0 0 1;
                vertex3 0.023 0.0108 0.0258;
                normal3 0.581238 0 0.813734;
                vertex3 0.023 0.0108 0.0258;
-               normal3 -1.52227e-07 -1 -1.01203e-06;
+               normal3 -2.10828e-07 -1 -1.04798e-06;
                vertex3 0.035 0.00779999 0.0133;
                normal3 -0.928476 0 -0.371392;
                vertex3 0.035 0.00779999 0.0133;
@@ -1006,7 +1106,7 @@ mesh
                vertex3 0.035 0.0108 0.0133;
                normal3 -0.928476 0 -0.371392;
                vertex3 0.035 0.0108 0.0133;
-               normal3 -4.62771e-08 -1 -1.66597e-06;
+               normal3 -8.019e-08 -1 -2.88684e-06;
                vertex3 0.0445 0.00779999 0.0128;
                normal3 1 0 0;
                vertex3 0.0445 0.00779999 0.0128;
@@ -1016,7 +1116,7 @@ mesh
                vertex3 0.0445 0.0108 0.0128;
                normal3 1 0 0;
                vertex3 0.0445 0.0108 0.0128;
-               normal3 -1.82063e-07 -1 1.47927e-07;
+               normal3 -1.66031e-07 -1 1.34901e-07;
                vertex3 0.0365 0.00779999 0.0153;
                normal3 0.298275 0 0.95448;
                vertex3 0.0365 0.00779999 0.0153;
@@ -1028,7 +1128,7 @@ mesh
                vertex3 0.0195 0.0108 0.0158;
                normal3 -0.650791 0 0.759257;
                vertex3 0.0195 0.0108 0.0158;
-               normal3 1.44133e-07 -1 7.20665e-07;
+               normal3 1.29452e-07 -1 6.47262e-07;
                vertex3 0.0195 0.00779999 0.0158;
                normal3 -0.650791 0 0.759257;
                vertex3 0.0195 0.00779999 0.0158;
@@ -1042,7 +1142,7 @@ mesh
                vertex3 0.023 0.00779999 0.0118;
                normal3 0.948683 0 0.316228;
                vertex3 0.023 0.00779999 0.0118;
-               normal3 2.30435e-08 -1 -3.0872e-08;
+               normal3 1.85949e-08 -1 -1.13707e-07;
                vertex3 0.022 0.00779999 0.0148;
                normal3 0.948683 0 0.316228;
                vertex3 0.022 0.00779999 0.0148;
@@ -1120,8 +1220,8 @@ mesh
                vertex3 0.045 0.0073 0.0108;
                normal3 1 0 0;
                vertex3 0.045 0.0073 0.0108;
-               normal3 1 -9.31322e-08 -1.69331e-07;
-               texcoord2 0.9 0.5;
+               normal3 1 -9.31323e-08 -1.69331e-07;
+               texcoord2 0.75 0.5;
                vertex3 0.0195 0.015 0.0258;
                normal3 1.24176e-06 0 1;
                vertex3 0.0195 0.015 0.0258;
@@ -1152,25 +1252,25 @@ mesh
                normal3 -4.65661e-07 4.65661e-08 -1;
                vertex3 0.0195 0.005 0.0203;
                normal3 -7.76102e-07 4.65662e-08 -1;
-               texcoord2 0.7 0.5;
+               texcoord2 0.583333 0.5;
                vertex3 0.0195 -0.005 0.0203;
                normal3 6.20882e-07 -9.31322e-08 1;
                vertex3 0.0195 -0.005 0.0258;
                normal3 1.08654e-06 -4.65661e-08 1;
-               texcoord2 0.9 0.5;
+               texcoord2 0.75 0.5;
                vertex3 0.0195 0.005 0.0258;
                normal3 -1 -4.65661e-08 8.46657e-08;
                vertex3 0.0165 0.005 0.0203;
                normal3 -1 -9.31323e-08 3.38663e-07;
-               texcoord2 0.7 0.5;
+               texcoord2 0.583333 0.5;
                vertex3 0.0165 -0.005 0.0203;
                normal3 6.20882e-07 -9.31322e-08 1;
                vertex3 0.0165 -0.005 0.0258;
                normal3 1.08654e-06 -4.65661e-08 1;
-               texcoord2 0.9 0.5;
+               texcoord2 0.75 0.5;
                vertex3 0.0165 0.005 0.0258;
                normal3 0 0 1;
-               texcoord2 0.5 0.5;
+               texcoord2 0.416667 0.5;
                vertex3 0.0385 0.0078 0.0138;
                normal3 -1.86265e-06 2.38801e-07 -1;
                vertex3 0.0385 0.0078 0.0108;
@@ -1224,7 +1324,7 @@ mesh
                vertex3 0.0155 -0.00966354 0.0220443;
                normal3 0 -0.25882 -0.965926;
                vertex3 0.0155 -0.0103365 0.0220443;
-               normal3 0 -0.707108 -0.707106;
+               normal3 0 -0.707107 -0.707106;
                vertex3 0.0155 -0.0109192 0.0223808;
                normal3 0 -0.965926 -0.258819;
                vertex3 0.0155 -0.0112557 0.0229635;
@@ -1232,7 +1332,7 @@ mesh
                vertex3 0.0155 -0.0112557 0.0236365;
                normal3 0 -0.707108 0.707106;
                vertex3 0.0155 -0.0109192 0.0242192;
-               normal3 0 -0.258821 0.965925;
+               normal3 0 -0.258821 0.965926;
                vertex3 0.0155 -0.0103365 0.0245557;
                normal3 0 0.25882 0.965926;
                vertex3 0.0155 -0.00966354 0.0245557;
@@ -1290,15 +1390,15 @@ mesh
                vertex3 0.00950001 -0.00824203 0.023771;
                normal3 0 0.707107 0.707106;
                vertex3 0.00950001 -0.00871307 0.0245869;
-               normal3 1.29177e-07 0.965926 -0.258819;
+               normal3 1.26948e-07 0.965926 -0.258818;
                vertex3 0.00950001 -0.00824203 0.022829;
-               normal3 7.23132e-07 0.707107 -0.707107;
+               normal3 7.33973e-07 0.707107 -0.707106;
                vertex3 0.00950001 -0.00871307 0.0220131;
-               normal3 1.11869e-07 0.258819 -0.965926;
+               normal3 1.24932e-07 0.25882 -0.965926;
                vertex3 0.00950001 -0.00952895 0.021542;
-               normal3 4.8209e-07 -0.25882 -0.965926;
+               normal3 4.84109e-07 -0.258819 -0.965926;
                vertex3 0.00950001 -0.010471 0.021542;
-               normal3 4.82089e-07 -0.707108 -0.707106;
+               normal3 4.8411e-07 -0.707107 -0.707106;
                vertex3 0.00950001 -0.0112869 0.0220131;
                normal3 0 -0.965926 -0.258819;
                vertex3 0.00950001 -0.011758 0.022829;
@@ -1323,13 +1423,13 @@ mesh
                vertex3 0.00900001 -0.00952895 0.021542;
                vertex3 0.00900001 -0.00871307 0.0220131;
                vertex3 0.00900001 -0.00824203 0.022829;
-               normal3 1.29177e-07 0.965926 -0.258819;
+               normal3 1.26958e-07 0.965925 -0.258821;
                vertex3 0.00900001 0.011758 0.022829;
-               normal3 7.23132e-07 0.707107 -0.707107;
+               normal3 7.33971e-07 0.707106 -0.707107;
                vertex3 0.00900001 0.0112869 0.0220131;
-               normal3 1.11869e-07 0.258819 -0.965926;
+               normal3 1.24931e-07 0.258819 -0.965926;
                vertex3 0.00900001 0.010471 0.021542;
-               normal3 4.8209e-07 -0.25882 -0.965926;
+               normal3 4.84111e-07 -0.258821 -0.965926;
                vertex3 0.00900001 0.00952895 0.021542;
                normal3 0 0.258819 0.965926;
                vertex3 0.00900001 0.010471 0.025058;
@@ -1341,7 +1441,7 @@ mesh
                vertex3 0.00900001 0.00824203 0.023771;
                normal3 0 -0.965926 -0.258819;
                vertex3 0.00900001 0.00824203 0.022829;
-               normal3 4.82089e-07 -0.707108 -0.707106;
+               normal3 4.8411e-07 -0.707107 -0.707106;
                vertex3 0.00900001 0.00871308 0.0220131;
                normal3 -4.82087e-07 0.965926 0.258819;
                vertex3 0.00900001 0.011758 0.023771;
@@ -1399,7 +1499,7 @@ mesh
                vertex3 0.0115 0.0107354 0.0240354;
                normal3 0 0.25882 0.965926;
                vertex3 0.0115 0.0103365 0.0245557;
-               normal3 0 -0.258821 0.965925;
+               normal3 0 -0.258821 0.965926;
                vertex3 0.0115 0.00966354 0.0245557;
                normal3 0 -0.707108 0.707106;
                vertex3 0.0115 0.00908077 0.0242192;
@@ -1407,7 +1507,7 @@ mesh
                vertex3 0.0115 0.00874431 0.0236365;
                normal3 0 -0.965926 -0.258819;
                vertex3 0.0115 0.00874431 0.0229635;
-               normal3 0 -0.707108 -0.707106;
+               normal3 0 -0.707107 -0.707106;
                vertex3 0.0115 0.00908077 0.0223808;
                normal3 0 -0.25882 -0.965926;
                vertex3 0.0115 0.00966354 0.0220443;
@@ -1440,451 +1540,688 @@ mesh
                vertex3 0.0155 0.00961177 0.0247489;
                normal3 -0.447214 -0.632456 0.632455;
                vertex3 0.0155 0.00893934 0.0243607;
-               normal3 -0.447214 -0.863951 0.231494;
+               normal3 -0.447214 -0.86395 0.231494;
                vertex3 0.0155 0.00855111 0.0236882;
-               normal3 -0.447214 -0.86395 -0.231495;
+               normal3 -0.447214 -0.86395 -0.231494;
                vertex3 0.0155 0.00855111 0.0229118;
-               normal3 -0.447214 -0.632456 -0.632455;
+               normal3 -0.447214 -0.632456 -0.632456;
                vertex3 0.0155 0.00893934 0.0222393;
                normal3 -0.447214 -0.231495 -0.86395;
                vertex3 0.0155 0.00961177 0.0218511;
                normal3 -0.447214 0.231495 -0.86395;
                vertex3 0.0155 0.0103882 0.0218511;
-               normal3 -0.447214 0.632456 -0.632455;
+               normal3 -0.447214 0.632456 -0.632456;
                vertex3 0.0155 0.0110607 0.0222393;
-               normal3 -0.447214 0.86395 -0.231495;
+               normal3 -0.447214 0.86395 -0.231494;
                vertex3 0.0155 0.0114489 0.0229118;
-               normal3 -0.447214 0.86395 0.231495;
+               normal3 -0.447214 0.86395 0.231494;
                vertex3 0.0155 0.0114489 0.0236882;
                normal3 -0.447214 0.632455 0.632456;
                vertex3 0.0155 0.0110607 0.0243607;
+               normal3 0 -1 0;
+               texcoord2 0.916667 0.5;
+               vertex3 0.00280001 -0.0135 0.0075;
+               normal3 0 1 0;
+               vertex3 0.00280001 0.0135 0.0075;
+               normal3 1 0 0;
+               vertex3 0.005 0.0135 0.0075;
+               normal3 0 -1 0;
+               vertex3 0.005 -0.0135 0.0075;
+               vertex3 0.00280001 -0.0135 0.008;
+               normal3 0 0 1;
+               vertex3 0.00280001 -0.0135 0.008;
+               normal3 0 1 0;
+               vertex3 0.00280001 0.0135 0.008;
+               normal3 0 0 1;
+               vertex3 0.00280001 0.0135 0.008;
+               normal3 1 0 0;
+               vertex3 0.005 0.0135 0.008;
+               normal3 0 0 1;
+               vertex3 0.005 0.0135 0.008;
+               normal3 0 -1 0;
+               vertex3 0.005 -0.0135 0.008;
+               normal3 0 0 1;
+               vertex3 0.005 -0.0135 0.008;
+               normal3 0 -1 0;
+               vertex3 0.0106 -0.0135 0.0075;
+               normal3 0 1 0;
+               vertex3 0.0106 0.0135 0.0075;
+               normal3 1 0 0;
+               vertex3 0.0128 0.0135 0.0075;
+               normal3 0 -1 0;
+               vertex3 0.0128 -0.0135 0.0075;
+               vertex3 0.0106 -0.0135 0.008;
+               normal3 0 0 1;
+               vertex3 0.0106 -0.0135 0.008;
+               normal3 0 1 0;
+               vertex3 0.0106 0.0135 0.008;
+               normal3 0 0 1;
+               vertex3 0.0106 0.0135 0.008;
+               normal3 1 0 0;
+               vertex3 0.0128 0.0135 0.008;
+               normal3 0 0 1;
+               vertex3 0.0128 0.0135 0.008;
+               normal3 0 -1 0;
+               vertex3 0.0128 -0.0135 0.008;
+               normal3 0 0 1;
+               vertex3 0.0128 -0.0135 0.008;
+               normal3 0 -1 0;
+               vertex3 0.0184 -0.0135 0.0075;
+               normal3 0 1 0;
+               vertex3 0.0184 0.0135 0.0075;
+               normal3 1 0 0;
+               vertex3 0.0206 0.0135 0.0075;
+               normal3 0 -1 0;
+               vertex3 0.0206 -0.0135 0.0075;
+               vertex3 0.0184 -0.0135 0.008;
+               normal3 0 0 1;
+               vertex3 0.0184 -0.0135 0.008;
+               normal3 0 1 0;
+               vertex3 0.0184 0.0135 0.008;
+               normal3 0 0 1;
+               vertex3 0.0184 0.0135 0.008;
+               normal3 1 0 0;
+               vertex3 0.0206 0.0135 0.008;
+               normal3 0 0 1;
+               vertex3 0.0206 0.0135 0.008;
+               normal3 0 -1 0;
+               vertex3 0.0206 -0.0135 0.008;
+               normal3 0 0 1;
+               vertex3 0.0206 -0.0135 0.008;
+               normal3 0 -1 0;
+               vertex3 0.0262 -0.0135 0.0075;
+               normal3 0 1 0;
+               vertex3 0.0262 0.0135 0.0075;
+               normal3 1 0 0;
+               vertex3 0.0284 0.0135 0.0075;
+               normal3 0 -1 0;
+               vertex3 0.0284 -0.0135 0.0075;
+               vertex3 0.0262 -0.0135 0.008;
+               normal3 0 0 1;
+               vertex3 0.0262 -0.0135 0.008;
+               normal3 0 1 0;
+               vertex3 0.0262 0.0135 0.008;
+               normal3 0 0 1;
+               vertex3 0.0262 0.0135 0.008;
+               normal3 1 0 0;
+               vertex3 0.0284 0.0135 0.008;
+               normal3 0 0 1;
+               vertex3 0.0284 0.0135 0.008;
+               normal3 0 -1 0;
+               vertex3 0.0284 -0.0135 0.008;
+               normal3 0 0 1;
+               vertex3 0.0284 -0.0135 0.008;
+               normal3 0 -1 0;
+               vertex3 0.034 -0.0135 0.0075;
+               normal3 0 1 0;
+               vertex3 0.034 0.0135 0.0075;
+               normal3 1 0 0;
+               vertex3 0.0362 0.0135 0.0075;
+               normal3 0 -1 0;
+               vertex3 0.0362 -0.0135 0.0075;
+               vertex3 0.034 -0.0135 0.008;
+               normal3 0 0 1;
+               vertex3 0.034 -0.0135 0.008;
+               normal3 0 1 0;
+               vertex3 0.034 0.0135 0.008;
+               normal3 0 0 1;
+               vertex3 0.034 0.0135 0.008;
+               normal3 1 0 0;
+               vertex3 0.0362 0.0135 0.008;
+               normal3 0 0 1;
+               vertex3 0.0362 0.0135 0.008;
+               normal3 0 -1 0;
+               vertex3 0.0362 -0.0135 0.008;
+               normal3 0 0 1;
+               vertex3 0.0362 -0.0135 0.008;
+               normal3 0 -1 0;
+               vertex3 0.0418 -0.0135 0.0075;
+               normal3 0 1 0;
+               vertex3 0.0418 0.0135 0.0075;
+               normal3 1 0 0;
+               vertex3 0.044 0.0135 0.0075;
+               normal3 0 -1 0;
+               vertex3 0.044 -0.0135 0.0075;
+               vertex3 0.0418 -0.0135 0.008;
+               normal3 0 0 1;
+               vertex3 0.0418 -0.0135 0.008;
+               normal3 0 1 0;
+               vertex3 0.0418 0.0135 0.008;
+               normal3 0 0 1;
+               vertex3 0.0418 0.0135 0.008;
+               normal3 1 0 0;
+               vertex3 0.044 0.0135 0.008;
+               normal3 0 0 1;
+               vertex3 0.044 0.0135 0.008;
+               normal3 0 -1 0;
+               vertex3 0.044 -0.0135 0.008;
+               normal3 0 0 1;
+               vertex3 0.044 -0.0135 0.008;
+               normal3 0 -1 0;
+               vertex3 0.0496 -0.0135 0.0075;
+               normal3 0 1 0;
+               vertex3 0.0496 0.0135 0.0075;
+               normal3 1 0 0;
+               vertex3 0.0518 0.0135 0.0075;
+               normal3 0 -1 0;
+               vertex3 0.0518 -0.0135 0.0075;
+               vertex3 0.0496 -0.0135 0.008;
+               normal3 0 0 1;
+               vertex3 0.0496 -0.0135 0.008;
+               normal3 0 1 0;
+               vertex3 0.0496 0.0135 0.008;
+               normal3 0 0 1;
+               vertex3 0.0496 0.0135 0.008;
+               normal3 1 0 0;
+               vertex3 0.0518 0.0135 0.008;
+               normal3 0 0 1;
+               vertex3 0.0518 0.0135 0.008;
+               normal3 0 -1 0;
+               vertex3 0.0518 -0.0135 0.008;
+               normal3 0 0 1;
+               vertex3 0.0518 -0.0135 0.008;
                normal3 1 -4.65661e-08 -2.53997e-07;
-               texcoord2 0.7 0.5;
+               texcoord2 0.583333 0.5;
                vertex3 0.0195 0.005 0.0203;
                normal3 1 -4.65661e-08 -4.23328e-07;
-               texcoord2 0.9 0.5;
+               texcoord2 0.75 0.5;
                vertex3 0.0195 -0.005 0.0203;
+               normal3 1 -4.65661e-08 -4.23328e-07;
                vertex3 0.0195 -0.005 0.0258;
                normal3 1 -4.65661e-08 -2.53997e-07;
-               texcoord2 0.7 0.5;
+               texcoord2 0.583333 0.5;
                vertex3 0.0195 0.005 0.0258;
                normal3 -4.65661e-07 4.65661e-08 -1;
                vertex3 0.0165 0.005 0.0203;
                normal3 -7.76102e-07 4.65662e-08 -1;
-               texcoord2 0.9 0.5;
+               texcoord2 0.75 0.5;
                vertex3 0.0165 -0.005 0.0203;
                normal3 -1 -9.31323e-08 3.38663e-07;
                vertex3 0.0165 -0.005 0.0258;
                normal3 -1 -4.65661e-08 8.46657e-08;
-               texcoord2 0.7 0.5;
+               texcoord2 0.583333 0.5;
                vertex3 0.0165 0.005 0.0258;
                normal3 -4.65661e-07 4.65661e-08 -1;
                vertex3 0.0195 0.005 0.0203;
                normal3 -7.76102e-07 4.65662e-08 -1;
-               texcoord2 0.9 0.5;
+               texcoord2 0.75 0.5;
                vertex3 0.0195 -0.005 0.0203;
                normal3 6.20882e-07 -9.31322e-08 1;
                vertex3 0.0195 -0.005 0.0258;
                normal3 1.08654e-06 -4.65661e-08 1;
-               texcoord2 0.7 0.5;
+               texcoord2 0.583333 0.5;
                vertex3 0.0195 0.005 0.0258;
                normal3 -1 -4.65661e-08 8.46657e-08;
                vertex3 0.0165 0.005 0.0203;
                normal3 -1 -9.31323e-08 3.38663e-07;
-               texcoord2 0.9 0.5;
+               texcoord2 0.75 0.5;
                vertex3 0.0165 -0.005 0.0203;
                normal3 6.20882e-07 -9.31322e-08 1;
                vertex3 0.0165 -0.005 0.0258;
                normal3 1.08654e-06 -4.65661e-08 1;
-               texcoord2 0.7 0.5;
+               texcoord2 0.583333 0.5;
                vertex3 0.0165 0.005 0.0258;
        };
        batch TRIANGLE_STRIP
        {
-               indices 5 445 4 442 76 422 414 421 440 436 438 437 439 434 441 435 411 430 73 429 6 443 7 444;
+               indices 5 501 4 498 76 422 414 421 440 436 438 437 439 434 441 435 411 430 73 429 6 499 7 500;
        };
        batch TRIANGLE_STRIP
        {
-               indices 424 442 425 443 426 427 433 432 434 431 435 430;
+               indices 8 22 9 23 10 24 11 25 12 26 13 27 20 34 21 35 14 29 15 28 16 30 17 31 18 32 19 33;
        };
        batch TRIANGLE_STRIP
        {
-               indices 422 442 423 424 420 419 436 437;
+               indices 36 50 37 51 44 58 45 59 46 60 47 61 48 62 49 63;
        };
        batch TRIANGLE_STRIP
        {
-               indices 424 425 419 418 437 433 434;
+               indices 50 36 57 42 56 43 55 41 54 40 53 39 52 38;
        };
        batch TRIANGLE_STRIP
        {
-               indices 422 423 421 420 436;
+               indices 73 6 72 66 74 67 79 70 68;
        };
        batch TRIANGLE_STRIP
        {
-               indices 427 443 428 429 431 430;
+               indices 411 73 410 72 412 74 416 79 417 78 415 77 413 75 414 76;
        };
        batch TRIANGLE_STRIP
        {
-               indices 64 4 75 76 413 414 440;
+               indices 4 76 64 75 65 77 71 78 69 79 68;
        };
        batch TRIANGLE_STRIP
        {
-               indices 65 64 77 75 415 413 438 440;
+               indices 83 84 80 85 81 86 82 87;
        };
        batch TRIANGLE_STRIP
        {
-               indices 71 65 78 77 417 415 438;
+               indices 525 527 523 533 521 531 519 529;
        };
        batch TRIANGLE_STRIP
        {
-               indices 438 439 417 416 78 79;
+               indices 535 550 542 586 124 592;
        };
        batch TRIANGLE_STRIP
        {
-               indices 441 411 410 73 72 6 66;
+               indices 535 542 536 545 546;
        };
        batch TRIANGLE_STRIP
        {
-               indices 439 441 412 410 74 72 67 66;
+               indices 552 539 540 537 549 547;
        };
        batch TRIANGLE_STRIP
        {
-               indices 439 412 416 74 79 67 70;
+               indices 552 540 119 578 130;
        };
        batch TRIANGLE_STRIP
        {
-               indices 71 78 69 79 68 70;
+               indices 561 567 562 568 109 592 582 589;
        };
        batch TRIANGLE_STRIP
        {
-               indices 8 22 9 23 10 24 11 25 12 26 13 27 20 34 21 35 14 29 15 28 16 30 17 31 18 32 19 33;
+               indices 566 560 564 559 554;
        };
        batch TRIANGLE_STRIP
        {
-               indices 63 49 62 48 61 47 60 46 59 45 58 44 51 37 50 36 57 42 56 43 55 41 54 40 53 39 52 38;
+               indices 121 120 118 119 130;
        };
        batch TRIANGLE_STRIP
        {
-               indices 83 84 80 85 81 86 82 87;
+               indices 585 584 586 589 592;
        };
        batch TRIANGLE_STRIP
        {
-               indices 469 471 467 477 465 475 463 473;
+               indices 118 130 576 564 554;
        };
        batch TRIANGLE_STRIP
        {
-               indices 490 480 489 479 486 494 124 530 536 533 526;
+               indices 133 141 149 155 153;
        };
        batch TRIANGLE_STRIP
        {
-               indices 536 526 512 109 506;
+               indices 141 133 145 144 612 613;
        };
        batch TRIANGLE_STRIP
        {
-               indices 491 493 481 484 483 496;
+               indices 618 630 594 604 134;
        };
        batch TRIANGLE_STRIP
        {
-               indices 496 484 119 522 130;
+               indices 630 618 624 147 151;
        };
        batch TRIANGLE_STRIP
        {
-               indices 121 120 118 119 130;
+               indices 139 594 135 134 136 137;
        };
        batch TRIANGLE_STRIP
        {
-               indices 118 130 520 508 498 503;
+               indices 139 135 644 636 167;
        };
        batch TRIANGLE_STRIP
        {
-               indices 152 148 153 149 155 133 141 145;
+               indices 133 608 144 163 156 164;
        };
        batch TRIANGLE_STRIP
        {
-               indices 557 556 144 145 133;
+               indices 159 165 158 164 163;
        };
        batch TRIANGLE_STRIP
        {
-               indices 133 552 144 163 156 164;
+               indices 160 161 166 644 167;
        };
        batch TRIANGLE_STRIP
        {
-               indices 164 163 165 158 159;
+               indices 175 170 174 169 173 168 172 171;
        };
        batch TRIANGLE_STRIP
        {
-               indices 147 151 562 568 574;
+               indices 681 671 683 673 685 675 679 677;
        };
        batch TRIANGLE_STRIP
        {
-               indices 562 574 538 548 134;
+               indices 228 216 229 217 230 218 231 219 232 220 233 221 234 222 235 223 236 224 237 225 238 226 239 227 228 216;
        };
        batch TRIANGLE_STRIP
        {
-               indices 137 136 134 135 538 139;
+               indices 240 726 241 727 242 728 243 729 244 730 245 731 246 732 247 733 248 734 249 735 250 736 251 737 240 726;
        };
        batch TRIANGLE_STRIP
        {
-               indices 139 135 588 580 167;
+               indices 253 738 252 739 254 740 255 741 256 742 257 743 258 744 259 745 260 746 261 747 262 748 263 749 253 738;
        };
        batch TRIANGLE_STRIP
        {
-               indices 588 167 161 166 160;
+               indices 264 751 265 750 266 752 267 753 268 754 269 755 270 756 271 757 272 758 273 759 274 760 275 761 264 751;
        };
        batch TRIANGLE_STRIP
        {
-               indices 175 170 174 169 173 168 172 171;
+               indices 277 762 276 763 278 764 279 765 280 766 281 767 282 768 283 769 284 770 285 771 286 772 287 773 277 762;
        };
        batch TRIANGLE_STRIP
        {
-               indices 625 615 627 617 629 619 623 621;
+               indices 289 775 288 774 290 776 291 777 292 778 293 779 294 780 295 781 296 782 297 783 298 784 299 785 289 775;
        };
        batch TRIANGLE_STRIP
        {
-               indices 228 216 229 217 230 218 231 219 232 220 233 221 234 222 235 223 236 224 237 225 238 226 239 227 228 216;
+               indices 300 787 301 786 312 788 311 789 310 790 309 791 302 792 303 793 304 794 305 795 306 796 307 797 300 787;
        };
        batch TRIANGLE_STRIP
        {
-               indices 240 670 241 671 242 672 243 673 244 674 245 675 246 676 247 677 248 678 249 679 250 680 251 681 240 670;
+               indices 798 799 308 809 808;
        };
        batch TRIANGLE_STRIP
        {
-               indices 253 682 252 683 254 684 255 685 256 686 257 687 258 688 259 689 260 690 261 691 262 692 263 693 253 682;
+               indices 798 308 805 804;
        };
        batch TRIANGLE_STRIP
        {
-               indices 264 695 265 694 266 696 267 697 268 698 269 699 270 700 271 701 272 702 273 703 274 704 275 705 264 695;
+               indices 804 308 803 802;
        };
        batch TRIANGLE_STRIP
        {
-               indices 277 706 276 707 278 708 279 709 280 710 281 711 282 712 283 713 284 714 285 715 286 716 287 717 277 706;
+               indices 802 308 801 800;
        };
        batch TRIANGLE_STRIP
        {
-               indices 289 719 288 718 290 720 291 721 292 722 293 723 294 724 295 725 296 726 297 727 298 728 299 729 289 719;
+               indices 800 308 806 807;
        };
        batch TRIANGLE_STRIP
        {
-               indices 300 731 301 730 312 732 311 733 310 734 309 735 302 736 303 737 304 738 305 739 306 740 307 741 300 731;
+               indices 324 313 317 314 315;
        };
        batch TRIANGLE_STRIP
        {
-               indices 742 743 308 753 752;
+               indices 324 317 325 318;
        };
        batch TRIANGLE_STRIP
        {
-               indices 742 308 749 748;
+               indices 315 316 317 323 322;
        };
        batch TRIANGLE_STRIP
        {
-               indices 752 751 308 750 744;
+               indices 322 321 317 320 319;
        };
        batch TRIANGLE_STRIP
        {
-               indices 748 308 747 746;
+               indices 814 326 821 336 820 337 810 335 811 334 812 333 813 332 819 331 818 330 817 329 816 328 815 327 814 326;
        };
        batch TRIANGLE_STRIP
        {
-               indices 746 308 745 744;
+               indices 822 338 832 348 833 349 831 347 830 346 829 345 828 344 827 343 826 342 825 341 824 340 823 339 822 338;
        };
        batch TRIANGLE_STRIP
        {
-               indices 324 313 317 314 315;
+               indices 834 350 844 361 845 360 843 359 842 358 841 357 840 356 839 355 838 354 837 353 836 352 835 351 834 350;
        };
        batch TRIANGLE_STRIP
        {
-               indices 324 317 325 318;
+               indices 846 362 857 372 856 373 855 371 854 370 853 369 852 368 851 367 850 366 849 365 848 364 847 363 846 362;
        };
        batch TRIANGLE_STRIP
        {
-               indices 315 316 317 323 322;
+               indices 858 374 868 385 869 384 867 383 866 382 865 381 864 380 863 379 862 378 861 377 860 376 859 375 858 374;
+       };
+       batch TRIANGLE_STRIP
+       {
+               indices 870 386 881 397 880 396 879 395 878 394 877 393 876 392 875 391 874 390 873 389 872 388 871 387 870 386;
        };
        batch TRIANGLE_STRIP
        {
-               indices 318 317 319 320;
+               indices 882 398 893 409 892 408 891 407 890 406 889 405 888 404 887 403 886 402 885 401 884 400 883 399 882 398;
        };
        batch TRIANGLE_STRIP
        {
-               indices 320 317 321 322;
+               indices 422 498 423 424 420 419 436 437;
+       };
+       batch TRIANGLE_STRIP
+       {
+               indices 422 423 421 420 436;
        };
        batch TRIANGLE_STRIP
        {
-               indices 758 326 765 336 764 337 754 335 755 334 756 333 757 332 763 331 762 330 761 329 760 328 759 327 758 326;
+               indices 424 425 419 418 437 433 434;
        };
        batch TRIANGLE_STRIP
        {
-               indices 766 338 776 348 777 349 775 347 774 346 773 345 772 344 771 343 770 342 769 341 768 340 767 339 766 338;
+               indices 424 498 425 499 426 427 433 432 434 431 435 430;
        };
        batch TRIANGLE_STRIP
        {
-               indices 778 350 788 361 789 360 787 359 786 358 785 357 784 356 783 355 782 354 781 353 780 352 779 351 778 350;
+               indices 431 432 428 427 499;
        };
        batch TRIANGLE_STRIP
        {
-               indices 790 362 801 372 800 373 799 371 798 370 797 369 796 368 795 367 794 366 793 365 792 364 791 363 790 362;
+               indices 430 431 429 428 499;
        };
        batch TRIANGLE_STRIP
        {
-               indices 802 374 812 385 813 384 811 383 810 382 809 381 808 380 807 379 806 378 805 377 804 376 803 375 802 374;
+               indices 439 416 438 417 415;
        };
        batch TRIANGLE_STRIP
        {
-               indices 814 386 825 397 824 396 823 395 822 394 821 393 820 392 819 391 818 390 817 389 816 388 815 387 814 386;
+               indices 416 439 412 441 410 411;
        };
        batch TRIANGLE_STRIP
        {
-               indices 826 398 837 409 836 408 835 407 834 406 833 405 832 404 831 403 830 402 829 401 828 400 827 399 826 398;
+               indices 438 415 440 413 414;
        };
        batch TRIANGLES
        {
                indices 0 3 2;
                indices 0 2 1;
-               indices 418 425 426;
-               indices 418 426 433;
-               indices 432 427 428;
-               indices 432 428 431;
-               indices 460 458 89;
-               indices 460 89 88;
-               indices 450 461 462;
-               indices 450 462 93;
-               indices 459 456 90;
-               indices 459 90 464;
-               indices 457 454 91;
-               indices 457 91 466;
-               indices 455 452 92;
-               indices 455 92 468;
-               indices 453 446 95;
-               indices 453 95 470;
-               indices 447 448 94;
-               indices 447 94 476;
-               indices 449 451 472;
-               indices 449 472 474;
+               indices 516 514 89;
+               indices 516 89 88;
+               indices 506 517 518;
+               indices 506 518 93;
+               indices 515 512 90;
+               indices 515 90 520;
+               indices 513 510 91;
+               indices 513 91 522;
+               indices 511 508 92;
+               indices 511 92 524;
+               indices 509 502 95;
+               indices 509 95 526;
+               indices 503 504 94;
+               indices 503 94 532;
+               indices 505 507 528;
+               indices 505 528 530;
                indices 98 99 96;
                indices 98 96 97;
                indices 100 105 102;
                indices 100 102 101;
-               indices 488 492 104;
-               indices 488 104 103;
-               indices 478 482 107;
-               indices 478 107 106;
-               indices 533 530 529;
-               indices 533 529 528;
-               indices 505 511 512;
-               indices 505 512 506;
-               indices 504 503 508;
-               indices 504 508 510;
+               indices 544 548 104;
+               indices 544 104 103;
+               indices 534 538 107;
+               indices 534 107 106;
                indices 113 110 111;
                indices 113 111 112;
                indices 115 114 117;
                indices 115 117 116;
-               indices 108 502 507;
-               indices 108 507 500;
-               indices 514 122 125;
-               indices 514 125 129;
-               indices 519 515 532;
-               indices 519 532 126;
-               indices 516 518 127;
-               indices 516 127 128;
-               indices 495 497 517;
-               indices 495 517 531;
-               indices 485 487 524;
-               indices 485 524 123;
-               indices 534 523 525;
-               indices 534 525 131;
-               indices 499 501 527;
-               indices 499 527 521;
-               indices 509 535 537;
-               indices 509 537 513;
-               indices 566 146 132;
-               indices 566 132 540;
-               indices 576 554 138;
-               indices 576 138 154;
-               indices 541 539 550;
-               indices 541 550 140;
-               indices 590 553 551;
-               indices 590 551 162;
-               indices 157 544 558;
-               indices 157 558 578;
-               indices 559 545 546;
-               indices 559 546 143;
-               indices 142 547 542;
-               indices 142 542 560;
-               indices 561 543 549;
-               indices 561 549 555;
-               indices 577 575 150;
-               indices 577 150 572;
-               indices 565 564 563;
-               indices 565 563 567;
-               indices 569 570 571;
-               indices 569 571 573;
-               indices 596 581 579;
-               indices 596 579 592;
-               indices 586 585 584;
-               indices 586 584 582;
-               indices 591 589 587;
-               indices 591 587 583;
-               indices 594 595 597;
-               indices 594 597 593;
-               indices 182 600 602;
-               indices 182 602 181;
-               indices 183 598 601;
-               indices 183 601 626;
-               indices 180 604 599;
-               indices 180 599 628;
-               indices 179 606 605;
-               indices 179 605 622;
-               indices 178 608 607;
-               indices 178 607 620;
-               indices 177 610 609;
-               indices 177 609 618;
-               indices 624 603 612;
-               indices 624 612 176;
-               indices 614 613 611;
-               indices 614 611 616;
+               indices 108 558 563;
+               indices 108 563 556;
+               indices 570 122 125;
+               indices 570 125 129;
+               indices 575 571 588;
+               indices 575 588 126;
+               indices 572 574 127;
+               indices 572 127 128;
+               indices 551 553 573;
+               indices 551 573 587;
+               indices 541 543 580;
+               indices 541 580 123;
+               indices 590 579 581;
+               indices 590 581 131;
+               indices 555 557 583;
+               indices 555 583 577;
+               indices 565 591 593;
+               indices 565 593 569;
+               indices 622 146 132;
+               indices 622 132 596;
+               indices 632 610 138;
+               indices 632 138 154;
+               indices 597 595 606;
+               indices 597 606 140;
+               indices 646 609 607;
+               indices 646 607 162;
+               indices 157 600 614;
+               indices 157 614 634;
+               indices 615 601 602;
+               indices 615 602 143;
+               indices 142 603 598;
+               indices 142 598 616;
+               indices 617 599 605;
+               indices 617 605 611;
+               indices 152 148 149;
+               indices 152 149 153;
+               indices 633 631 150;
+               indices 633 150 628;
+               indices 621 620 619;
+               indices 621 619 623;
+               indices 625 626 627;
+               indices 625 627 629;
+               indices 652 637 635;
+               indices 652 635 648;
+               indices 642 641 640;
+               indices 642 640 638;
+               indices 647 645 643;
+               indices 647 643 639;
+               indices 650 651 653;
+               indices 650 653 649;
+               indices 182 656 658;
+               indices 182 658 181;
+               indices 183 654 657;
+               indices 183 657 682;
+               indices 180 660 655;
+               indices 180 655 684;
+               indices 179 662 661;
+               indices 179 661 678;
+               indices 178 664 663;
+               indices 178 663 676;
+               indices 177 666 665;
+               indices 177 665 674;
+               indices 680 659 668;
+               indices 680 668 176;
+               indices 670 669 667;
+               indices 670 667 672;
                indices 186 187 184;
                indices 186 184 185;
                indices 188 191 190;
                indices 188 190 189;
-               indices 630 195 192;
-               indices 630 192 632;
-               indices 841 194 193;
-               indices 841 193 838;
-               indices 840 638 640;
-               indices 840 640 839;
-               indices 633 646 196;
-               indices 633 196 634;
-               indices 846 647 197;
-               indices 846 197 842;
-               indices 847 641 642;
-               indices 847 642 843;
-               indices 635 650 199;
-               indices 635 199 636;
-               indices 850 651 198;
-               indices 850 198 845;
-               indices 851 643 644;
-               indices 851 644 844;
-               indices 637 653 649;
-               indices 637 649 631;
-               indices 853 652 648;
-               indices 853 648 849;
-               indices 852 645 639;
-               indices 852 639 848;
+               indices 686 195 192;
+               indices 686 192 688;
+               indices 981 194 193;
+               indices 981 193 978;
+               indices 980 694 696;
+               indices 980 696 979;
+               indices 689 702 196;
+               indices 689 196 690;
+               indices 986 703 197;
+               indices 986 197 982;
+               indices 987 697 698;
+               indices 987 698 983;
+               indices 691 706 199;
+               indices 691 199 692;
+               indices 990 707 198;
+               indices 990 198 985;
+               indices 991 699 700;
+               indices 991 700 984;
+               indices 693 709 705;
+               indices 693 705 687;
+               indices 993 708 704;
+               indices 993 704 989;
+               indices 992 701 695;
+               indices 992 695 988;
                indices 200 204 205;
                indices 200 205 201;
-               indices 655 659 206;
-               indices 655 206 202;
-               indices 656 660 207;
-               indices 656 207 203;
-               indices 657 661 658;
-               indices 657 658 654;
+               indices 711 715 206;
+               indices 711 206 202;
+               indices 712 716 207;
+               indices 712 207 203;
+               indices 713 717 714;
+               indices 713 714 710;
                indices 212 208 211;
                indices 212 211 215;
-               indices 213 209 662;
-               indices 213 662 666;
-               indices 214 210 663;
-               indices 214 663 667;
-               indices 669 665 664;
-               indices 669 664 668;
+               indices 213 209 718;
+               indices 213 718 722;
+               indices 214 210 719;
+               indices 214 719 723;
+               indices 725 721 720;
+               indices 725 720 724;
+               indices 807 308 808;
+               indices 318 317 319;
+               indices 418 425 426;
+               indices 418 426 433;
+               indices 446 447 443;
+               indices 446 443 442;
+               indices 900 448 444;
+               indices 900 444 895;
+               indices 902 449 445;
+               indices 902 445 896;
+               indices 904 898 894;
+               indices 904 894 897;
+               indices 905 903 901;
+               indices 905 901 899;
+               indices 454 455 451;
+               indices 454 451 450;
+               indices 912 456 452;
+               indices 912 452 907;
+               indices 914 457 453;
+               indices 914 453 908;
+               indices 916 910 906;
+               indices 916 906 909;
+               indices 917 915 913;
+               indices 917 913 911;
+               indices 462 463 459;
+               indices 462 459 458;
+               indices 924 464 460;
+               indices 924 460 919;
+               indices 926 465 461;
+               indices 926 461 920;
+               indices 928 922 918;
+               indices 928 918 921;
+               indices 929 927 925;
+               indices 929 925 923;
+               indices 470 471 467;
+               indices 470 467 466;
+               indices 936 472 468;
+               indices 936 468 931;
+               indices 938 473 469;
+               indices 938 469 932;
+               indices 940 934 930;
+               indices 940 930 933;
+               indices 941 939 937;
+               indices 941 937 935;
+               indices 478 479 475;
+               indices 478 475 474;
+               indices 948 480 476;
+               indices 948 476 943;
+               indices 950 481 477;
+               indices 950 477 944;
+               indices 952 946 942;
+               indices 952 942 945;
+               indices 953 951 949;
+               indices 953 949 947;
+               indices 486 487 483;
+               indices 486 483 482;
+               indices 960 488 484;
+               indices 960 484 955;
+               indices 962 489 485;
+               indices 962 485 956;
+               indices 964 958 954;
+               indices 964 954 957;
+               indices 965 963 961;
+               indices 965 961 959;
+               indices 494 495 491;
+               indices 494 491 490;
+               indices 972 496 492;
+               indices 972 492 967;
+               indices 974 497 493;
+               indices 974 493 968;
+               indices 976 970 966;
+               indices 976 966 969;
+               indices 977 975 973;
+               indices 977 973 971;
        };
 };
 technique
@@ -1901,8 +2238,8 @@ technique
                        {
                                min_filter NEAREST;
                                mag_filter NEAREST;
-                               storage RGB 5 1;
-                               raw_data "\x3F\x3F\x3F\xB2\xB2\xB2\x33\x33\x33\xB2\x00\x00\xFF\xFF\xFF";
+                               storage RGB 6 1;
+                               raw_data "\x3F\x3F\x3F\xB2\xB2\xB2\x33\x33\x33\xB2\x00\x00\xFF\xFF\xFF\x67\x47\x33";
                        };
                };
        };
index a1004ecfdcec46a2905713bdecf96a323e0efadf..14321329773aa388c4cb5c98cd178746f6c8ba13 100644 (file)
@@ -9,10 +9,10 @@ pass ""
        {
                texture2d
                {
-                       storage RGB 2 1;
+                       storage RGB 3 1;
                        min_filter NEAREST;
                        mag_filter NEAREST;
-                       raw_data "\x3F\x3F\x3F\xB2\xB2\xB2";
+                       raw_data "\x3F\x3F\x3F\xB2\xB2\xB2\x67\x47\x33";
                };
        };
 };
index bf31f71f27fea389bc16538d3ab1025965d3902e..3f8fc6aff7beccaeb5904cf364aaf18c7fd6c73c 100644 (file)
Binary files a/gfx.blend and b/gfx.blend differ
index d664c3948ef7a1c9bf54998a4abe661c45b2568e..aad2ca898d1bc5ca9126ad5474a0c3bd3f2a52c6 100644 (file)
@@ -29,6 +29,11 @@ TrackType3D::TrackType3D(Catalogue3D &c, const TrackType &tt):
        const Vector &rail_max = rail_profile.get_max_coords();
        float rail_h = rail_max.y-rail_min.y;
 
+       const Profile &tie_profile = appearance.get_tie_profile();
+       const Vector &tie_min = tie_profile.get_min_coords();
+       const Vector &tie_max = tie_profile.get_max_coords();
+       float tie_h = tie_max.y-tie_min.y;
+
        float gauge = cat.get_gauge();
 
        string obj_name = tt.get_object();
@@ -41,12 +46,17 @@ TrackType3D::TrackType3D(Catalogue3D &c, const TrackType &tt):
                GL::MeshBuilder bld(*mesh);
 
                unsigned index = 0;
-               bld.texcoord(0.25, 0.5);
+               bld.texcoord(0.17, 0.5);
+               for(vector<TrackPart>::const_iterator i=parts.begin(); i!=parts.end(); ++i)
+                       build_part(*i, ballast_profile, Vector(0, 0, -ballast_min.y), false, bld, index);
+
+               float y = ballast_h-tie_min.y;
+               bld.texcoord(0.83, 0.5);
                for(vector<TrackPart>::const_iterator i=parts.begin(); i!=parts.end(); ++i)
-                       build_part(*i, ballast_profile, Vector(0, -ballast_min.y, 0), false, bld, index);
+                       build_ties(*i, tie_profile, appearance.get_tie_length(), appearance.get_tie_spacing(), Vector(0, 0, y), bld, index);
 
-               bld.texcoord(0.75, 0.5);
-               float y = ballast_h-rail_min.y;
+               bld.texcoord(0.5, 0.5);
+               y = ballast_h+tie_h-rail_min.y;
                for(vector<TrackPart>::const_iterator i=parts.begin(); i!=parts.end(); ++i)
                        build_part(*i, rail_profile, Vector(0, gauge/2, y), true, bld, index);
                for(vector<TrackPart>::const_iterator i=parts.begin(); i!=parts.end(); ++i)
@@ -158,4 +168,84 @@ void TrackType3D::build_part(const TrackPart &part, const Profile &profile, cons
        base_index += (nsegs+1)*n_vertices;
 }
 
+void TrackType3D::build_ties(const TrackPart &part, const Profile &profile, float length, float spacing, const Vector &offset, GL::MeshBuilder &bld, unsigned &base_index)
+{
+       float plen = part.get_length();
+       unsigned count = plen/spacing+0.5;
+       (void)length;
+       (void)offset;
+       (void)profile;
+
+       unsigned n_vertices = profile.get_n_vertices();
+       float min_y = profile.get_min_coords().y;
+       vector<Vector> cap_vertices;
+       for(unsigned i=0; i+1<n_vertices; )
+       {
+               const Profile::Vertex &v = profile.get_vertex(i);
+               if(cap_vertices.size()>=2)
+               {
+                       if(i+2<n_vertices)
+                               cap_vertices.push_back(Vector(v.pos.x, min_y, 0));
+                       else
+                               cap_vertices.push_back(profile.get_vertex(n_vertices-1).pos);
+               }
+               cap_vertices.push_back(v.pos);
+
+               ++i;
+               if(!profile.get_vertex(i).smooth)
+                       ++i;
+       }
+
+       for(unsigned i=0; i<count; ++i)
+       {
+               OrientedPoint basep = part.get_point((i+0.5)*plen/count);
+               Transform trans = Transform::rotation(basep.rotation, Vector(0, 0, 1));
+
+               unsigned strip = 0;
+               for(unsigned j=0; j<n_vertices; ++j)
+               {
+                       const Profile::Vertex &v = profile.get_vertex(j);
+
+                       Vector n = trans.transform(Vector(0, -v.normal.x, v.normal.y));
+                       bld.normal(n.x, n.y, n.z);
+
+                       if(!strip)
+                               bld.begin(GL::TRIANGLE_STRIP);
+
+                       for(unsigned k=0; k<2; ++k)
+                       {
+                               Vector p((k-0.5)*length, -v.pos.x, v.pos.y);
+                               p = basep.position+trans.transform(offset+p);
+                               bld.vertex(p.x, p.y, p.z);
+                       }
+
+                       if(++strip>=2 && !profile.get_vertex(j).smooth)
+                       {
+                               bld.end();
+                               strip = 0;
+                       }
+               }
+               if(strip)
+                       bld.end();
+
+               for(unsigned j=0; j<2; ++j)
+               {
+                       Vector n = trans.transform(Vector(j*2.0-1, 0, 0));
+                       bld.normal(n.x, n.y, n.z);
+
+                       bld.begin(GL::TRIANGLE_STRIP);
+                       for(unsigned k=0; k<cap_vertices.size(); ++k)
+                       {
+                               const Vector &v = cap_vertices[k^j];
+                               Vector p((j-0.5)*length, -v.x, v.y);
+                               p = basep.position+trans.transform(offset+p);
+                               bld.vertex(p.x, p.y, p.z);
+                       }
+                       bld.end();
+               }
+
+               base_index += 2*(n_vertices+cap_vertices.size());
+       }
+}
+
 } // namespace R2C2
index 6cde93eb13b41f6501a0eeb3b1c0edf1a66a9d67..3923ab1ac35f28d2835c04b8ed7189d597023875 100644 (file)
@@ -28,6 +28,7 @@ public:
 
 private:
        void build_part(const TrackPart &, const Profile &, const Vector &, bool, Msp::GL::MeshBuilder &, unsigned &);
+       void build_ties(const TrackPart &, const Profile &, float, float, const Vector &, Msp::GL::MeshBuilder &, unsigned &);
 };
 
 } // namespace R2C2
index b97d69668a3ecd9e61a6f2d4907c11a55db281b4..b5d8b354082c7d5b022bdd99dbb16428fa91d327 100644 (file)
@@ -5,6 +5,11 @@ using namespace Msp;
 
 namespace R2C2 {
 
+TrackAppearance::TrackAppearance():
+       tie_length(0),
+       tie_spacing(1)
+{ }
+
 float TrackAppearance::get_rail_elevation() const
 {
        return ballast_profile.get_height()+rail_profile.get_height();
@@ -17,6 +22,9 @@ TrackAppearance::Loader::Loader(TrackAppearance &a):
        add("ballast_profile", &Loader::ballast_profile);
        add("rail_profile", &Loader::rail_profile);
        add("technique", &TrackAppearance::technique);
+       add("tie_length", &Loader::tie_length);
+       add("tie_profile", &Loader::tie_profile);
+       add("tie_spacing", &Loader::tie_spacing);
 }
 
 void TrackAppearance::Loader::ballast_profile()
@@ -29,4 +37,19 @@ void TrackAppearance::Loader::rail_profile()
        load_sub(obj.rail_profile);
 }
 
+void TrackAppearance::Loader::tie_length(float l)
+{
+       obj.tie_length = l/1000;
+}
+
+void TrackAppearance::Loader::tie_profile()
+{
+       load_sub(obj.tie_profile);
+}
+
+void TrackAppearance::Loader::tie_spacing(float s)
+{
+       obj.tie_spacing = s/1000;
+}
+
 } // namespace R2C2
index 8a18cd4e74850c18e73a834f3305b4b631441943..a108ec0e011de0f449331c84c55d9d461e566a46 100644 (file)
@@ -18,17 +18,28 @@ public:
        private:
                void ballast_profile();
                void rail_profile();
+               void tie_length(float);
+               void tie_profile();
+               void tie_spacing(float);
        };
 
 private:
        Profile rail_profile;
        Profile ballast_profile;
+       Profile tie_profile;
+       float tie_length;
+       float tie_spacing;
        std::string technique;
 
 public:
+       TrackAppearance();
+
        float get_rail_elevation() const;
        const Profile &get_rail_profile() const { return rail_profile; }
        const Profile &get_ballast_profile() const { return ballast_profile; }
+       const Profile &get_tie_profile() const { return tie_profile; }
+       float get_tie_length() const { return tie_length; }
+       float get_tie_spacing() const { return tie_spacing; }
        const std::string &get_technique() const { return technique; }
 };
 
index 40cf1cae7d1f6a9ac14e486afd50212f9a26fbc9..a7b09e5d1f204a2e2f8d137fefcd0df7979e0d08 100644 (file)
@@ -23,10 +23,19 @@ track_appearance
        ballast_profile
        {
                point 20.0 0.0;
-               point 14.0 8.0;
-               point -14.0 8.0;
+               point 14.0 7.5;
+               point -14.0 7.5;
                point -20.0 0.0;
        };
+       tie_profile
+       {
+               point 13.5 0.0;
+               point 13.5 0.5;
+               point -13.5 0.5;
+               point -13.5 0.0;
+       };
+       tie_length 2.2;
+       tie_spacing 7.8;
 
        technique "track.technique";
 };