Fix for cloned anim and render components (playcanvas#3463)

ellthompson · web-flow · commit eae49f6fb3a9 · 2021-09-08T15:17:56.000+01:00
* fix for cloned anim and render components
diff --git a/src/framework/components/anim/component.js b/src/framework/components/anim/component.js
@@ -672,6 +672,14 @@ class AnimComponent extends Component {
         });
         this._consumedTriggers.clear();
     }
+
+    resolveDuplicatedEntityReferenceProperties(oldAnim, duplicatedIdsMap) {
+        if (oldAnim.rootBone && duplicatedIdsMap[oldAnim.rootBone.getGuid()]) {
+            this.rootBone = duplicatedIdsMap[oldAnim.rootBone.getGuid()];
+        } else {
+            this.rebind();
+        }
+    }
 }
 
 export { AnimComponent };
diff --git a/src/framework/components/render/component.js b/src/framework/components/render/component.js
@@ -111,7 +111,9 @@ class RenderComponent extends Component {
     _onRootBoneChanged() {
         // remove existing skin instances and create new ones, connected to new root bone
         this._clearSkinInstances();
-        this._cloneSkinInstances();
+        if (this.enabled && this.entity.enabled) {
+            this._cloneSkinInstances();
+        }
     }
 
     destroyMeshInstances() {
@@ -200,6 +202,8 @@ class RenderComponent extends Component {
 
         this._rootBone.onParentComponentEnable();
 
+        this._cloneSkinInstances();
+
         scene.on("set:layers", this.onLayersChanged, this);
         if (scene.layers) {
             scene.layers.on("add", this.onLayerAdded, this);
@@ -741,6 +745,13 @@ class RenderComponent extends Component {
             this._onRenderAssetAdded();
         }
     }
+
+    resolveDuplicatedEntityReferenceProperties(oldRender, duplicatedIdsMap) {
+        if (oldRender.rootBone && duplicatedIdsMap[oldRender.rootBone]) {
+            this.rootBone = duplicatedIdsMap[oldRender.rootBone];
+        }
+        this._clearSkinInstances();
+    }
 }
 
 export { RenderComponent };
diff --git a/src/framework/entity.js b/src/framework/entity.js
@@ -477,6 +477,16 @@ function resolveDuplicatedEntityReferenceProperties(oldSubtreeRoot, oldEntity, n
             newEntity.script.resolveDuplicatedEntityReferenceProperties(components.script, duplicatedIdsMap);
         }
 
+        // Handle entity render attributes
+        if (components.render) {
+            newEntity.render.resolveDuplicatedEntityReferenceProperties(components.render, duplicatedIdsMap);
+        }
+
+        // Handle entity anim attributes
+        if (components.anim) {
+            newEntity.anim.resolveDuplicatedEntityReferenceProperties(components.anim, duplicatedIdsMap);
+        }
+
         // Recurse into children. Note that we continue to pass in the same `oldSubtreeRoot`,
         // in order to correctly handle cases where a child has an entity reference
         // field that points to a parent or other ancestor that is still within the
diff --git a/src/resources/container.js b/src/resources/container.js
@@ -175,7 +175,8 @@ class ContainerResource {
             if (attachedMi) {
                 entity.addComponent("render", Object.assign({
                     type: "asset",
-                    meshInstances: attachedMi
+                    meshInstances: attachedMi,
+                    rootBone: root
                 }, options));
             }
 

Original file line number	Diff line number	Diff line change
`@@ -672,6 +672,14 @@ class AnimComponent extends Component {`
`672`	`672`	`});`
`673`	`673`	`this._consumedTriggers.clear();`
`674`	`674`	`}`
	`675`	`+`
	`676`	`+ resolveDuplicatedEntityReferenceProperties(oldAnim, duplicatedIdsMap) {`
	`677`	`+ if (oldAnim.rootBone && duplicatedIdsMap[oldAnim.rootBone.getGuid()]) {`
	`678`	`+ this.rootBone = duplicatedIdsMap[oldAnim.rootBone.getGuid()];`
	`679`	`+ } else {`
	`680`	`+ this.rebind();`
	`681`	`+ }`
	`682`	`+ }`
`675`	`683`	`}`
`676`	`684`
`677`	`685`	`export { AnimComponent };`
Original file line number	Diff line number	Diff line change
`@@ -175,7 +175,8 @@ class ContainerResource {`
`175`	`175`	`if (attachedMi) {`
`176`	`176`	`entity.addComponent("render", Object.assign({`
`177`	`177`	`type: "asset",`
`178`		`- meshInstances: attachedMi`
	`178`	`+ meshInstances: attachedMi,`
	`179`	`+ rootBone: root`
`179`	`180`	`}, options));`
`180`	`181`	`}`
`181`	`182`