• R/O
  • HTTP
  • SSH
  • HTTPS

Commit

Tags
No Tags

Frequently used words (click to add to your profile)

javaandroidc++linuxc#objective-ccocoa誰得qtrubypythonwindowsphpgamebathyscapheguic翻訳omegattwitterframeworkbtronvb.net計画中(planning stage)testdomarduinodirectxpreviewerゲームエンジン

Commit MetaInfo

Revisionb1dbe28a6240c7b06f1187fcf34cda5c5a67cd28 (tree)
Time2013-11-08 18:14:02
AuthorHMML <hmml3939@gmai...>
CommiterHMML

Log Message

Use layer local current motion (not bone's).

Change Summary

Incremental Difference

Binary files a/MMM_GraphEditor.v11.suo and b/MMM_GraphEditor.v11.suo differ
--- a/MMM_GraphEditor/GraphPort.Designer.cs
+++ b/MMM_GraphEditor/GraphPort.Designer.cs
@@ -247,7 +247,7 @@ namespace MMM_GraphEditor
247247 if (target_bone.BoneFlags.HasFlag(MikuMikuPlugin.BoneType.XYZ) &&
248248 (render_flags[IDX_POS_X] || render_flags[IDX_POS_Y] || render_flags[IDX_POS_Z]))
249249 {
250- Vector3 pos = scene.MarkerPosition == fd.FrameNumber ? target_bone.CurrentLocalMotion.Move : fd.Position;
250+ Vector3 pos = scene.MarkerPosition == fd.FrameNumber ? target_layer.CurrentLocalMotion.Move : fd.Position;
251251 foreach (int i in XYZ)
252252 {
253253 if (!render_flags[i]) continue;
@@ -278,7 +278,7 @@ namespace MMM_GraphEditor
278278 int size = 8;
279279 float cur_x = fd.FrameNumber * frame_width;
280280
281- Quaternion rot = scene.MarkerPosition == fd.FrameNumber ? target_bone.CurrentLocalMotion.Rotation : fd.Quaternion;
281+ Quaternion rot = scene.MarkerPosition == fd.FrameNumber ? target_layer.CurrentLocalMotion.Rotation : fd.Quaternion;
282282 rot = Rot_World2Local(rot);
283283 int rot_type = getRotType();
284284 Vector3 erot = Quaternion2Euler(rot, rot_type);
@@ -368,8 +368,8 @@ namespace MMM_GraphEditor
368368 foreach (int i in XYZ)
369369 {
370370 if (!render_flags[i]) continue;
371- Vector3 pos_from = scene.MarkerPosition == from.FrameNumber ? target_bone.CurrentLocalMotion.Move : from.Position;
372- Vector3 pos_to = scene.MarkerPosition == to.FrameNumber ? target_bone.CurrentLocalMotion.Move : to.Position;
371+ Vector3 pos_from = scene.MarkerPosition == from.FrameNumber ? target_layer.CurrentLocalMotion.Move : from.Position;
372+ Vector3 pos_to = scene.MarkerPosition == to.FrameNumber ? target_layer.CurrentLocalMotion.Move : to.Position;
373373 float span_y = graph_Y(pos_to[i]) - graph_Y(pos_from[i]);
374374 float from_y = graph_Y(pos_from[i]);
375375 float ip_ax = from_x + (interpolations[i * 2].X / 128f * span_x);
@@ -417,8 +417,8 @@ namespace MMM_GraphEditor
417417
418418 int panel_start_x = -PanelOuter.AutoScrollPosition.X;
419419 int panel_end_x = panel_start_x + PanelOuter.Width;
420- Quaternion rot_from = scene.MarkerPosition == from.FrameNumber ? target_bone.CurrentLocalMotion.Rotation : from.Quaternion;
421- Quaternion rot_to = scene.MarkerPosition == to.FrameNumber ? target_bone.CurrentLocalMotion.Rotation : to.Quaternion;
420+ Quaternion rot_from = scene.MarkerPosition == from.FrameNumber ? target_layer.CurrentLocalMotion.Rotation : from.Quaternion;
421+ Quaternion rot_to = scene.MarkerPosition == to.FrameNumber ? target_layer.CurrentLocalMotion.Rotation : to.Quaternion;
422422 rot_from = Rot_World2Local(rot_from);
423423 rot_to = Rot_World2Local(rot_to);
424424 Vector3 erot_from = Quaternion2Euler(rot_from, rot_type);
@@ -541,7 +541,7 @@ namespace MMM_GraphEditor
541541 {
542542 foreach (int i in XYZ)
543543 {
544- float cur = this.target_bone.CurrentLocalMotion.Move[i];
544+ float cur = this.target_layer.CurrentLocalMotion.Move[i];
545545 if (max < cur)
546546 max = cur;
547547 if (min > cur)
--- a/MMM_GraphEditor/GraphPort.cs
+++ b/MMM_GraphEditor/GraphPort.cs
@@ -245,7 +245,7 @@ namespace MMM_GraphEditor
245245 break;
246246 case Keys.Enter:
247247 if (target_bone == null || target_layer == null) break;
248- MotionData cur_motion = target_bone.CurrentLocalMotion;
248+ MotionData cur_motion = target_layer.CurrentLocalMotion;
249249 MotionFrameData fd = new MotionFrameData(scene.MarkerPosition, cur_motion.Move, cur_motion.Rotation);
250250 target_layer.Frames.AddKeyFrame(fd);
251251 break;
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
1-VERSION=0.1.0
1+VERSION=0.1.1
22 RELDIR=MMM-GraphEditor-$(VERSION)
33
44 dist: