fix(dragWdb): fix drag wdb before/after scene gameObject, throw error

Wonder-Technology · Feb 16, 2019 · d12342b · d12342b
1 parent bfaa6b7
commit d12342b
Show file tree

Hide file tree

Showing 10 changed files with 1,075 additions and 675 deletions.
diff --git a/...onents/composable_component/sceneTree/eventHandler/SceneTreeDragGameObjectEventHandler.re b/...onents/composable_component/sceneTree/eventHandler/SceneTreeDragGameObjectEventHandler.re
@@ -13,85 +13,6 @@ module CustomEventHandler = {
   );
   type return = unit;
 
-  let _handleDragIntoTarget =
-      (targetGameObject, draggedGameObject, engineState) => {
-    SceneTreeEditorService.setIsShowChildren(targetGameObject, true)
-    |> StateLogicService.getAndSetEditorState;
-
-    engineState
-    |> HierarchyGameObjectEngineService.setParentKeepOrder(
-         targetGameObject,
-         draggedGameObject,
-       );
-  };
-
-  let _handleDragToBeSceneGameObjectChild =
-      (dragPosition, sceneGameObject, draggedGameObject, engineState) =>
-    switch (dragPosition) {
-    | DragIntoTarget =>
-      _handleDragIntoTarget(sceneGameObject, draggedGameObject, engineState)
-
-    | DragBeforeTarget
-    | DragAfterTarget =>
-      let targetGameObject =
-        engineState
-        |> HierarchyGameObjectEngineService.getChildren(sceneGameObject)
-        |> ArrayService.unsafeGetFirst;
-      engineState
-      |> HierarchyGameObjectEngineService.setParentKeepOrder(
-           HierarchyGameObjectEngineService.getParentGameObject(
-             targetGameObject,
-             engineState,
-           )
-           |> OptionService.unsafeGet,
-           draggedGameObject,
-         )
-      |> HierarchyGameObjectEngineService.changeGameObjectChildOrder(
-           draggedGameObject,
-           targetGameObject,
-           Wonderjs.TransformType.Before,
-         );
-    };
-
-  let _handleDragToBeTargetGameObjectSib =
-      (dragPosition, targetGameObject, draggedGameObject, engineState) =>
-    switch (dragPosition) {
-    | DragBeforeTarget =>
-      engineState
-      |> HierarchyGameObjectEngineService.setParentKeepOrder(
-           HierarchyGameObjectEngineService.getParentGameObject(
-             targetGameObject,
-             engineState,
-           )
-           |> OptionService.unsafeGet,
-           draggedGameObject,
-         )
-      |> HierarchyGameObjectEngineService.changeGameObjectChildOrder(
-           draggedGameObject,
-           targetGameObject,
-           Wonderjs.TransformType.Before,
-         )
-
-    | DragIntoTarget =>
-      _handleDragIntoTarget(targetGameObject, draggedGameObject, engineState)
-
-    | DragAfterTarget =>
-      engineState
-      |> HierarchyGameObjectEngineService.setParentKeepOrder(
-           HierarchyGameObjectEngineService.getParentGameObject(
-             targetGameObject,
-             engineState,
-           )
-           |> OptionService.unsafeGet,
-           draggedGameObject,
-         )
-      |> HierarchyGameObjectEngineService.changeGameObjectChildOrder(
-           draggedGameObject,
-           targetGameObject,
-           Wonderjs.TransformType.After,
-         )
-    };
-
   let handleSelfLogic =
       (
         (uiState, dispatchFunc),
@@ -103,13 +24,13 @@ module CustomEventHandler = {
     let engineState =
       SceneEngineService.isSceneGameObject(targetGameObject)
       |> StateLogicService.getEngineStateToGetData ?
-        _handleDragToBeSceneGameObjectChild(
+        DragGameObjectUtils.handleDragToBeSceneGameObjectChild(
           dragPosition,
           targetGameObject,
           draggedGameObject,
           engineState,
         ) :
-        _handleDragToBeTargetGameObjectSib(
+        DragGameObjectUtils.handleDragToBeTargetGameObjectSib(
           dragPosition,
           targetGameObject,
           draggedGameObject,

diff --git a/src/core/utils/dragGameObject/DragGameObjectUtils.re b/src/core/utils/dragGameObject/DragGameObjectUtils.re
@@ -0,0 +1,80 @@
+open SceneTreeNodeType;
+
+let _handleDragIntoTarget = (targetGameObject, draggedGameObject, engineState) => {
+  SceneTreeEditorService.setIsShowChildren(targetGameObject, true)
+  |> StateLogicService.getAndSetEditorState;
+
+  engineState
+  |> HierarchyGameObjectEngineService.setParentKeepOrder(
+       targetGameObject,
+       draggedGameObject,
+     );
+};
+
+let handleDragToBeSceneGameObjectChild =
+    (dragPosition, sceneGameObject, draggedGameObject, engineState) =>
+  switch (dragPosition) {
+  | DragIntoTarget =>
+    _handleDragIntoTarget(sceneGameObject, draggedGameObject, engineState)
+
+  | DragBeforeTarget
+  | DragAfterTarget =>
+    let targetGameObject =
+      engineState
+      |> HierarchyGameObjectEngineService.getChildren(sceneGameObject)
+      |> ArrayService.unsafeGetFirst;
+
+    engineState
+    |> HierarchyGameObjectEngineService.setParentKeepOrder(
+         HierarchyGameObjectEngineService.getParentGameObject(
+           targetGameObject,
+           engineState,
+         )
+         |> OptionService.unsafeGet,
+         draggedGameObject,
+       )
+    |> HierarchyGameObjectEngineService.changeGameObjectChildOrder(
+         draggedGameObject,
+         targetGameObject,
+         Wonderjs.TransformType.Before,
+       );
+  };
+
+let handleDragToBeTargetGameObjectSib =
+    (dragPosition, targetGameObject, draggedGameObject, engineState) =>
+  switch (dragPosition) {
+  | DragBeforeTarget =>
+    engineState
+    |> HierarchyGameObjectEngineService.setParentKeepOrder(
+         HierarchyGameObjectEngineService.getParentGameObject(
+           targetGameObject,
+           engineState,
+         )
+         |> OptionService.unsafeGet,
+         draggedGameObject,
+       )
+    |> HierarchyGameObjectEngineService.changeGameObjectChildOrder(
+         draggedGameObject,
+         targetGameObject,
+         Wonderjs.TransformType.Before,
+       )
+
+  | DragIntoTarget =>
+    _handleDragIntoTarget(targetGameObject, draggedGameObject, engineState)
+
+  | DragAfterTarget =>
+    engineState
+    |> HierarchyGameObjectEngineService.setParentKeepOrder(
+         HierarchyGameObjectEngineService.getParentGameObject(
+           targetGameObject,
+           engineState,
+         )
+         |> OptionService.unsafeGet,
+         draggedGameObject,
+       )
+    |> HierarchyGameObjectEngineService.changeGameObjectChildOrder(
+         draggedGameObject,
+         targetGameObject,
+         Wonderjs.TransformType.After,
+       )
+  };
diff --git a/src/core/utils/DragWDBEventHandlerUtils.re → ...ragGameObject/DragWDBEventHandlerUtils.re b/src/core/utils/DragWDBEventHandlerUtils.re → ...ragGameObject/DragWDBEventHandlerUtils.re
diff --git a/src/core/utils/DragWDBUtils.re → ...core/utils/dragGameObject/DragWDBUtils.re b/src/core/utils/DragWDBUtils.re → ...core/utils/dragGameObject/DragWDBUtils.re
@@ -47,49 +47,6 @@ let _checkLightCount = (gameObject, (editorState, engineState)) => {
   (engineState, result);
 };
 
-let _setHierachy =
-    (dragPosition, targetGameObject, clonedWDBGameObject, engineState) =>
-  switch (dragPosition) {
-  | DragBeforeTarget =>
-    engineState
-    |> HierarchyGameObjectEngineService.addChild(
-         HierarchyGameObjectEngineService.getParentGameObject(
-           targetGameObject,
-           engineState,
-         )
-         |> OptionService.unsafeGet,
-         clonedWDBGameObject,
-       )
-    |> HierarchyGameObjectEngineService.changeGameObjectChildOrder(
-         clonedWDBGameObject,
-         targetGameObject,
-         Wonderjs.TransformType.Before,
-       )
-
-  | DragIntoTarget =>
-    engineState
-    |> HierarchyGameObjectEngineService.addChild(
-         targetGameObject,
-         clonedWDBGameObject,
-       )
-
-  | DragAfterTarget =>
-    engineState
-    |> HierarchyGameObjectEngineService.addChild(
-         HierarchyGameObjectEngineService.getParentGameObject(
-           targetGameObject,
-           engineState,
-         )
-         |> OptionService.unsafeGet,
-         clonedWDBGameObject,
-       )
-    |> HierarchyGameObjectEngineService.changeGameObjectChildOrder(
-         clonedWDBGameObject,
-         targetGameObject,
-         Wonderjs.TransformType.After,
-       )
-  };
-
 let dragWDB =
     (
       wdbGameObject,
@@ -111,12 +68,21 @@ let dragWDB =
     let clonedWDBGameObject =
       cloneGameObjectArr |> CloneGameObjectLogicService.getClonedGameObject;
 
-    _setHierachy(
-      dragPosition,
-      targetGameObject,
-      clonedWDBGameObject,
-      engineState,
-    );
+    let engineState =
+      SceneEngineService.isSceneGameObject(targetGameObject)
+      |> StateLogicService.getEngineStateToGetData ?
+        DragGameObjectUtils.handleDragToBeSceneGameObjectChild(
+          dragPosition,
+          targetGameObject,
+          clonedWDBGameObject,
+          engineState,
+        ) :
+        DragGameObjectUtils.handleDragToBeTargetGameObjectSib(
+          dragPosition,
+          targetGameObject,
+          clonedWDBGameObject,
+          engineState,
+        );
 
     let engineState =
       SceneEngineService.isNeedReInitAllLightMaterials(