feat(event): now not each point event will trigger loopBody when stop…

…;arcball now not bind keydown event;
Wonder-Technology · Feb 9, 2019 · 4a281e3 · 4a281e3
1 parent b99e3f1
commit 4a281e3
Show file tree

Hide file tree

Showing 9 changed files with 224 additions and 183 deletions.
diff --git a/src/core/job/init/InitCameraControllerJob.re b/src/core/job/init/InitCameraControllerJob.re
@@ -23,7 +23,13 @@ let _refreshInspector = () => {
 let _handleTriggerRefreshInspectorEvent = engineState =>
   _isCurrentSceneTreeNodeHasArcballCameraControllerComponent(engineState) ?
     {
+      engineState |> StateEngineService.setState |> ignore;
+
       _refreshInspector();
+
+      let engineState =
+        StateEngineService.unsafeGetState() |> StateLogicService.renderWhenStop;
+
       engineState;
     } :
     engineState;

diff --git a/src/core/job/init/InitEventJob.re b/src/core/job/init/InitEventJob.re
@@ -60,10 +60,7 @@ module PointEvent = {
                   engineState,
                 );
 
-              switch (eventTarget) {
-              | Scene => StateLogicService.loopBodyWhenStop(engineState)
-              | _ => engineState
-              };
+              engineState;
             } :
             engineState,
       ~state=engineState,
@@ -400,16 +397,11 @@ module DomEvent = {
         event,
       ) :
       _isTriggerSceneViewEvent() ?
-        {
-          _execKeyboardEventHandle(
-            sceneViewEventName
-            |> EventType.editorDomEventNameToEngineDomEventName,
-            event,
-          );
-
-          StateLogicService.loopBodyWhenStop
-          |> StateLogicService.getAndSetEngineState;
-        } :
+        _execKeyboardEventHandle(
+          sceneViewEventName
+          |> EventType.editorDomEventNameToEngineDomEventName,
+          event,
+        ) :
         ();
 
   let _fromPCDomEventArr = engineState => [|

diff --git a/src/core/job/init/InitPickingJob.re b/src/core/job/init/InitPickingJob.re
@@ -204,6 +204,8 @@ let _handlePicking = (event: EventType.customEvent, engineState) => {
     | Some(gameObject) => _handlePickSuccess(gameObject, engineState)
     };
 
+  let engineState = StateLogicService.renderWhenStop(engineState);
+
   (engineState, event);
 };
 

diff --git a/src/core/job/init/InitTransformGizmosJob.re b/src/core/job/init/InitTransformGizmosJob.re
@@ -83,6 +83,8 @@ let _bindEvent = (editorState, engineState) => {
                     engineState,
                   );
 
+              let engineState = StateLogicService.renderWhenStop(engineState);
+
               editorState |> StateEditorService.setState |> ignore;
 
               (engineState, event);
@@ -112,7 +114,13 @@ let _bindEvent = (editorState, engineState) => {
                         (editorState, engineState),
                       );
 
-                    _refreshInspector(editorState, engineState);
+                    let (editorState, engineState) =
+                      _refreshInspector(editorState, engineState);
+
+                    let engineState =
+                      StateLogicService.renderWhenStop(engineState);
+
+                    (editorState, engineState);
                   } :
                   SelectRotationGizmoSceneViewEditorService.isSelectAnyRotationGizmo(
                     editorState,
@@ -124,7 +132,16 @@ let _bindEvent = (editorState, engineState) => {
                           (editorState, engineState),
                         );
 
-                      _refreshInspector(editorState, engineState);
+                      let engineState =
+                        StateLogicService.loopBodyWhenStop(engineState);
+
+                      let (editorState, engineState) =
+                        _refreshInspector(editorState, engineState);
+
+                      let engineState =
+                        StateLogicService.renderWhenStop(engineState);
+
+                      (editorState, engineState);
                     } :
                     (editorState, engineState);
 
@@ -180,7 +197,11 @@ let _bindEvent = (editorState, engineState) => {
                     ),
                   );
 
-                  (StateEngineService.unsafeGetState(), event);
+                  let engineState = StateEngineService.unsafeGetState();
+                  let engineState =
+                    StateLogicService.renderWhenStop(engineState);
+
+                  (engineState, event);
                 } :
                 {
                   let editorState =
@@ -197,6 +218,11 @@ let _bindEvent = (editorState, engineState) => {
 
                   editorState |> StateEditorService.setState |> ignore;
 
+                  let engineState =
+                    StateLogicService.renderWhenStop(engineState);
+
+                  (engineState, event);
+
                   (engineState, event);
                 };
             } :
@@ -222,6 +248,8 @@ let _bindEvent = (editorState, engineState) => {
                   engineState,
                 );
 
+              let engineState = StateLogicService.renderWhenStop(engineState);
+
               (engineState, event);
             } :
             (engineState, event),

diff --git a/src/core/job/loop/RenderTransformGizmosJob.re b/src/core/job/loop/RenderTransformGizmosJob.re
@@ -451,7 +451,7 @@ let _renderRotationGizmos = (editorState, engineState) =>
 let renderJob = (_, engineState) => {
   open SceneViewType;
 
-  /* WonderLog.Log.print("render gizmo") |> ignore; */
+  WonderLog.Log.print("render gizmo") |> ignore;
 
   let editorState = StateEditorService.getState();
 

diff --git a/src/service/stateTuple/logic/ArcballCameraControllerLogicService.re b/src/service/stateTuple/logic/ArcballCameraControllerLogicService.re
@@ -1,3 +1,11 @@
+let _renderWhenStop = (event, handleFunc, engineState) => {
+  let (engineState, event) = handleFunc(. event, engineState);
+
+  let engineState = StateLogicService.renderWhenStop(engineState);
+
+  (engineState, event);
+};
+
 let bindArcballCameraControllerEventForSceneView =
     (cameraController, engineState) => {
   let (
@@ -6,7 +14,7 @@ let bindArcballCameraControllerEventForSceneView =
     pointDragDropHandleFunc,
     pointDragOverHandleFunc,
     pointScaleHandleFunc,
-    keydownHandleFunc,
+    _,
   ) =
     ArcballCameraEngineService.prepareBindEvent(
       cameraController,
@@ -19,7 +27,7 @@ let bindArcballCameraControllerEventForSceneView =
       ~handleFunc=
         (. event, engineState) =>
           MouseEventService.isRightMouseButton(event) ?
-            pointDragStartHandleFunc(. event, engineState) :
+            _renderWhenStop(event, pointDragStartHandleFunc, engineState) :
             (engineState, event),
       ~state=engineState,
       (),
@@ -31,7 +39,7 @@ let bindArcballCameraControllerEventForSceneView =
       ~handleFunc=
         (. event, engineState) =>
           MouseEventService.isRightMouseButton(event) ?
-            pointDragDropHandleFunc(. event, engineState) :
+            _renderWhenStop(event, pointDragDropHandleFunc, engineState) :
             (engineState, event),
       ~state=engineState,
       (),
@@ -43,7 +51,7 @@ let bindArcballCameraControllerEventForSceneView =
       ~handleFunc=
         (. event, engineState) =>
           MouseEventService.isRightMouseButton(event) ?
-            pointDragOverHandleFunc(. event, engineState) :
+            _renderWhenStop(event, pointDragOverHandleFunc, engineState) :
             (engineState, event),
       ~state=engineState,
       (),
@@ -53,18 +61,19 @@ let bindArcballCameraControllerEventForSceneView =
     ManageEventEngineService.onCustomGlobalEvent(
       ~eventName=SceneViewEventEditorService.getPointScaleEventName(),
       ~handleFunc=
-        (. event, engineState) => pointScaleHandleFunc(. event, engineState),
+        (. event, engineState) =>
+          _renderWhenStop(event, pointScaleHandleFunc, engineState),
       ~state=engineState,
       (),
     );
 
-  let engineState =
-    ManageEventEngineService.onKeyboardEvent(
-      ~eventName=EventType.KeyDown_SceneView |> Obj.magic,
-      ~handleFunc=keydownHandleFunc,
-      ~state=engineState,
-      (),
-    );
+  /* let engineState =
+     ManageEventEngineService.onKeyboardEvent(
+       ~eventName=EventType.KeyDown_SceneView |> Obj.magic,
+       ~handleFunc=keydownHandleFunc,
+       ~state=engineState,
+       (),
+     ); */
 
   engineState;
 };

diff --git a/src/service/stateTuple/logic/StateLogicService.re b/src/service/stateTuple/logic/StateLogicService.re
@@ -39,6 +39,10 @@ let getAndRefreshEngineStateWhenStop = () =>
   |> StateEngineService.setState
   |> ignore;
 
+let renderWhenStop = engineState =>
+  StateEditorService.getIsRun() ?
+    engineState : engineState |> DirectorEngineService.loopBody(0.);
+
 let getEditorState = handleFunc => StateEditorService.getState() |> handleFunc;
 
 let getAndSetEditorState = handleFunc =>