fix(inspector): fix "remove geometry component": remove instead of di…

…spose geometry
Wonder-Technology · Mar 9, 2019 · c108770 · c108770
1 parent f56d2d2
commit c108770
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 12 deletions.
diff --git a/...omponent/mainEditor/composable_component/inspector/utils/InspectorRemoveComponentUtils.re b/...omponent/mainEditor/composable_component/inspector/utils/InspectorRemoveComponentUtils.re
@@ -52,7 +52,7 @@ let removeComponentByType =
 
   | Geometry =>
     (editorState, engineState)
-    |> GameObjectLogicService.disposeGeometry(
+    |> GameObjectLogicService.removeGeometry(
          currentSceneTreeNode,
          engineState
          |> GameObjectComponentEngineService.unsafeGetGeometryComponent(

diff --git a/src/service/stateTuple/logic/GameObjectLogicService.re b/src/service/stateTuple/logic/GameObjectLogicService.re
@@ -115,15 +115,15 @@ let disposeRenderGroup =
   |> InspectorRenderGroupUtils.disposeRenderGroup(gameObject, materialType),
 );
 
-let disposeGeometry =
+let removeGeometry =
     (gameObject, geometryComponent, (editorState, engineState)) => (
   editorState
   |> InspectorEditorService.removeComponentTypeToMap(
        gameObject,
        InspectorComponentType.Geometry,
      ),
   engineState
-  |> GameObjectComponentEngineService.disposeGeometryComponent(
+  |> GameObjectComponentEngineService.removeGeometryComponent(
        gameObject,
        geometryComponent,
      ),

diff --git a/...ration/inspector/atom_component/addableComponent/addableComponent_removeComponent_test.re b/...ration/inspector/atom_component/addableComponent/addableComponent_removeComponent_test.re
@@ -138,16 +138,35 @@ let _ =
             |> StateLogicService.getEngineStateToGetData
             |> expect == true
           );
-          test(
-            "test click remove geometry component, current gameObject shouldn't has it",
-            () => {
-            MainEditorInspectorRemoveComponentTool.removeGeometryComponent();
 
-            GameObjectComponentEngineService.hasGeometryComponent(
-              GameObjectTool.unsafeGetCurrentSceneTreeNode(),
-            )
-            |> StateLogicService.getEngineStateToGetData
-            |> expect == false;
+          describe("test click remove geometry component", () => {
+            test("current gameObject shouldn't has it", () => {
+              MainEditorInspectorRemoveComponentTool.removeGeometryComponent();
+
+              GameObjectComponentEngineService.hasGeometryComponent(
+                GameObjectTool.unsafeGetCurrentSceneTreeNode(),
+              )
+              |> StateLogicService.getEngineStateToGetData
+              |> expect == false;
+            });
+
+            describe("if remove geometry from all its gameObjects", () =>
+              test("geometry component shouldn't be disposed", () => {
+                let geometry =
+                  GameObjectTool.getCurrentSceneTreeNodeGeometry();
+                let secondCube =
+                  MainEditorSceneTool.getSecondCube
+                  |> StateLogicService.getEngineStateToGetData;
+
+                MainEditorInspectorRemoveComponentTool.removeGeometryComponent();
+                GameObjectTool.setCurrentSceneTreeNode(secondCube);
+                MainEditorInspectorRemoveComponentTool.removeGeometryComponent();
+
+                GeometryToolEngine.isGeometryDisposed(geometry)
+                |> StateLogicService.getEngineStateToGetData
+                |> expect == false;
+              })
+            );
           });
         });
       });