fix(redo-undo): fix redo-undo->rotation: transform inspector ui->rota…

…tion should undo
Wonder-Technology · Feb 15, 2019 · dfcd287 · dfcd287
1 parent ff5f3ea
commit dfcd287
Show file tree

Hide file tree

Showing 9 changed files with 2,371 additions and 32 deletions.
diff --git a/...eneTree_Inspector/composable_component/transform/eventHandler/RotationBlurEventHandler.re b/...eneTree_Inspector/composable_component/transform/eventHandler/RotationBlurEventHandler.re
@@ -5,13 +5,26 @@ module CustomEventHandler = {
   type return = unit;
 
   let setUndoValueToCopiedEngineState =
-      ((uiState, dispatchFunc), transformComponent, (x, y, z)) =>
-    StateEngineService.unsafeGetState()
+      ((uiState, dispatchFunc), transformComponent, (x, y, z)) => {
+    let editorState = StateEditorService.getState();
+    let engineState = StateEngineService.unsafeGetState();
+    let editorState =
+      TransformEditorService.removeLocalEulerAngleData(
+        GameObjectComponentEngineService.unsafeGetTransformComponent(
+          SceneTreeEditorService.unsafeGetCurrentSceneTreeNode(editorState),
+          engineState,
+        ),
+        editorState,
+      );
+    editorState |> StateEditorService.setState |> ignore;
+
+    engineState
     |> StateEngineService.deepCopyForRestore
     |> TransformEngineService.setLocalEulerAngles(
          (x, y, z),
          transformComponent,
        );
+  };
 };
 
 module MakeEventHandler = EventHandler.MakeEventHandler(CustomEventHandler);
diff --git a/...core/utils/engine/job/init/initTransformGizmosJob/rotation/BindRotationGizmoEventUtils.re b/...core/utils/engine/job/init/initTransformGizmosJob/rotation/BindRotationGizmoEventUtils.re
@@ -51,6 +51,15 @@ let handleDragDropEvent = (event, (editorState, engineState)) => {
   let engineState =
     engineState
     |> CurrentRotationGizmosUtils.restoreRotationGizmoColor(editorState);
+  /*
+   let editorState =
+     TransformEditorService.removeLocalEulerAngleData(
+       GameObjectComponentEngineService.unsafeGetTransformComponent(
+         SceneTreeEditorService.unsafeGetCurrentSceneTreeNode(editorState),
+         engineState,
+       ),
+       editorState,
+     ); */
 
   let engineState =
     InitTransformGizmosUtils.pushUndoStack(

diff --git a/...pector/composable_component/sceneTree_inspector/transform/tool/MainEditorTransformTool.re b/...pector/composable_component/sceneTree_inspector/transform/tool/MainEditorTransformTool.re
@@ -54,6 +54,25 @@ let changeRotationY = (transform, value) =>
 let changeRotationZ = (transform, value) =>
   MainEditorTransform.Method.changeRotationZ(transform, value);
 
+let changeRotationYAndBlur =
+    (
+      ~value,
+      ~transform=GameObjectTool.getCurrentSceneTreeNodeTransform(),
+      ~uiState=TestTool.buildEmptyAppState(),
+      ~dispatchFunc=TestTool.getDispatch(),
+      (),
+    ) => {
+  let oldRotation = TransformUtils.getTransformRotationData(transform);
+
+  changeRotationY(transform, value);
+
+  MainEditorTransform.Method.blurRotationEvent(
+    (uiState, dispatchFunc),
+    transform,
+    oldRotation,
+  );
+};
+
 let changeScaleX = (transform, value) =>
   MainEditorTransform.Method.changeScaleX(transform, value);
 

diff --git a/test/integration/job/gizmo/initTransformGizmosJob_test.re b/test/integration/job/gizmo/initTransformGizmosJob_test.re
@@ -2564,10 +2564,7 @@ let _ =
                   ~pageY=172,
                   (),
                 );
-                TransformUtils.getTransformRotationData(
-                  GameObjectTool.getCurrentSceneTreeNodeTransform(),
-                )
-                |> ignore;
+                RotationGizmosTool.refreshInspectorTransform();
                 EventTransformGizmosTool.triggerMouseMove(
                   ~sandbox,
                   ~pageX=226 + 20,
@@ -2794,34 +2791,30 @@ let _ =
                       InitTransformGizmosJobTool.getCurrentSceneTreeNodeLocalScale()
                       |> expect == (0.5, 0.5, 0.5);
                     });
-                    test(
-                      "should avoid scale to 0",
-                      () => {
-                        let gameObject1 =
-                          _prepare(sandbox, prepareGameObject);
+                    test("should avoid scale to 0", () => {
+                      let gameObject1 = _prepare(sandbox, prepareGameObject);
 
-                        EventTransformGizmosTool.triggerMouseDown(
-                          ~sandbox,
-                          ~pageX=250,
-                          ~pageY=100,
-                          (),
-                        );
-                        EventTransformGizmosTool.triggerMouseMove(
-                          ~sandbox,
-                          ~pageX=250 - 40,
-                          ~pageY=100,
-                          (),
-                        );
+                      EventTransformGizmosTool.triggerMouseDown(
+                        ~sandbox,
+                        ~pageX=250,
+                        ~pageY=100,
+                        (),
+                      );
+                      EventTransformGizmosTool.triggerMouseMove(
+                        ~sandbox,
+                        ~pageX=250 - 40,
+                        ~pageY=100,
+                        (),
+                      );
 
-                        TransformGameObjectEngineService.getLocalScale(
-                          SceneTreeEditorService.unsafeGetCurrentSceneTreeNode
-                          |> StateLogicService.getEditorState,
-                        )
-                        |> StateLogicService.getEngineStateToGetData
-                        |> Vector3Service.truncate(3)
-                        |> expect == (0.001, 0.001, 0.001);
-                      },
-                    );
+                      TransformGameObjectEngineService.getLocalScale(
+                        SceneTreeEditorService.unsafeGetCurrentSceneTreeNode
+                        |> StateLogicService.getEditorState,
+                      )
+                      |> StateLogicService.getEngineStateToGetData
+                      |> Vector3Service.truncate(3)
+                      |> expect == (0.001, 0.001, 0.001);
+                    });
                   });
                 })
               );

diff --git a/test/integration/job/tool/RotationGizmosTool.re b/test/integration/job/tool/RotationGizmosTool.re
@@ -0,0 +1,2 @@
+let refreshInspectorTransform = () =>
+  BuildComponentForCurryTool.buildMainEditorTransformComponent();