fix(clone): fix "clone transform": not mark dirty in CloneTransformMainService.re

Author: yyc-git

src/service/state/main/transform/CloneTransformMainService.re

@@ -6,49 +6,56 @@ let handleCloneComponent =
     (
       sourceComponent: transform,
       countRangeArr: array(int),
-      {settingRecord, typeArrayPoolRecord} as state
+      {settingRecord, typeArrayPoolRecord} as state,
     ) => {
   let componentArr = [||];
   let transformRecord = state |> RecordTransformMainService.getRecord;
   let localPosition =
     ModelMatrixTransformService.getLocalPositionTuple(
       sourceComponent,
-      transformRecord.localPositions
+      transformRecord.localPositions,
     );
   let localRotation =
     ModelMatrixTransformService.getLocalRotationTuple(
       sourceComponent,
-      transformRecord.localRotations
+      transformRecord.localRotations,
     );
   let localScale =
     ModelMatrixTransformService.getLocalScaleTuple(
       sourceComponent,
-      transformRecord.localScales
+      transformRecord.localScales,
     );
   let (transformRecord, componentArr) =
     countRangeArr
     |> WonderCommonlib.ArrayService.reduceOneParam(
-         [@bs]
-         (
-           ((transformRecord, componentArr), _) => {
-             let (transformRecord, index) =
-               CreateTransformMainService.createWithoutMarkNotDirtyWithRecord(
-                 settingRecord,
-                 transformRecord
-               );
-             (
-               transformRecord
-               |> ModelMatrixTransformService.setLocalPositionByTuple(index, localPosition)
-               |> ModelMatrixTransformService.setLocalRotationByTuple(index, localRotation)
-               |> ModelMatrixTransformService.setLocalScaleByTuple(index, localScale)
-               |> DirtyTransformService.mark(index, true),
-               componentArr |> ArrayService.push(index)
-             )
-           }
-         ),
-         (transformRecord, [||])
+         (. (transformRecord, componentArr), _) => {
+           let (transformRecord, index) =
+             CreateTransformMainService.createWithoutMarkNotDirtyWithRecord(
+               settingRecord,
+               transformRecord,
+             );
+           (
+             transformRecord
+             |> ModelMatrixTransformService.setLocalPositionByTuple(
+                  index,
+                  localPosition,
+                )
+             |> ModelMatrixTransformService.setLocalRotationByTuple(
+                  index,
+                  localRotation,
+                )
+             |> ModelMatrixTransformService.setLocalScaleByTuple(
+                  index,
+                  localScale,
+                ),
+             componentArr |> ArrayService.push(index),
+           );
+         },
+         (transformRecord, [||]),
        );
   state.transformRecord =
-    Some(transformRecord |> DirtyTransformService.mark(sourceComponent, true));
-  (state, componentArr)
+    Some(
+      transformRecord |> DirtyTransformService.mark(sourceComponent, true),
+    );
+  (state, componentArr);
 };

test/integration/no_worker/core/clone/cloneGameObject_test.re

@@ -11,7 +11,7 @@ let _ =
     let state = ref(MainStateTool.createState());
     let _cloneGameObject = (gameObject, count, state) =>
       CloneTool.cloneGameObject(gameObject, count, false, state);
-    let _getClonedTransformMatrixDataArr = (gameObject, count, state) => {
+    let _cloneAndGetClonedTransformMatrixDataArr = (gameObject, count, state) => {
       let (state, clonedGameObjectArr) =
         _cloneGameObject(gameObject, count, state);
       (
@@ -1329,12 +1329,13 @@ let _ =
           });
         });
       });
+
       describe("test clone transform component", () => {
         let _prepare = () => {
           let (state, gameObject1, transform1) =
             GameObjectTool.createGameObject(state^);
           let (clonedGameObjectArr, clonedTransformArr) =
-            _getClonedTransformMatrixDataArr(gameObject1, 2, state);
+            _cloneAndGetClonedTransformMatrixDataArr(gameObject1, 2, state);
           (
             state,
             gameObject1,
@@ -1358,7 +1359,7 @@ let _ =
             let pos1 = (1., 2., 3.);
             let state = state |> setTransformLocalPosition(transform1, pos1);
             let (_, clonedTransformArr) =
-              _getClonedTransformMatrixDataArr(gameObject1, 2, state);
+              _cloneAndGetClonedTransformMatrixDataArr(gameObject1, 2, state);
             clonedTransformArr
             |> Js.Array.map(transform =>
                  getTransformLocalPosition(transform, state)
@@ -1376,7 +1377,7 @@ let _ =
               let state =
                 state |> setTransformLocalPosition(transform1, pos1);
               let (_, clonedTransformArr) =
-                _getClonedTransformMatrixDataArr(gameObject1, 2, state);
+                _cloneAndGetClonedTransformMatrixDataArr(gameObject1, 2, state);
               let pos2 = (2., 4., 6.);
               let state =
                 state
@@ -1404,7 +1405,7 @@ let _ =
             let state =
               state |> setTransformLocalRotation(transform1, rotation1);
             let (_, clonedTransformArr) =
-              _getClonedTransformMatrixDataArr(gameObject1, 2, state);
+              _cloneAndGetClonedTransformMatrixDataArr(gameObject1, 2, state);
             clonedTransformArr
             |> Js.Array.map(transform =>
                  getTransformLocalRotation(transform, state)
@@ -1423,7 +1424,7 @@ let _ =
             let scale1 = (1., 2., 3.);
             let state = state |> setTransformLocalScale(transform1, scale1);
             let (_, clonedTransformArr) =
-              _getClonedTransformMatrixDataArr(gameObject1, 2, state);
+              _cloneAndGetClonedTransformMatrixDataArr(gameObject1, 2, state);
             clonedTransformArr
             |> Js.Array.map(transform =>
                  getTransformLocalScale(transform, state)
@@ -1432,6 +1433,20 @@ let _ =
           })
         );
 
+        test("mark cloned transform dirty", () => {
+          open TransformAPI;
+          let (state, gameObject1, transform1) =
+            GameObjectTool.createGameObject(state^);
+
+          let (_, clonedTransformArr) =
+            _cloneAndGetClonedTransformMatrixDataArr(gameObject1, 2, state);
+
+          clonedTransformArr
+          |> Js.Array.map(transform
+               => TransformTool.isDirty(transform, state))
+          |> expect == [|true, true|];
+        });
+
         test("add cloned transform's gameObject to map", () => {
           let (state, _, _, clonedGameObjectArr, clonedTransformArr) =
             _prepare();
@@ -1879,7 +1894,7 @@ let _ =
             ) =
               _prepare();
             let (_, clonedTransformArr) =
-              _getClonedTransformMatrixDataArr(gameObject1, 2, state);
+              _cloneAndGetClonedTransformMatrixDataArr(gameObject1, 2, state);
             (
               state |> TransformTool.getTransformParent(clonedTransformArr[0]),
               state |> TransformTool.getTransformParent(clonedTransformArr[1]),
@@ -1933,7 +1948,7 @@ let _ =
               let state =
                 state |> setTransformLocalPosition(transform4, pos4);
               let (clonedGameObjectArr, clonedTransformArr) =
-                _getClonedTransformMatrixDataArr(gameObject1, 1, state);
+                _cloneAndGetClonedTransformMatrixDataArr(gameObject1, 1, state);
               clonedTransformArr
               |> Js.Array.map(transform =>
                    getTransformPosition(transform, state)