@galacean/engine-loader 1.2.0-beta.4 → 1.2.0-beta.6

package/dist/miniprogram.js

@@ -4535,25 +4535,32 @@ exports.GLTFSceneParser = /*#__PURE__*/ function(GLTFParser1) {
         camera.enabled = false;
     };
     _proto._createRenderer = function _createRenderer(context, entityInfo, entity) {
-        var _loop = function(i) {
-            var glTFPrimitive = glTFMeshPrimitives[i];
-            var materialIndex = glTFPrimitive.material;
-            promises.push(Promise.all([
-                context.get(exports.GLTFParserType.Mesh, meshID),
-                skinID !== undefined && context.get(exports.GLTFParserType.Skin, skinID),
-                materialIndex !== undefined && context.get(exports.GLTFParserType.Material, materialIndex)
-            ]).then(function(param) {
-                var meshes = param[0], skin = param[1], material = param[2];
+        var _this = this;
+        var meshID = entityInfo.mesh, skinID = entityInfo.skin;
+        var glTFMesh = context.glTF.meshes[meshID];
+        var glTFMeshPrimitives = glTFMesh.primitives;
+        var rendererCount = glTFMeshPrimitives.length;
+        var blendShapeWeights = entityInfo.weights || glTFMesh.weights;
+        var materialPromises = new Array(rendererCount);
+        for(var i = 0; i < rendererCount; i++){
+            var _glTFMeshPrimitives_i_material;
+            materialPromises[i] = context.get(exports.GLTFParserType.Material, (_glTFMeshPrimitives_i_material = glTFMeshPrimitives[i].material) != null ? _glTFMeshPrimitives_i_material : -1);
+        }
+        return Promise.all([
+            context.get(exports.GLTFParserType.Mesh, meshID),
+            skinID !== undefined && context.get(exports.GLTFParserType.Skin, skinID),
+            Promise.all(materialPromises)
+        ]).then(function(param) {
+            var _loop = function(i) {
+                var material = materials[i] || exports.GLTFMaterialParser._getDefaultMaterial(context.glTFResource.engine);
+                var glTFPrimitive = glTFMeshPrimitives[i];
                 var mesh = meshes[i];
-                var renderer;
-                material || (material = exports.GLTFMaterialParser._getDefaultMaterial(context.glTFResource.engine));
+                var renderer = void 0;
                 if (skin || blendShapeWeights) {
                     var skinRenderer = entity.addComponent(miniprogram.SkinnedMeshRenderer);
                     skinRenderer.mesh = mesh;
                     if (skin) {
-                        skinRenderer.rootBone = skin._rootBone;
-                        skinRenderer.bones = skin._bones;
-                        _this._computeLocalBounds(skinRenderer, mesh, skin._bones, skin._rootBone, skin.inverseBindMatrices);
+                        _this._computeLocalBounds(skinRenderer, mesh, skin.bones, skin.rootBone, skin.inverseBindMatrices);
                         skinRenderer.skin = skin;
                     }
                     if (blendShapeWeights) {
@@ -4572,17 +4579,10 @@ exports.GLTFSceneParser = /*#__PURE__*/ function(GLTFParser1) {
                     }
                 });
                 GLTFParser.executeExtensionsAdditiveAndParse(glTFPrimitive.extensions, context, renderer, glTFPrimitive);
-            }));
-        };
-        var _this = this;
-        var glTFMeshes = context.glTF.meshes;
-        var meshID = entityInfo.mesh, skinID = entityInfo.skin;
-        var glTFMesh = glTFMeshes[meshID];
-        var glTFMeshPrimitives = glTFMesh.primitives;
-        var blendShapeWeights = entityInfo.weights || glTFMesh.weights;
-        var promises = new Array();
-        for(var i = 0; i < glTFMeshPrimitives.length; i++)_loop(i);
-        return Promise.all(promises);
+            };
+            var meshes = param[0], skin = param[1], materials = param[2];
+            for(var i = 0; i < rendererCount; i++)_loop(i);
+        });
     };
     _proto._computeLocalBounds = function _computeLocalBounds(skinnedMeshRenderer, mesh, bones, rootBone, inverseBindMatrices) {
         var rootBoneIndex = bones.indexOf(rootBone);
@@ -4636,7 +4636,7 @@ exports.GLTFSkinParser = /*#__PURE__*/ function(GLTFParser1) {
         var jointCount = joints.length;
         var skin = new miniprogram.Skin(name);
         skin.inverseBindMatrices.length = jointCount;
-        skin._bones.length = jointCount;
+        var bones = new Array(jointCount);
         // parse IBM
         var accessor = glTF.accessors[inverseBindMatrices];
         var skinPromise = GLTFUtils.getAccessorBuffer(context, glTF.bufferViews, accessor).then(function(bufferInfo) {
@@ -4648,21 +4648,20 @@ exports.GLTFSkinParser = /*#__PURE__*/ function(GLTFParser1) {
                 skin.inverseBindMatrices[i] = inverseBindMatrix;
                 // Get bones
                 var bone = entities[joints[i]];
-                skin._bones[i] = bone;
+                bones[i] = bone;
                 skin.joints[i] = bone.name;
-                // Get skeleton
-                if (skeleton !== undefined) {
-                    var rootBone = entities[skeleton];
-                    skin._rootBone = rootBone;
-                    skin.skeleton = rootBone.name;
+            }
+            skin.bones = bones;
+            // Get skeleton
+            if (skeleton !== undefined) {
+                var rootBone = entities[skeleton];
+                skin.rootBone = rootBone;
+            } else {
+                var rootBone1 = _this._findSkeletonRootBone(joints, entities);
+                if (rootBone1) {
+                    skin.rootBone = rootBone1;
                 } else {
-                    var rootBone1 = _this._findSkeletonRootBone(joints, entities);
-                    if (rootBone1) {
-                        skin._rootBone = rootBone1;
-                        skin.skeleton = rootBone1.name;
-                    } else {
-                        throw "Failed to find skeleton root bone.";
-                    }
+                    throw "Failed to find skeleton root bone.";
                 }
             }
             return skin;

package/dist/module.js

@@ -4530,25 +4530,32 @@ var GLTFSceneParser = /*#__PURE__*/ function(GLTFParser1) {
         camera.enabled = false;
     };
     _proto._createRenderer = function _createRenderer(context, entityInfo, entity) {
-        var _loop = function(i) {
-            var glTFPrimitive = glTFMeshPrimitives[i];
-            var materialIndex = glTFPrimitive.material;
-            promises.push(Promise.all([
-                context.get(GLTFParserType.Mesh, meshID),
-                skinID !== undefined && context.get(GLTFParserType.Skin, skinID),
-                materialIndex !== undefined && context.get(GLTFParserType.Material, materialIndex)
-            ]).then(function(param) {
-                var meshes = param[0], skin = param[1], material = param[2];
+        var _this = this;
+        var meshID = entityInfo.mesh, skinID = entityInfo.skin;
+        var glTFMesh = context.glTF.meshes[meshID];
+        var glTFMeshPrimitives = glTFMesh.primitives;
+        var rendererCount = glTFMeshPrimitives.length;
+        var blendShapeWeights = entityInfo.weights || glTFMesh.weights;
+        var materialPromises = new Array(rendererCount);
+        for(var i = 0; i < rendererCount; i++){
+            var _glTFMeshPrimitives_i_material;
+            materialPromises[i] = context.get(GLTFParserType.Material, (_glTFMeshPrimitives_i_material = glTFMeshPrimitives[i].material) != null ? _glTFMeshPrimitives_i_material : -1);
+        }
+        return Promise.all([
+            context.get(GLTFParserType.Mesh, meshID),
+            skinID !== undefined && context.get(GLTFParserType.Skin, skinID),
+            Promise.all(materialPromises)
+        ]).then(function(param) {
+            var _loop = function(i) {
+                var material = materials[i] || GLTFMaterialParser._getDefaultMaterial(context.glTFResource.engine);
+                var glTFPrimitive = glTFMeshPrimitives[i];
                 var mesh = meshes[i];
-                var renderer;
-                material || (material = GLTFMaterialParser._getDefaultMaterial(context.glTFResource.engine));
+                var renderer = void 0;
                 if (skin || blendShapeWeights) {
                     var skinRenderer = entity.addComponent(SkinnedMeshRenderer);
                     skinRenderer.mesh = mesh;
                     if (skin) {
-                        skinRenderer.rootBone = skin._rootBone;
-                        skinRenderer.bones = skin._bones;
-                        _this._computeLocalBounds(skinRenderer, mesh, skin._bones, skin._rootBone, skin.inverseBindMatrices);
+                        _this._computeLocalBounds(skinRenderer, mesh, skin.bones, skin.rootBone, skin.inverseBindMatrices);
                         skinRenderer.skin = skin;
                     }
                     if (blendShapeWeights) {
@@ -4567,17 +4574,10 @@ var GLTFSceneParser = /*#__PURE__*/ function(GLTFParser1) {
                     }
                 });
                 GLTFParser.executeExtensionsAdditiveAndParse(glTFPrimitive.extensions, context, renderer, glTFPrimitive);
-            }));
-        };
-        var _this = this;
-        var glTFMeshes = context.glTF.meshes;
-        var meshID = entityInfo.mesh, skinID = entityInfo.skin;
-        var glTFMesh = glTFMeshes[meshID];
-        var glTFMeshPrimitives = glTFMesh.primitives;
-        var blendShapeWeights = entityInfo.weights || glTFMesh.weights;
-        var promises = new Array();
-        for(var i = 0; i < glTFMeshPrimitives.length; i++)_loop(i);
-        return Promise.all(promises);
+            };
+            var meshes = param[0], skin = param[1], materials = param[2];
+            for(var i = 0; i < rendererCount; i++)_loop(i);
+        });
     };
     _proto._computeLocalBounds = function _computeLocalBounds(skinnedMeshRenderer, mesh, bones, rootBone, inverseBindMatrices) {
         var rootBoneIndex = bones.indexOf(rootBone);
@@ -4631,7 +4631,7 @@ var GLTFSkinParser = /*#__PURE__*/ function(GLTFParser1) {
         var jointCount = joints.length;
         var skin = new Skin(name);
         skin.inverseBindMatrices.length = jointCount;
-        skin._bones.length = jointCount;
+        var bones = new Array(jointCount);
         // parse IBM
         var accessor = glTF.accessors[inverseBindMatrices];
         var skinPromise = GLTFUtils.getAccessorBuffer(context, glTF.bufferViews, accessor).then(function(bufferInfo) {
@@ -4643,21 +4643,20 @@ var GLTFSkinParser = /*#__PURE__*/ function(GLTFParser1) {
                 skin.inverseBindMatrices[i] = inverseBindMatrix;
                 // Get bones
                 var bone = entities[joints[i]];
-                skin._bones[i] = bone;
+                bones[i] = bone;
                 skin.joints[i] = bone.name;
-                // Get skeleton
-                if (skeleton !== undefined) {
-                    var rootBone = entities[skeleton];
-                    skin._rootBone = rootBone;
-                    skin.skeleton = rootBone.name;
+            }
+            skin.bones = bones;
+            // Get skeleton
+            if (skeleton !== undefined) {
+                var rootBone = entities[skeleton];
+                skin.rootBone = rootBone;
+            } else {
+                var rootBone1 = _this._findSkeletonRootBone(joints, entities);
+                if (rootBone1) {
+                    skin.rootBone = rootBone1;
                 } else {
-                    var rootBone1 = _this._findSkeletonRootBone(joints, entities);
-                    if (rootBone1) {
-                        skin._rootBone = rootBone1;
-                        skin.skeleton = rootBone1.name;
-                    } else {
-                        throw "Failed to find skeleton root bone.";
-                    }
+                    throw "Failed to find skeleton root bone.";
                 }
             }
             return skin;