# HG changeset patch # User Shinji KONO # Date 1293278699 -32400 # Node ID 00ef8386edd67c9caea55f75e584421340881b96 # Parent 606bdb2f721d24cd5cad5f5baf353661c46df166 scale_matrix does not work diff -r 606bdb2f721d -r 00ef8386edd6 Dandy.cc --- a/Dandy.cc Sat Dec 25 18:52:11 2010 +0900 +++ b/Dandy.cc Sat Dec 25 21:04:59 2010 +0900 @@ -565,17 +565,20 @@ return; } SceneGraphPtr object = sgroot->createSceneGraph(name); - object->xyz[0] = x; // - object->c_xyz[0] * my_scale; - object->xyz[1] = y; // - object->c_xyz[1] * my_scale; - object->xyz[2] = zorder * 0.01; //object->c_xyz[0] = m->mx; //object->c_xyz[1] = m->my; root->addChild(object); - float scale[] = {my_scale,my_scale,1}; + object->xyz[0] = x - object->c_xyz[0]*my_scale; + object->xyz[1] = y - object->c_xyz[1]*my_scale; + object->xyz[2] = zorder * 0.01; + /*親の回転、座標から、子の回転、座標を算出*/ - scale_matrix(object->matrix, root->matrix, scale, object->c_xyz); - get_matrix(object->matrix, object->angle, object->xyz, object->matrix); + get_matrix(object->matrix, object->angle, object->xyz, root->matrix); + + float scale[] = {my_scale,my_scale,1}; + float c_xyz[] = {0,0,0}; + //scale_matrix(object->matrix, object->matrix, scale, c_xyz); /*法線用の行列。Cameraの行列を抜いている(Cameraのコンストラクタで、単位行列にしている)*/ get_matrix(object->real_matrix, object->angle, object->xyz, root->real_matrix); } @@ -595,18 +598,20 @@ return; } SceneGraphPtr object = sgroot->createSceneGraph(name); - object->xyz[0] = x ; // - object->c_xyz[0] * my_scale*scalex; - object->xyz[1] = y ; // - object->c_xyz[1] * my_scale*scaley; + root->addChild(object); + + float scale[] = {my_scale*scalex*4,my_scale*scaley*4,1}; + + /*親の回転、座標から、子の回転、座標を算出*/ + object->xyz[0] = x - object->c_xyz[0] * my_scale - m->w*my_scale; + object->xyz[1] = y - object->c_xyz[1] * my_scale - m->h*my_scale; object->xyz[2] = number * 0.01; //object->c_xyz[0] = m->mx; //object->c_xyz[1] = m->my; object->angle[3] = angle * (3.1415926*2/4096); - root->addChild(object); - - float scale[] = {my_scale*scalex*4,my_scale*scaley*4,1}; - /*親の回転、座標から、子の回転、座標を算出*/ - scale_matrix(object->matrix, root->matrix, scale, object->c_xyz); - get_matrix(object->matrix, object->angle, object->xyz, object->matrix); + get_matrix(object->matrix, object->angle, object->xyz, root->matrix); + float c_xyz[] = {0,0,0}; + //scale_matrix(object->matrix, object->matrix, scale, c_xyz); /*法線用の行列。Cameraの行列を抜いている(Cameraのコンストラクタで、単位行列にしている)*/ get_matrix(object->real_matrix, object->angle, object->xyz, root->real_matrix); } diff -r 606bdb2f721d -r 00ef8386edd6 xml/boss.xml --- a/xml/boss.xml Sat Dec 25 18:52:11 2010 +0900 +++ b/xml/boss.xml Sat Dec 25 21:04:59 2010 +0900 @@ -18,7 +18,7 @@ 0.000000, -0.000000, 1.000000 - 0.595254, 75.128860, 0.000000 + -7.404748, 67.128860, 0.0 1.000000, 1.000000 @@ -913,7 +913,7 @@ 0.000000, -0.000000, 1.000000 - 37.538410, 31.161304, 0.000000 + 5.538410, -0.838699, 0.0 1.000000, 1.000000 @@ -14743,7 +14743,7 @@ 0.000000, -0.000000, 1.000000 - 53.626900, -17.349754, 0.000000 + 49.626900, -21.349754, 0.0 1.000000, 1.000000 @@ -14991,7 +14991,7 @@ 0.000000, -0.000000, 1.000000 - 36.543549, -45.672157, 0.000000 + 20.543547, -61.672161, 0.0 1.000000, 1.000000 @@ -18473,7 +18473,7 @@ 0.000000, -0.000000, 1.000000 - 72.058945, -45.222591, 0.000000 + 56.058945, -61.222591, 0.0 1.000000, 1.000000 @@ -21955,7 +21955,7 @@ 0.000000, -0.000000, 1.000000 - 74.756302, -75.792801, 0.000000 + 58.756298, -83.792803, 0.0 0.999771, 1.002503 @@ -23712,7 +23712,7 @@ 0.000000, -0.000000, 1.000000 - 20.359322, -17.349751, 0.000000 + 16.359322, -21.349751, 0.0 1.000000, 1.000000 @@ -23960,7 +23960,7 @@ 0.000000, -0.000000, 1.000000 - 12.716766, -46.571278, 0.000000 + 8.716766, -62.571281, 0.0 1.005023, 0.975803 @@ -24855,7 +24855,7 @@ 0.000000, -0.000000, 1.000000 - -18.136494, 47.551571, 0.000000 + -26.136494, 31.551567, 0.0 0.998298, 0.981678 @@ -26612,7 +26612,7 @@ 0.000000, -0.000000, 1.000000 - -48.055252, 14.250693, 0.000000 + -64.055252, -1.749310, 0.0 1.000000, 1.000000 @@ -30094,7 +30094,7 @@ 0.000000, -0.000000, 1.000000 - -39.432419, -17.349754, 0.000000 + -47.432419, -21.349755, 0.0 1.002917, 0.986224 @@ -30558,7 +30558,7 @@ 0.000000, -0.000000, 1.000000 - -43.478470, -35.332233, 0.000000 + -47.478470, -39.332234, 0.0 1.000000, 1.000000 @@ -30806,7 +30806,7 @@ 0.000000, -0.000000, 1.000000 - -26.395111, -62.755508, 0.000000 + -34.395111, -66.755508, 0.0 0.999773, 0.997958 @@ -31270,7 +31270,7 @@ 0.000000, -0.000000, 1.000000 - -64.158318, -17.349754, 0.000000 + -72.158318, -21.349755, 0.0 1.003654, 1.007062 @@ -31734,7 +31734,7 @@ 0.000000, -0.000000, 1.000000 - -55.616638, -35.332233, 0.000000 + -59.616638, -39.332233, 0.0 1.000000, 1.000000 @@ -31982,7 +31982,7 @@ 0.000000, -0.000000, 1.000000 - -76.296494, -35.781792, 0.000000 + -80.296494, -39.781793, 0.0 1.000000, 1.000000 @@ -32230,7 +32230,7 @@ 0.000000, -0.000000, 1.000000 - -55.167068, -63.205067, 0.000000 + -71.167068, -71.205070, 0.0 1.000591, 1.009831 @@ -33987,7 +33987,7 @@ 0.000000, -0.000000, 1.000000 - -89.783340, -64.553749, 0.000000 + -105.783340, -80.553753, 0.0 1.000000, 1.000000 @@ -37469,7 +37469,7 @@ 0.000000, -0.000000, 1.000000 - -12.412910, 14.250696, 0.000000 + -28.412910, -1.749308, 0.0 1.000000, 1.000000 @@ -40951,7 +40951,7 @@ 0.000000, -0.000000, 1.000000 - -1.219650, -21.845375, 0.000000 + -9.219651, -37.845377, 0.0 0.993386, 0.974990 @@ -42708,7 +42708,7 @@ 0.000000, -0.000000, 1.000000 - -20.550812, -17.349754, 0.000000 + -28.550813, -21.349755, 0.0 0.991994, 1.002459 @@ -43172,7 +43172,7 @@ 0.000000, -0.000000, 1.000000 - -25.945549, -34.882675, 0.000000 + -29.945550, -38.882676, 0.0 1.000000, 1.000000 @@ -43420,7 +43420,7 @@ 0.000000, -0.000000, 1.000000 - -3.017891, -63.205070, 0.000000 + -11.017891, -79.205070, 0.0 1.001172, 0.977004 diff -r 606bdb2f721d -r 00ef8386edd6 xml/character.xml --- a/xml/character.xml Sat Dec 25 18:52:11 2010 +0900 +++ b/xml/character.xml Sat Dec 25 21:04:59 2010 +0900 @@ -18,7 +18,7 @@ 0.000000, 0.000000, 1.000000 - 6.964191, 35.893311, 0.000000 + -1.035810, 27.893310, 0.0 0.000000, 1.000000 @@ -913,7 +913,7 @@ 0.000000, 0.000000, 1.000000 - 30.892752, -2.251932, 0.000000 + 22.892752, -10.251932, 0.0 0.000000, 1.000000 @@ -1808,7 +1808,7 @@ 0.000000, 0.000000, 1.000000 - 22.619287, -26.047773, 0.000000 + 14.619287, -34.047773, 0.0 0.000000, 1.000000 @@ -2703,7 +2703,7 @@ 0.000000, 0.000000, 1.000000 - 35.739311, -51.382996, 0.000000 + 27.739311, -59.382996, 0.0 0.000000, 1.000000 @@ -3598,7 +3598,7 @@ 0.000000, 0.000000, 1.000000 - 66.955933, -87.123772, 0.000000 + 50.955929, -103.123774, 0.0 0.000000, 1.000000 @@ -7080,7 +7080,7 @@ 0.000000, 0.000000, 1.000000 - 14.475819, -51.382988, 0.000000 + 6.475819, -59.382988, 0.0 0.000000, 1.000000 @@ -7975,7 +7975,7 @@ 0.000000, 0.000000, 1.000000 - 21.714455, -83.052032, 0.000000 + 13.714453, -91.052033, 0.0 0.000000, 1.000000 @@ -8870,7 +8870,7 @@ 0.000000, 0.000000, 1.000000 - -6.787680, -81.242371, 0.000000 + -10.787680, -89.242371, 0.0 0.000000, 1.000000 @@ -9334,7 +9334,7 @@ 0.000000, 0.000000, 1.000000 - 58.812469, -26.952602, 0.000000 + 50.812468, -34.952603, 0.0 0.000000, 1.000000 @@ -10229,7 +10229,7 @@ 0.000000, 0.000000, 1.000000 - 75.551811, -50.478168, 0.000000 + 71.551809, -54.478169, 0.0 0.000000, 1.000000 @@ -10477,7 +10477,7 @@ 0.000000, 0.000000, 1.000000 - 56.097977, -57.264389, 0.000000 + 48.097975, -65.264390, 0.0 0.000000, 1.000000 @@ -11372,7 +11372,7 @@ 0.000000, 0.000000, 1.000000 - -20.381956, 9.948341, 0.000000 + -28.381956, 1.948341, 0.0 0.000000, 1.000000 @@ -12267,7 +12267,7 @@ 0.000000, 0.000000, 1.000000 - -8.497770, -28.275295, 0.000000 + -16.497772, -36.275296, 0.0 0.000000, 1.000000 @@ -13162,7 +13162,7 @@ 0.000000, 0.000000, 1.000000 - -40.440495, -24.609734, 0.000000 + -48.440496, -32.609735, 0.0 0.000000, 1.000000 diff -r 606bdb2f721d -r 00ef8386edd6 xml/effect.xml --- a/xml/effect.xml Sat Dec 25 18:52:11 2010 +0900 +++ b/xml/effect.xml Sat Dec 25 21:04:59 2010 +0900 @@ -18,7 +18,7 @@ 0.000000, -0.000000, 1.000000 - 0.000000, 0.000000, 0.000000 + -8.000002, -8.000001, 0.0 0.000000, 1.000000 @@ -913,7 +913,7 @@ 0.000000, -0.000000, 1.000000 - -24.562885, -16.056257, 0.000000 + -27.562885, -24.056257, 0.0 0.964126, 0.982399 @@ -1251,7 +1251,7 @@ 0.000000, -0.000000, 1.000000 - -44.111885, -34.319260, 0.000000 + -52.111885, -42.319260, 0.0 1.003968, 0.996063 @@ -2130,7 +2130,7 @@ 0.000000, -0.000000, 1.000000 - -45.834694, -56.640774, 0.000000 + -52.834696, -62.640775, 0.0 0.976712, 0.981441 @@ -2718,7 +2718,7 @@ 0.000000, -0.000000, 1.000000 - -45.506138, -75.907410, 0.000000 + -53.506140, -82.907411, 0.0 0.976993, 0.980342 @@ -3584,7 +3584,7 @@ 0.000000, -0.000000, 1.000000 - -69.095612, -57.815559, 0.000000 + -77.095613, -65.815560, 0.0 0.978033, 0.984547 @@ -4466,7 +4466,7 @@ 0.000000, -0.000000, 1.000000 - -67.920822, -34.084717, 0.000000 + -75.920824, -42.084718, 0.0 1.000000, 1.000000 @@ -5361,7 +5361,7 @@ 0.000000, -0.000000, 1.000000 - -90.241913, -39.018852, 0.000000 + -98.241915, -55.018854, 0.0 0.986216, 0.989225 @@ -7118,7 +7118,7 @@ 0.000000, -0.000000, 1.000000 - -105.936447, -47.384205, 0.000000 + -109.936448, -51.384205, 0.0 0.000000, 1.000000 @@ -7366,7 +7366,7 @@ 0.000000, -0.000000, 1.000000 - -117.214043, -58.051426, 0.000000 + -121.214044, -62.051426, 0.0 0.000000, 1.000000 @@ -7614,7 +7614,7 @@ 0.000000, -0.000000, 1.000000 - -117.449249, -45.410816, 0.000000 + -121.449250, -49.410817, 0.0 0.000000, 1.000000 @@ -7862,7 +7862,7 @@ 0.000000, -0.000000, 1.000000 - -106.923462, -31.078304, 0.000000 + -110.923463, -35.078305, 0.0 0.000000, 1.000000 @@ -8110,7 +8110,7 @@ 0.000000, -0.000000, 1.000000 - -117.214546, -34.085960, 0.000000 + -121.214547, -38.085961, 0.0 0.000000, 1.000000 @@ -8358,7 +8358,7 @@ 0.000000, -0.000000, 1.000000 - -116.415199, -19.565544, 0.000000 + -120.415200, -23.565545, 0.0 0.000000, 1.000000 @@ -8606,7 +8606,7 @@ 0.000000, -0.000000, 1.000000 - -127.129387, -21.398666, 0.000000 + -131.129388, -25.398667, 0.0 0.000000, 1.000000 @@ -8854,7 +8854,7 @@ 0.000000, -0.000000, 1.000000 - -127.505554, -9.556915, 0.000000 + -131.505555, -13.556916, 0.0 0.000000, 1.000000 @@ -9102,7 +9102,7 @@ 0.000000, -0.000000, 1.000000 - -21.594820, -34.906662, 0.000000 + -29.594820, -42.906664, 0.0 0.979839, 1.021008 @@ -9911,7 +9911,7 @@ 0.000000, -0.000000, 1.000000 - -0.252673, -56.170845, 0.000000 + -8.252675, -63.170846, 0.0 0.979095, 0.995641 @@ -10795,7 +10795,7 @@ 0.000000, -0.000000, 1.000000 - 24.293804, -84.061172, 0.000000 + 16.293802, -92.061173, 0.0 0.000000, 1.000000 @@ -11690,7 +11690,7 @@ 0.000000, -0.000000, 1.000000 - 40.003044, -75.805832, 0.000000 + 38.003044, -77.805832, 0.0 0.000000, 1.000000 @@ -11776,7 +11776,7 @@ 0.000000, -0.000000, 1.000000 - 46.879910, -71.913864, 0.000000 + 44.879909, -73.913864, 0.0 0.000000, 1.000000 @@ -11862,7 +11862,7 @@ 0.000000, -0.000000, 1.000000 - 47.068134, -79.338463, 0.000000 + 45.068134, -81.338463, 0.0 0.000000, 1.000000 @@ -11908,7 +11908,7 @@ 0.000000, -0.000000, 1.000000 - 54.444199, -76.096016, 0.000000 + 52.444198, -78.096016, 0.0 0.000000, 1.000000 @@ -11994,7 +11994,7 @@ 0.000000, -0.000000, 1.000000 - 54.632713, -83.003700, 0.000000 + 52.632713, -85.003700, 0.0 0.000000, 1.000000 @@ -12040,7 +12040,7 @@ 0.000000, -0.000000, 1.000000 - 39.360870, -94.093628, 0.000000 + 37.360870, -96.093628, 0.0 0.000000, 1.000000 @@ -12086,7 +12086,7 @@ 0.000000, -0.000000, 1.000000 - 46.785698, -90.804260, 0.000000 + 44.785697, -92.804260, 0.0 0.000000, 1.000000 @@ -12172,7 +12172,7 @@ 0.000000, -0.000000, 1.000000 - 46.785046, -97.805893, 0.000000 + 44.785045, -99.805893, 0.0 0.000000, 1.000000 @@ -12218,7 +12218,7 @@ 0.000000, -0.000000, 1.000000 - 54.108463, -101.755516, 0.000000 + 52.108463, -103.755516, 0.0 0.000000, 1.000000 @@ -12304,7 +12304,7 @@ 0.000000, -0.000000, 1.000000 - 4.228561, -77.943993, 0.000000 + -3.771441, -85.943994, 0.0 0.000000, 1.000000 @@ -13251,7 +13251,7 @@ 0.000000, -0.000000, 1.000000 - 8.065624, -95.173813, 0.000000 + 4.065623, -99.173813, 0.0 0.000000, 1.000000 @@ -13499,7 +13499,7 @@ 0.000000, -0.000000, 1.000000 - 17.268419, -105.363358, 0.000000 + 13.268418, -109.363358, 0.0 0.000000, 1.000000 @@ -13747,7 +13747,7 @@ 0.000000, -0.000000, 1.000000 - 5.692167, -105.238060, 0.000000 + 1.692166, -109.238060, 0.0 0.000000, 1.000000 @@ -13995,7 +13995,7 @@ 0.000000, -0.000000, 1.000000 - -5.060914, -94.852745, 0.000000 + -9.060915, -98.852746, 0.0 0.000000, 1.000000 @@ -14243,7 +14243,7 @@ 0.000000, -0.000000, 1.000000 - -4.785686, -104.666344, 0.000000 + -8.785687, -108.666344, 0.0 0.000000, 1.000000 @@ -14491,7 +14491,7 @@ 0.000000, -0.000000, 1.000000 - 2.097625, -115.709343, 0.000000 + -1.902375, -119.709343, 0.0 1.000000, 1.000000 @@ -14739,7 +14739,7 @@ 0.000000, -0.000000, 1.000000 - -15.751022, -105.167564, 0.000000 + -19.751023, -109.167565, 0.0 0.000000, 1.000000 @@ -14987,7 +14987,7 @@ 0.000000, -0.000000, 1.000000 - -10.917969, -114.761330, 0.000000 + -14.917970, -118.761330, 0.0 0.000000, 1.000000 @@ -15235,7 +15235,7 @@ 0.000000, -0.000000, 1.000000 - -22.008240, -115.019768, 0.000000 + -26.008241, -119.019768, 0.0 0.000000, 1.000000 @@ -15483,7 +15483,7 @@ 0.000000, -0.000000, 1.000000 - -20.302389, -55.504967, 0.000000 + -28.302391, -63.504968, 0.0 0.978388, 1.014639 @@ -16295,7 +16295,7 @@ 0.000000, -0.000000, 1.000000 - -14.052355, -78.570099, 0.000000 + -21.052357, -85.570099, 0.0 0.981191, 0.989433 @@ -16929,7 +16929,7 @@ 0.000000, -0.000000, 1.000000 - -28.052811, -77.812714, 0.000000 + -32.052812, -85.812715, 0.0 0.966664, 1.009859 @@ -17372,7 +17372,7 @@ 0.000000, -0.000000, 1.000000 - 3.508984, -16.906919, 0.000000 + 0.508983, -24.906920, 0.0 0.069341, 0.989672 @@ -17665,7 +17665,7 @@ 0.000000, -0.000000, 1.000000 - 16.194695, -45.244881, 0.000000 + 12.194694, -61.244883, 0.0 0.985170, 0.996293 @@ -18543,7 +18543,7 @@ 0.000000, -0.000000, 1.000000 - 26.252085, -60.918411, 0.000000 + 25.252085, -73.918413, 0.0 0.062088, 0.985915 @@ -18802,7 +18802,7 @@ 0.000000, -0.000000, 1.000000 - 44.765198, -62.703136, 0.000000 + 36.765196, -64.703136, 0.0 0.987585, 0.991539 @@ -19061,7 +19061,7 @@ 0.000000, -0.000000, 1.000000 - 68.543175, -36.810070, 0.000000 + 64.543174, -84.810078, 0.0 0.974849, 0.997474 @@ -21874,7 +21874,7 @@ 0.000000, -0.000000, 1.000000 - 27.002558, -30.043432, 0.000000 + 25.002557, -44.043434, 0.0 0.950918, 0.987926 @@ -22231,7 +22231,7 @@ 0.000000, -0.000000, 1.000000 - 16.899326, -7.534354, 0.000000 + 12.899325, -23.534356, 0.0 0.967365, 0.986709 @@ -23126,7 +23126,7 @@ 0.000000, -0.000000, 1.000000 - 16.352339, 34.218777, 0.000000 + 12.352338, 12.218775, 0.0 1.006669, 0.995290 @@ -24267,7 +24267,7 @@ 0.000000, -0.000000, 1.000000 - 33.050346, 18.941757, 0.000000 + 25.050345, -13.058250, 0.0 0.982166, 0.997593 @@ -27749,7 +27749,7 @@ 0.000000, -0.000000, 1.000000 - 51.290344, -17.144314, 0.000000 + 47.290343, -33.144318, 0.0 0.983412, 1.005309 @@ -28630,7 +28630,7 @@ 0.000000, -0.000000, 1.000000 - 51.345490, 25.171377, 0.000000 + 49.345489, 5.171375, 0.0 0.964543, 0.994030 diff -r 606bdb2f721d -r 00ef8386edd6 xml/font.xml --- a/xml/font.xml Sat Dec 25 18:52:11 2010 +0900 +++ b/xml/font.xml Sat Dec 25 21:04:59 2010 +0900 @@ -18,7 +18,7 @@ 0.000000, -0.000000, 1.000000 - 0.056778, 12.712452, 0.785928 + -1.943223, 10.712451, 0.0 1.000000, 1.000000 @@ -104,7 +104,7 @@ 0.000000, -0.000000, 1.000000 - 4.396258, 6.699379, 0.785928 + 2.396258, 4.699378, 0.0 1.000000, 1.000000 @@ -190,7 +190,7 @@ 0.000000, -0.000000, 1.000000 - 9.252754, 0.426550, 0.785928 + 7.252754, -1.573450, 0.0 1.000000, 1.000000 @@ -276,7 +276,7 @@ 0.000000, -0.000000, 1.000000 - 13.539113, -5.532536, 0.785928 + 11.539113, -7.532536, 0.0 1.000000, 1.000000 @@ -362,7 +362,7 @@ 0.000000, -0.000000, 1.000000 - 30.300522, -13.557590, 0.410289 + 14.300520, -15.557590, 0.0 1.006212, 0.987226 @@ -826,7 +826,7 @@ 0.000000, -0.000000, 1.000000 - 49.625568, -20.783899, 0.410289 + 33.625568, -22.783899, 0.0 1.003652, 1.013101 @@ -1290,7 +1290,7 @@ 0.000000, -0.000000, 1.000000 - 50.528610, -31.801050, 0.410289 + 34.528608, -35.801050, 0.0 1.000563, 0.997627 @@ -2185,7 +2185,7 @@ 0.000000, -0.000000, 1.000000 - 73.465965, -43.179424, 0.410289 + 41.465961, -45.179425, 0.0 0.988557, 0.992256 @@ -3080,7 +3080,7 @@ 0.000000, -0.000000, 1.000000 - 73.971619, -78.705002, 0.410289 + 57.971617, -94.705006, 0.0 1.000000, 1.000000 @@ -6562,7 +6562,7 @@ 0.000000, -0.000000, 1.000000 - 83.183876, -106.418343, 0.410289 + 79.183875, -108.418343, 0.0 1.003049, 1.017738 @@ -6702,7 +6702,7 @@ 0.000000, -0.000000, 1.000000 - 62.211845, -106.418335, 0.410289 + 58.211845, -108.418335, 0.0 1.012805, 1.007603 @@ -6842,7 +6842,7 @@ 0.000000, -0.000000, 1.000000 - 4.966396, -5.637080, 0.785928 + 2.966396, -7.637081, 0.0 1.000000, 1.000000 @@ -6928,7 +6928,7 @@ 0.000000, -0.000000, 1.000000 - -4.176530, 6.699379, 0.785928 + -6.176530, 4.699378, 0.0 1.000000, 1.000000 @@ -7014,7 +7014,7 @@ 0.000000, -0.000000, 1.000000 - 0.459066, 0.358871, 0.978458 + -1.540934, -1.641129, 0.0 1.000000, 1.000000 @@ -7100,7 +7100,7 @@ 0.000000, -0.000000, 1.000000 - -8.358378, 0.426607, 0.785928 + -10.358378, -1.573394, 0.0 1.000000, 1.000000 @@ -7186,7 +7186,7 @@ 0.000000, -0.000000, 1.000000 - -4.072084, -5.637079, 0.785928 + -6.072084, -7.637080, 0.0 1.000000, 1.000000 @@ -7272,7 +7272,7 @@ -0.034715, 0.013663, 0.999304 - -2.322771, -13.559166, 0.706707 + -10.323204, -15.569894, 0.0 1.002085, 1.004073 @@ -7520,7 +7520,7 @@ 0.000000, -0.000000, 1.000000 - 15.852587, -20.962917, 0.410289 + -0.147413, -22.962917, 0.0 0.996428, 1.036241 @@ -7984,7 +7984,7 @@ 0.000000, -0.000000, 1.000000 - 9.711535, -28.368504, 0.410289 + -6.288465, -30.368504, 0.0 0.996113, 1.004549 @@ -8448,7 +8448,7 @@ 0.000000, -0.000000, 1.000000 - -6.182694, -35.773769, 0.410289 + -14.182695, -37.773769, 0.0 0.994694, 1.024219 @@ -8696,7 +8696,7 @@ 0.000000, -0.000000, 1.000000 - 8.266077, -43.179428, 0.410289 + -23.733923, -45.179428, 0.0 0.988783, 1.001454 @@ -9591,7 +9591,7 @@ 0.000000, -0.000000, 1.000000 - 3.414019, -78.255585, 0.410289 + -12.585981, -94.255584, 0.0 1.000000, 1.000000 @@ -13073,7 +13073,7 @@ 0.000000, -0.000000, 1.000000 - 12.403276, -106.792831, 0.410289 + 8.403276, -108.792831, 0.0 1.018779, 1.004537 @@ -13213,7 +13213,7 @@ 0.000000, -0.000000, 1.000000 - 22.140293, -119.525841, 0.410289 + 18.140292, -121.525842, 0.0 1.005288, 1.015555 @@ -13353,7 +13353,7 @@ 0.000000, -0.000000, 1.000000 - -8.568754, -106.792831, 0.410289 + -12.568755, -108.792831, 0.0 1.010424, 0.996218 @@ -13493,7 +13493,7 @@ 0.000000, -0.000000, 1.000000 - 2.291764, -119.900345, 0.410289 + -1.708236, -121.900345, 0.0 1.006578, 1.009567 @@ -13633,7 +13633,7 @@ 0.000000, -0.000000, 1.000000 - -17.182264, -119.900345, 0.410289 + -21.182264, -121.900345, 0.0 1.003029, 0.994713 @@ -13773,7 +13773,7 @@ 0.000000, -0.000000, 1.000000 - -12.435717, -5.637079, 0.785928 + -14.435717, -7.637079, 0.0 1.000000, 1.000000 @@ -13859,7 +13859,7 @@ -0.034715, 0.013663, 0.999304 - -22.330864, -13.602913, 1.397238 + -30.331297, -15.613641, 0.0 1.002552, 1.027330 @@ -14107,7 +14107,7 @@ 0.000000, -0.000000, 1.000000 - -33.748291, -20.930382, 0.410289 + -65.748295, -22.930382, 0.0 1.010534, 1.015861 @@ -15002,7 +15002,7 @@ 0.000000, -0.000000, 1.000000 - -41.098606, -28.065899, 0.410289 + -73.098606, -30.065899, 0.0 1.004165, 1.016545 @@ -15897,7 +15897,7 @@ 0.000000, -0.000000, 1.000000 - -48.112499, -35.758369, 0.410289 + -80.112499, -37.758370, 0.0 0.984880, 1.003860 @@ -16792,7 +16792,7 @@ 0.000000, -0.000000, 1.000000 - -57.031963, -43.143848, 0.410289 + -89.031967, -45.143849, 0.0 0.987160, 0.996578 @@ -17687,7 +17687,7 @@ 0.000000, -0.000000, 1.000000 - -69.399345, -51.848671, 0.410289 + -101.399345, -53.848671, 0.0 0.986786, 0.995261 @@ -18582,7 +18582,7 @@ 0.000000, -0.000000, 1.000000 - -64.158157, -78.217590, 0.410289 + -80.158159, -94.217594, 0.0 1.000000, 1.000000 @@ -22064,7 +22064,7 @@ 0.000000, -0.000000, 1.000000 - -56.504822, -107.541840, 0.410289 + -60.504823, -109.541840, 0.0 1.006675, 0.996732 @@ -22204,7 +22204,7 @@ 0.000000, -0.000000, 1.000000 - -47.891308, -120.274857, 0.410289 + -51.891308, -122.274857, 0.0 1.019749, 1.013210 @@ -22344,7 +22344,7 @@ 0.000000, -0.000000, 1.000000 - -75.979897, -107.916245, 0.410289 + -79.979897, -109.916245, 0.0 1.019419, 1.006483 @@ -22448,7 +22448,7 @@ 0.000000, -0.000000, 1.000000 - -67.365334, -120.649353, 0.410289 + -71.365334, -122.649353, 0.0 1.009809, 1.017291 @@ -22588,7 +22588,7 @@ 0.000000, -0.000000, 1.000000 - -84.217873, -120.649353, 0.410289 + -88.217873, -122.649354, 0.0 1.020776, 1.006597