[Fix] Fixes skining using render component meshes imported using hierarchy in Editor (playcanvas#3350)

mvaligursky · Martin Valigursky · web-flow · commit f03687d33b33 · 2021-07-21T03:43:39.000-07:00
Co-authored-by: Martin Valigursky &lt;mvaligursky@snapchat.com&gt;
diff --git a/src/resources/container.js b/src/resources/container.js
@@ -116,7 +116,6 @@ class ContainerResource {
             if (gltfNode.hasOwnProperty('skin')) {
                 skinedMeshInstances.push({
                     meshInstance: meshInstance,
-                    skin: skins[gltfNode.skin],
                     rootBone: root,
                     entity: entity
                 });
@@ -194,8 +193,7 @@ class ContainerResource {
 
         // now that the hierarchy is created, create skin instances and resolve bones using the hierarchy
         skinedMeshInstances.forEach((data) => {
-            data.meshInstance.mesh.skin = data.skin;
-            data.meshInstance.skinInstance = SkinInstanceCache.createCachedSkinedInstance(data.skin, data.rootBone, data.entity);
+            data.meshInstance.skinInstance = SkinInstanceCache.createCachedSkinedInstance(data.meshInstance.mesh.skin, data.rootBone, data.entity);
         });
 
         // return the scene hierarachy created from scene clones
diff --git a/src/resources/parser/glb-parser.js b/src/resources/parser/glb-parser.js
@@ -1608,6 +1608,18 @@ const createLights = function (gltf, nodes, options) {
     return lights;
 };
 
+// link skins to the meshes
+const linkSkins = function (gltf, renders, skins) {
+    gltf.nodes.forEach((gltfNode) => {
+        if (gltfNode.hasOwnProperty('mesh') && gltfNode.hasOwnProperty('skin')) {
+            const meshGroup = renders[gltfNode.mesh].meshes;
+            meshGroup.forEach((mesh) => {
+                mesh.skin = skins[gltfNode.skin];
+            });
+        }
+    });
+};
+
 // create engine resources from the downloaded GLB data
 const createResources = function (device, gltf, bufferViews, textureAssets, options, callback) {
     const preprocess = options && options.global && options.global.preprocess;
@@ -1639,6 +1651,9 @@ const createResources = function (device, gltf, bufferViews, textureAssets, opti
         renders[i].meshes = meshes[i];
     }
 
+    // link skins to meshes
+    linkSkins(gltf, renders, skins);
+
     const result = new GlbResources(gltf);
     result.nodes = nodes;
     result.scenes = scenes;
