Revision | 2bec476ade89435c40cad41d983788a099b3338b (tree) |
---|---|
Zeit | 2013-10-24 09:27:14 |
Autor | HMML <hmml3939@gmai...> |
Commiter | HMML |
Refactor: unite render flag attrs
@@ -62,32 +62,32 @@ namespace MMM_GraphEditor | ||
62 | 62 | |
63 | 63 | private void btn_pos_x_CheckedChanged(object sender, EventArgs e) |
64 | 64 | { |
65 | - graphPort1.render_pos[0] = btn_pos_x.Checked; | |
65 | + graphPort1.render_flags[GraphPort.IDX_POS_X] = btn_pos_x.Checked; | |
66 | 66 | } |
67 | 67 | |
68 | 68 | private void btn_pos_y_CheckedChanged(object sender, EventArgs e) |
69 | 69 | { |
70 | - graphPort1.render_pos[1] = btn_pos_y.Checked; | |
70 | + graphPort1.render_flags[GraphPort.IDX_POS_Y] = btn_pos_y.Checked; | |
71 | 71 | } |
72 | 72 | |
73 | 73 | private void btn_pos_z_CheckedChanged(object sender, EventArgs e) |
74 | 74 | { |
75 | - graphPort1.render_pos[2] = btn_pos_z.Checked; | |
75 | + graphPort1.render_flags[GraphPort.IDX_POS_Z] = btn_pos_z.Checked; | |
76 | 76 | } |
77 | 77 | |
78 | 78 | private void btn_rot_x_CheckedChanged(object sender, EventArgs e) |
79 | 79 | { |
80 | - graphPort1.render_rot[0] = btn_rot_x.Checked; | |
80 | + graphPort1.render_flags[GraphPort.IDX_ROT_R] = btn_rot_x.Checked; | |
81 | 81 | } |
82 | 82 | |
83 | 83 | private void btn_rot_y_CheckedChanged(object sender, EventArgs e) |
84 | 84 | { |
85 | - graphPort1.render_rot[1] = btn_rot_y.Checked; | |
85 | + graphPort1.render_flags[GraphPort.IDX_ROT_P] = btn_rot_y.Checked; | |
86 | 86 | } |
87 | 87 | |
88 | 88 | private void btn_rot_z_CheckedChanged(object sender, EventArgs e) |
89 | 89 | { |
90 | - graphPort1.render_rot[2] = btn_rot_z.Checked; | |
90 | + graphPort1.render_flags[GraphPort.IDX_ROT_Y] = btn_rot_z.Checked; | |
91 | 91 | } |
92 | 92 | |
93 | 93 | private void rot_axis_radio_changed(object sender, EventArgs e) |
@@ -81,8 +81,7 @@ namespace MMM_GraphEditor | ||
81 | 81 | 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 }; |
82 | 82 | public MotionLayer target_layer = null; |
83 | 83 | public Bone target_bone = null; |
84 | - public bool[] render_pos = { true, true, true }; | |
85 | - public bool[] render_rot = { true, true, true }; | |
84 | + public bool[] render_flags = { true, true, true, true, true, true }; | |
86 | 85 | public bool ip_val_limit = true; |
87 | 86 | GraphPoint key_pointed = null; |
88 | 87 |
@@ -237,12 +236,12 @@ namespace MMM_GraphEditor | ||
237 | 236 | float cur_x = fd.FrameNumber * frame_width; |
238 | 237 | |
239 | 238 | if (target_bone.BoneFlags.HasFlag(MikuMikuPlugin.BoneType.XYZ) && |
240 | - (render_pos[0] || render_pos[1] || render_pos[2])) | |
239 | + (render_flags[IDX_POS_X] || render_flags[IDX_POS_Y] || render_flags[IDX_POS_Z])) | |
241 | 240 | { |
242 | 241 | Vector3 pos = scene.MarkerPosition == fd.FrameNumber ? target_bone.CurrentLocalMotion.Move : fd.Position; |
243 | 242 | foreach (int i in XYZ) |
244 | 243 | { |
245 | - if (!render_pos[i]) continue; | |
244 | + if (!render_flags[i]) continue; | |
246 | 245 | float cur_y = graph_Y(pos[i]); |
247 | 246 | if (cur_mouse_pos.X - frame_width/2 < cur_x && cur_x < cur_mouse_pos.X + frame_width/2 && |
248 | 247 | cur_mouse_pos.Y - size < cur_y && cur_y < cur_mouse_pos.Y + size) |
@@ -258,7 +257,7 @@ namespace MMM_GraphEditor | ||
258 | 257 | |
259 | 258 | |
260 | 259 | if (target_bone.BoneFlags.HasFlag(MikuMikuPlugin.BoneType.Rotate) && |
261 | - (render_rot[0] || render_rot[1] || render_rot[2])) | |
260 | + (render_flags[IDX_ROT_P] || render_flags[IDX_ROT_R] || render_flags[IDX_ROT_Y])) | |
262 | 261 | { |
263 | 262 | plotRot(g, fd, prev); |
264 | 263 | } |
@@ -277,7 +276,7 @@ namespace MMM_GraphEditor | ||
277 | 276 | foreach (int i in RPY) |
278 | 277 | { |
279 | 278 | int a = i - 3; |
280 | - if (!render_rot[a]) continue; | |
279 | + if (!render_flags[i]) continue; | |
281 | 280 | float cur_y = graph_R(erot[a]); |
282 | 281 | /* TODO: enable rot edit |
283 | 282 | 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 | ||
297 | 296 | { |
298 | 297 | if (from == null) return; |
299 | 298 | if (!(target_bone.BoneFlags.HasFlag(MikuMikuPlugin.BoneType.XYZ) && |
300 | - (render_pos[0] || render_pos[1] || render_pos[2]))) | |
299 | + (render_flags[IDX_POS_X] || render_flags[IDX_POS_Y] || render_flags[IDX_POS_Z]))) | |
301 | 300 | return; |
302 | 301 | MikuMikuPlugin.InterpolatePoint[] interpolations = { to.InterpolXA, to.InterpolXB, to.InterpolYA, to.InterpolYB, to.InterpolZA, to.InterpolZB }; |
303 | 302 |
@@ -307,7 +306,7 @@ namespace MMM_GraphEditor | ||
307 | 306 | |
308 | 307 | foreach (int i in XYZ) |
309 | 308 | { |
310 | - if (!render_pos[i]) continue; | |
309 | + if (!render_flags[i]) continue; | |
311 | 310 | Vector3 pos_from = scene.MarkerPosition == from.FrameNumber ? target_bone.CurrentLocalMotion.Move : from.Position; |
312 | 311 | Vector3 pos_to = scene.MarkerPosition == to.FrameNumber ? target_bone.CurrentLocalMotion.Move : to.Position; |
313 | 312 | float span_y = graph_Y(pos_to[i]) - graph_Y(pos_from[i]); |
@@ -350,7 +349,7 @@ namespace MMM_GraphEditor | ||
350 | 349 | { |
351 | 350 | if (from == null) return; |
352 | 351 | if (!(target_bone.BoneFlags.HasFlag(MikuMikuPlugin.BoneType.Rotate) && |
353 | - (render_rot[0] || render_rot[1] || render_rot[2]))) | |
352 | + (render_flags[IDX_ROT_Y] || render_flags[IDX_ROT_R] || render_flags[IDX_ROT_P]))) | |
354 | 353 | return; |
355 | 354 | |
356 | 355 | Quaternion rot_from = scene.MarkerPosition == from.FrameNumber ? target_bone.CurrentLocalMotion.Rotation : from.Quaternion; |
@@ -379,9 +378,8 @@ namespace MMM_GraphEditor | ||
379 | 378 | |
380 | 379 | foreach (int ax in RPY) |
381 | 380 | { |
382 | - int a = ax - 3; | |
383 | - if (!render_rot[a]) continue; | |
384 | - g.FillRectangle(Graph_Brushes[ax], from_x + i, graph_R(mid_erot[a]), 1, 2); | |
381 | + if (!render_flags[ax]) continue; | |
382 | + g.FillRectangle(Graph_Brushes[ax], from_x + i, graph_R(mid_erot[ax - 3]), 1, 2); | |
385 | 383 | } |
386 | 384 | } |
387 | 385 | } |