feat(wdb): import wdb should dispose inspector canvas gameObject

Wonder-Technology · Apr 16, 2019 · 07e54bf · 07e54bf
1 parent 29ddbef
commit 07e54bf
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 17 deletions.
diff --git a/...mposable_component/asset/composable_component/header/utils/ExtractAndRelateAssetsUtils.re b/...mposable_component/asset/composable_component/header/utils/ExtractAndRelateAssetsUtils.re
@@ -609,11 +609,11 @@ module AssetTree = {
             (editorState, engineState),
           );
 
-        let (editorState, engineState) =
+        let (editorState, engineState, inspectorEngineState) =
           extractedMaterialAssetDataArr
           |> WonderCommonlib.ArrayService.reduceOneParam(
                (.
-                 (editorState, engineState),
+                 (editorState, engineState, inspectorEngineState),
                  ((material, materialType), (getNameFunc, setNameFunc)),
                ) => {
                  let materialName =
@@ -643,14 +643,15 @@ module AssetTree = {
                      editorState,
                    );
 
-                 (editorState, StateInspectorEngineService.unsafeGetState())
-                 |> AssetTreeInspectorUtils.disposeContainerGameObjectAllChildren
-                 |> MaterialInspectorEngineUtils.createMaterialSphereIntoInspectorCanvas(
-                      MaterialDataAssetType.LightMaterial,
-                      material,
-                      (editorState, engineState),
-                    )
-                 |> StateLogicService.refreshInspectorEngineState;
+                 let inspectorEngineState =
+                   (editorState, inspectorEngineState)
+                   |> AssetTreeInspectorUtils.disposeContainerGameObjectAllChildren
+                   |> MaterialInspectorEngineUtils.createMaterialSphereIntoInspectorCanvas(
+                        MaterialDataAssetType.LightMaterial,
+                        material,
+                        (editorState, engineState),
+                      )
+                   |> DirectorEngineService.loopBody(0.);
 
                  let editorState =
                    editorState
@@ -679,15 +680,18 @@ module AssetTree = {
                         newNodeId,
                       );
 
-                 (editorState, engineState);
+                 (editorState, engineState, inspectorEngineState);
                },
-               (editorState, engineState),
+               (
+                 editorState,
+                 engineState,
+                 StateInspectorEngineService.unsafeGetState(),
+               ),
              );
 
-        (editorState, StateInspectorEngineService.unsafeGetState())
+        (editorState, inspectorEngineState)
         |> AssetTreeInspectorUtils.disposeContainerGameObjectAllChildren
-        |> StateInspectorEngineService.setState
-        |> ignore;
+        |> StateInspectorEngineService.setState;
 
         (editorState, engineState);
       };

diff --git a/...mponent/project/composable_component/asset/composable_component/utils/AssetHeaderUtils.re b/...mponent/project/composable_component/asset/composable_component/utils/AssetHeaderUtils.re
@@ -287,7 +287,7 @@ let fileLoad = ((uiState, dispatchFunc), createJsZipFunc, event) => {
          FileReader.makeSureCanLoadSameNameFileAgain(target);
 
          dispatchFunc(
-           AppStore.UpdateAction(Update([|UpdateStore.Project|])),
+           AppStore.UpdateAction(Update([|UpdateStore.Inspector,UpdateStore.Project|])),
          );
 
          resolve();

diff --git a/.../composable_component/assetTree_Inspector/atom_component/wdb_inspector/ui/WDBInspector.re b/.../composable_component/assetTree_Inspector/atom_component/wdb_inspector/ui/WDBInspector.re
@@ -1,5 +1,14 @@
 module Method = {
-  let didMount = () => AssetTreeInspectorUtils.showInspectorCanvas();
+  let didMount = () => {
+    Js.log("wdb did mount");
+    let state = StateInspectorEngineService.unsafeGetState();
+
+    let game = state |> SceneEngineService.getSceneGameObject;
+
+    state |> HierarchyGameObjectEngineService.getAllChildren(game) |> Js.log;
+
+    AssetTreeInspectorUtils.showInspectorCanvas();
+  };
 
   let willUnmount = AssetTreeInspectorUtils.hideInspectorCanvasAndDisposeContainerGameObjectAllChildren;
 };