feat(redo-undo): fix deep copy gameObject: add copy disposedScriptArray

Wonder-Technology · Apr 7, 2019 · d06d0f7 · d06d0f7
1 parent ecae5e7
commit d06d0f7
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/src/service/record/main/gameObject/RecordGameObjectService.re b/src/service/record/main/gameObject/RecordGameObjectService.re
@@ -76,6 +76,7 @@ let deepCopyForRestore =
         disposedDirectionLightArray,
         disposedPointLightArray,
         disposedMeshRendererComponentArray,
+        disposedScriptArray,
         aliveUidArray,
         geometryMap,
         transformMap,
@@ -146,6 +147,8 @@ let deepCopyForRestore =
   disposedMeshRendererComponentArray:
     disposedMeshRendererComponentArray
     |> WonderCommonlib.MutableSparseMapService.copy,
+  disposedScriptArray:
+    disposedScriptArray |> WonderCommonlib.MutableSparseMapService.copy,
   aliveUidArray: aliveUidArray |> WonderCommonlib.MutableSparseMapService.copy,
   geometryMap: geometryMap |> WonderCommonlib.MutableSparseMapService.copy,
   transformMap: transformMap |> WonderCommonlib.MutableSparseMapService.copy,

diff --git a/test/integration/no_worker/core/state/redo_undo_ecs_test.re b/test/integration/no_worker/core/state/redo_undo_ecs_test.re
@@ -576,14 +576,17 @@ let _ =
 
       describe("deep copy gameObject record", () =>
         test(
-          "shadow copy
+          {|shadow copy
           nameMap,
           isRootMap,
-          disposedUidMap,\n\n        disposedUidArray,\n        disposedUidArrayForKeepOrder,
+          disposedUidMap,        disposedUidArray,        disposedUidArrayForKeepOrder,
 
           disposedUidArrayForKeepOrderRemoveGeometry,
           disposedUidArrayForKeepOrderRemoveGeometryRemoveMaterial,
-          \n        disposedBasicCameraViewArray,\n        disposedTransformArray,\n        disposedTransformArrayForKeepOrder,\n        disposedPerspectiveCameraProjectionArray,\n        disposedBasicMaterialDataMap,\n        disposedLightMaterialDataMap,\n                disposedGeometryDataMap,\n        disposedSourceInstanceArray,\n        disposedObjectInstanceArray,\n                disposedDirectionLightArray,\n        disposedPointLightArray,\n        disposedMeshRendererComponentArray,\n        disposedMeshRendererUidArray,\n                \n                \n                aliveUidArray, transformMap, basicCameraViewMap, geometryMap, meshRendererMap, basicMaterialMap, lightMaterialMap, directionLightMap, pointLightMap, sourceInstanceMap, objectInstanceMap, scriptMap",
+                  disposedBasicCameraViewArray,        disposedTransformArray,        disposedTransformArrayForKeepOrder,        disposedPerspectiveCameraProjectionArray,        disposedBasicMaterialDataMap,        disposedLightMaterialDataMap,                disposedGeometryDataMap,        disposedSourceInstanceArray,        disposedObjectInstanceArray,                disposedDirectionLightArray,        disposedPointLightArray,        disposedMeshRendererComponentArray,
+          disposedScriptArray,
+
+          disposedMeshRendererUidArray,                                                aliveUidArray, transformMap, basicCameraViewMap, geometryMap, meshRendererMap, basicMaterialMap, lightMaterialMap, directionLightMap, pointLightMap, sourceInstanceMap, objectInstanceMap, scriptMap|},
           () =>
           StateDataMainType.(
             GameObjectType.(
@@ -609,6 +612,7 @@ let _ =
                     disposedDirectionLightArray,
                     disposedPointLightArray,
                     disposedMeshRendererComponentArray,
+                    disposedScriptArray,
                     aliveUidArray,
                     transformMap,
                     basicCameraViewMap,
@@ -644,6 +648,7 @@ let _ =
                     disposedDirectionLightArray |> Obj.magic,
                     disposedPointLightArray |> Obj.magic,
                     disposedMeshRendererComponentArray |> Obj.magic,
+                    disposedScriptArray |> Obj.magic,
                     aliveUidArray |> Obj.magic,
                     transformMap |> Obj.magic,
                     basicCameraViewMap |> Obj.magic,