Merge pull request #27 from galacean/fix/3d-pre

fix: solve pre composition problem in 3D plugin
galacean · Dec 7, 2023 · 02c949b · 02c949b
2 parents aae672e + 3985d94
commit 02c949b
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/plugin-packages/model/src/utility/plugin-helper.ts b/plugin-packages/model/src/utility/plugin-helper.ts
@@ -760,16 +760,20 @@ export class PluginHelper {
       return;
     }
 
-    let compIndex = 0;
-    const jsonScene = scene.jsonScene;
+    const { jsonScene } = scene;
+    const compIndexSet: Set<number> = new Set();
+
+    if (jsonScene.compositionId === undefined) {
+      compIndexSet.add(0);
+    }
 
     jsonScene.compositions.forEach((comp, index) => {
-      if (comp.id === jsonScene.compositionId) {
-        compIndex = index;
+      if (comp.id === jsonScene.compositionId || composition.refCompositionProps.has(comp.id)) {
+        compIndexSet.add(index);
       }
     });
 
-    if (compIndex >= 0 && compIndex < jsonScene.compositions.length) {
+    compIndexSet.forEach(compIndex => {
       const sceneComp = jsonScene.compositions[compIndex];
 
       sceneComp.items.forEach((item, itemId) => {
@@ -863,7 +867,7 @@ export class PluginHelper {
           }
         }
       });
-    }
+    });
 
   }