Commit: 2bec476ade89435c40cad41d983788a099b3338b - mmm_graph_editor (git)

Commit MetaInfo

• Revision: 2bec476ade89435c40cad41d983788a099b3338b (tree)
• Time: 2013-10-24 09:27:14
• Author: HMML <hmml3939@gmai...>
• Commiter: HMML

Log Message

Refactor: unite render flag attrs

Change Summary

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

Incremental Difference

--- a/MMM_GraphEditor/GraphEditorControl.cs
+++ b/MMM_GraphEditor/GraphEditorControl.cs
@@ -62,32 +62,32 @@ namespace MMM_GraphEditor
 
         private void btn_pos_x_CheckedChanged(object sender, EventArgs e)
         {
-            graphPort1.render_pos[0] = btn_pos_x.Checked;
+            graphPort1.render_flags[GraphPort.IDX_POS_X] = btn_pos_x.Checked;
         }
 
         private void btn_pos_y_CheckedChanged(object sender, EventArgs e)
         {
-            graphPort1.render_pos[1] = btn_pos_y.Checked;
+            graphPort1.render_flags[GraphPort.IDX_POS_Y] = btn_pos_y.Checked;
         }
 
         private void btn_pos_z_CheckedChanged(object sender, EventArgs e)
         {
-            graphPort1.render_pos[2] = btn_pos_z.Checked;
+            graphPort1.render_flags[GraphPort.IDX_POS_Z] = btn_pos_z.Checked;
         }
 
         private void btn_rot_x_CheckedChanged(object sender, EventArgs e)
         {
-            graphPort1.render_rot[0] = btn_rot_x.Checked;
+            graphPort1.render_flags[GraphPort.IDX_ROT_R] = btn_rot_x.Checked;
         }
 
         private void btn_rot_y_CheckedChanged(object sender, EventArgs e)
         {
-            graphPort1.render_rot[1] = btn_rot_y.Checked;
+            graphPort1.render_flags[GraphPort.IDX_ROT_P] = btn_rot_y.Checked;
         }
 
         private void btn_rot_z_CheckedChanged(object sender, EventArgs e)
         {
-            graphPort1.render_rot[2] = btn_rot_z.Checked;
+            graphPort1.render_flags[GraphPort.IDX_ROT_Y] = btn_rot_z.Checked;
         }
 
         private void rot_axis_radio_changed(object sender, EventArgs e)

--- a/MMM_GraphEditor/GraphPort.Designer.cs
+++ b/MMM_GraphEditor/GraphPort.Designer.cs
@@ -81,8 +81,7 @@ namespace MMM_GraphEditor
         public static IEnumerable<int> XYZRPY = new int[6] { IDX_POS_X, IDX_POS_Y, IDX_POS_Z, IDX_ROT_R, IDX_ROT_P, IDX_ROT_Y };
         public MotionLayer target_layer = null;
         public Bone target_bone = null;
-        public bool[] render_pos = { true, true, true };
-        public bool[] render_rot = { true, true, true };
+        public bool[] render_flags = { true, true, true, true, true, true };
         public bool ip_val_limit = true;
         GraphPoint key_pointed = null;
 
@@ -237,12 +236,12 @@ namespace MMM_GraphEditor
             float cur_x = fd.FrameNumber * frame_width;
 
             if (target_bone.BoneFlags.HasFlag(MikuMikuPlugin.BoneType.XYZ) &&
-                (render_pos[0] || render_pos[1] || render_pos[2]))
+                (render_flags[IDX_POS_X] || render_flags[IDX_POS_Y] || render_flags[IDX_POS_Z]))
             {
                 Vector3 pos = scene.MarkerPosition == fd.FrameNumber ? target_bone.CurrentLocalMotion.Move : fd.Position;
                 foreach (int i in XYZ)
                 {
-                    if (!render_pos[i]) continue;
+                    if (!render_flags[i]) continue;
                     float cur_y = graph_Y(pos[i]);
                     if (cur_mouse_pos.X - frame_width/2 < cur_x && cur_x < cur_mouse_pos.X + frame_width/2 &&
                         cur_mouse_pos.Y - size < cur_y && cur_y < cur_mouse_pos.Y + size)
@@ -258,7 +257,7 @@ namespace MMM_GraphEditor
 
 
             if (target_bone.BoneFlags.HasFlag(MikuMikuPlugin.BoneType.Rotate) &&
-                (render_rot[0] || render_rot[1] || render_rot[2]))
+                (render_flags[IDX_ROT_P] || render_flags[IDX_ROT_R] || render_flags[IDX_ROT_Y]))
             {
                 plotRot(g, fd, prev);
             }
@@ -277,7 +276,7 @@ namespace MMM_GraphEditor
             foreach (int i in RPY)
             {
                 int a = i - 3;
-                if (!render_rot[a]) continue;
+                if (!render_flags[i]) continue;
                 float cur_y = graph_R(erot[a]);
                 /* TODO: enable rot edit
                 if (cur_mouse_pos.X - frame_width / 2 < cur_x && cur_x < cur_mouse_pos.X + frame_width / 2 &&
@@ -297,7 +296,7 @@ namespace MMM_GraphEditor
         {
             if (from == null) return;
             if (!(target_bone.BoneFlags.HasFlag(MikuMikuPlugin.BoneType.XYZ) &&
-                (render_pos[0] || render_pos[1] || render_pos[2])))
+                (render_flags[IDX_POS_X] || render_flags[IDX_POS_Y] || render_flags[IDX_POS_Z])))
                 return;
             MikuMikuPlugin.InterpolatePoint[] interpolations = { to.InterpolXA, to.InterpolXB, to.InterpolYA, to.InterpolYB, to.InterpolZA, to.InterpolZB };
 
@@ -307,7 +306,7 @@ namespace MMM_GraphEditor
 
             foreach (int i in XYZ)
             {
-                if (!render_pos[i]) continue;
+                if (!render_flags[i]) continue;
                 Vector3 pos_from = scene.MarkerPosition == from.FrameNumber ? target_bone.CurrentLocalMotion.Move : from.Position;
                 Vector3 pos_to = scene.MarkerPosition == to.FrameNumber ? target_bone.CurrentLocalMotion.Move : to.Position;
                 float span_y = graph_Y(pos_to[i]) - graph_Y(pos_from[i]);
@@ -350,7 +349,7 @@ namespace MMM_GraphEditor
         {
             if (from == null) return;
             if (!(target_bone.BoneFlags.HasFlag(MikuMikuPlugin.BoneType.Rotate) &&
-                (render_rot[0] || render_rot[1] || render_rot[2])))
+                (render_flags[IDX_ROT_Y] || render_flags[IDX_ROT_R] || render_flags[IDX_ROT_P])))
                 return;
 
             Quaternion rot_from = scene.MarkerPosition == from.FrameNumber ? target_bone.CurrentLocalMotion.Rotation : from.Quaternion;
@@ -379,9 +378,8 @@ namespace MMM_GraphEditor
 
                 foreach (int ax in RPY)
                 {
-                    int a = ax - 3;
-                    if (!render_rot[a]) continue;
-                    g.FillRectangle(Graph_Brushes[ax], from_x + i, graph_R(mid_erot[a]), 1, 2);
+                    if (!render_flags[ax]) continue;
+                    g.FillRectangle(Graph_Brushes[ax], from_x + i, graph_R(mid_erot[ax - 3]), 1, 2);
                 }
             }
         }