コミット: 7352fc1de016b99580e3fcb378f1f3ce4b08e467 - mmm_graph_editor (git)

コミットメタ情報

• リビジョン: 7352fc1de016b99580e3fcb378f1f3ce4b08e467 (tree)
• 日時: 2013-11-09 04:07:01
• 作者: HMML <hmml3939@gmai...>
• コミッター: HMML

ログメッセージ

Change eular rot axis and invert direction.

変更サマリ

• modified: MMM_GraphEditor/GraphPort.Designer.cs
• modified: MMM_GraphEditor/GraphPort.cs

差分

--- a/MMM_GraphEditor/GraphPort.Designer.cs
+++ b/MMM_GraphEditor/GraphPort.Designer.cs
@@ -584,11 +584,11 @@ namespace MMM_GraphEditor
                 p = Math.Atan2(rm.M31, rm.M33);
                 y = Math.Atan2(rm.M12, rm.M22);
             }
-            else if (min_axis == 1) // Z-Y-X
+            else if (min_axis == 1) // X-Y-Z
             {
                 r = Math.Atan2(-rm.M32, rm.M33);
-                p = Math.Asin(rm.M31);
-                y = Math.Atan2(-rm.M21, rm.M11);
+                p = -Math.Asin(rm.M13);
+                y = Math.Atan2(rm.M12, rm.M11);
             }
             else // X-Z-Y
             {
@@ -596,7 +596,7 @@ namespace MMM_GraphEditor
                 p = Math.Atan2(-rm.M13, rm.M11);
                 y = Math.Asin(rm.M12);
             }
-            return new Vector3((float)r, (float)p, (float)y);
+            return new Vector3((float)-r, (float)-p, (float)-y);
         }
 
         private Matrix Quaternion2RotMatrix(Quaternion q)
@@ -633,7 +633,7 @@ namespace MMM_GraphEditor
                 case 0:
                     return "Z-X-Y";
                 case 1:
-                    return "Z-Y-X";
+                    return "X-Y-Z";
                 case 2:
                     return "X-Z-Y";
             }

--- a/MMM_GraphEditor/GraphPort.cs
+++ b/MMM_GraphEditor/GraphPort.cs
@@ -204,7 +204,7 @@ namespace MMM_GraphEditor
                 if (is_rot_modified)
                 {
                     float angle = (rot_val_from_graph_Y(key_move_start_pos.Y) - rot_val_from_graph_Y(e.Location.Y));
-                    rot = Quaternion.Multiply(key_move_orig_rot, Quaternion.Normalize(Quaternion.RotationAxis(rot_axis, angle)));
+                    rot = Quaternion.Multiply(key_move_orig_rot, Quaternion.Invert(Quaternion.Normalize(Quaternion.RotationAxis(rot_axis, angle))));
                 }
 
                 MotionFrameData mfd = new MotionFrameData(o_mfd.FrameNumber, pos, rot);