@galacean/engine-loader 1.2.0-alpha.1 → 1.2.0-alpha.11

package/dist/main.js

@@ -640,8 +640,7 @@ var ReflectionParser = /*#__PURE__*/ function() {
         var assetRefId = entityConfig.assetRefId;
         var engine = this._context.engine;
         if (assetRefId) {
-            return engine.resourceManager// @ts-ignore
-            .getResourceByRef({
+            return engine.resourceManager.getResourceByRef({
                 refId: assetRefId,
                 key: entityConfig.key,
                 isClone: entityConfig.isClone
@@ -672,37 +671,372 @@ var ReflectionParser = /*#__PURE__*/ function() {
     ReflectionParser.customParseComponentHandles = new Map();
 })();
 
-var PrefabParser = /*#__PURE__*/ function() {
-    function PrefabParser() {}
-    PrefabParser.parseChildren = function parseChildren(entitiesConfig, entities, parentId) {
-        var children = entitiesConfig.get(parentId).children;
+/**
+ * Parser context
+ * @export
+ * @abstract
+ * @class ParserContext
+ * @template T
+ * @template I
+ */ var ParserContext = /*#__PURE__*/ function() {
+    function ParserContext(originalData, engine, target) {
+        this.originalData = originalData;
+        this.engine = engine;
+        this.target = target;
+        this.entityMap = new Map();
+        this.components = new Map();
+        this.assets = new Map();
+        this.entityConfigMap = new Map();
+        this.rootIds = [];
+        this.strippedIds = [];
+        this.resourceManager = engine.resourceManager;
+    }
+    var _proto = ParserContext.prototype;
+    /**
+   * Destroy the context.
+   * @abstract
+   * @memberof ParserContext
+   */ _proto.destroy = function destroy() {
+        this.entityMap.clear();
+        this.components.clear();
+        this.assets.clear();
+        this.entityConfigMap.clear();
+        this.rootIds.length = 0;
+    };
+    return ParserContext;
+}();
+
+var PrefabParserContext = /*#__PURE__*/ function(ParserContext1) {
+    _inherits(PrefabParserContext, ParserContext1);
+    function PrefabParserContext() {
+        return ParserContext1.apply(this, arguments);
+    }
+    return PrefabParserContext;
+}(ParserContext);
+
+function _array_like_to_array(arr, len) {
+    if (len == null || len > arr.length) len = arr.length;
+
+    for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i];
+
+    return arr2;
+}
+
+function _unsupported_iterable_to_array(o, minLen) {
+    if (!o) return;
+    if (typeof o === "string") return _array_like_to_array(o, minLen);
+
+    var n = Object.prototype.toString.call(o).slice(8, -1);
+
+    if (n === "Object" && o.constructor) n = o.constructor.name;
+    if (n === "Map" || n === "Set") return Array.from(n);
+    if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _array_like_to_array(o, minLen);
+}
+
+function _create_for_of_iterator_helper_loose(o, allowArrayLike) {
+    var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"];
+
+    if (it) return (it = it.call(o)).next.bind(it);
+    // Fallback for engines without symbol support
+    if (Array.isArray(o) || (it = _unsupported_iterable_to_array(o)) || allowArrayLike && o && typeof o.length === "number") {
+        if (it) o = it;
+
+        var i = 0;
+
+        return function() {
+            if (i >= o.length) return { done: true };
+
+            return { done: false, value: o[i++] };
+        };
+    }
+
+    throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
+}
+
+var HierarchyParser = /*#__PURE__*/ function() {
+    function HierarchyParser(context) {
+        var _this = this;
+        this.context = context;
+        this.prefabContextMap = new WeakMap();
+        this.prefabPromiseMap = new Map();
+        this._engine = this.context.engine;
+        this._organizeEntities = this._organizeEntities.bind(this);
+        this._parseComponents = this._parseComponents.bind(this);
+        this._parsePrefabModification = this._parsePrefabModification.bind(this);
+        this._parsePrefabRemovedEntities = this._parsePrefabRemovedEntities.bind(this);
+        this._parsePrefabRemovedComponents = this._parsePrefabRemovedComponents.bind(this);
+        this._clearAndResolve = this._clearAndResolve.bind(this);
+        this.promise = new Promise(function(resolve, reject) {
+            _this._reject = reject;
+            _this._resolve = resolve;
+        });
+        this._reflectionParser = new ReflectionParser(context);
+    }
+    var _proto = HierarchyParser.prototype;
+    /** start parse the scene or prefab or others */ _proto.start = function start() {
+        this._parseEntities().then(this._organizeEntities).then(this._parseComponents).then(this._parsePrefabModification).then(this._parsePrefabRemovedEntities).then(this._parsePrefabRemovedComponents).then(this._clearAndResolve).then(this._resolve).catch(this._reject);
+    };
+    _proto._parseEntities = function _parseEntities() {
+        var _this = this;
+        var entitiesConfig = this.context.originalData.entities;
+        var entityConfigMap = this.context.entityConfigMap;
+        var entityMap = this.context.entityMap;
+        var engine = this._engine;
+        var promises = entitiesConfig.map(function(entityConfig) {
+            var _entityConfig_strippedId;
+            var id = (_entityConfig_strippedId = entityConfig.strippedId) != null ? _entityConfig_strippedId : entityConfig.id;
+            entityConfig.id = id;
+            entityConfigMap.set(id, entityConfig);
+            return _this._getEntityByConfig(entityConfig, engine);
+        });
+        return Promise.all(promises).then(function(entities) {
+            for(var i = 0, l = entities.length; i < l; i++){
+                entityMap.set(entitiesConfig[i].id, entities[i]);
+            }
+            return entities;
+        });
+    };
+    _proto._parseComponents = function _parseComponents() {
+        var entitiesConfig = this.context.originalData.entities;
+        var entityMap = this.context.entityMap;
+        var components = this.context.components;
+        var promises = [];
+        for(var i = 0, l = entitiesConfig.length; i < l; i++){
+            var entityConfig = entitiesConfig[i];
+            var entity = entityMap.get(entityConfig.id);
+            for(var i1 = 0; i1 < entityConfig.components.length; i1++){
+                var componentConfig = entityConfig.components[i1];
+                var key = !componentConfig.refId ? componentConfig.class : componentConfig.refId;
+                var component = entity.addComponent(engineCore.Loader.getClass(key));
+                components.set(componentConfig.id, component);
+                var promise = this._reflectionParser.parsePropsAndMethods(component, componentConfig);
+                promises.push(promise);
+            }
+        }
+        return Promise.all(promises);
+    };
+    _proto._parsePrefabModification = function _parsePrefabModification() {
+        var _loop = function(i, l) {
+            var _modifications;
+            var entityConfig = entitiesConfig[i];
+            var id = entityConfig.id, modifications = entityConfig.modifications;
+            if ((_modifications = modifications) == null ? void 0 : _modifications.length) {
+                var _promises;
+                var rootEntity = entityMap.get(id);
+                (_promises = promises).push.apply(_promises, [].concat(modifications.map(function(modification) {
+                    var target = modification.target, props = modification.props, methods = modification.methods;
+                    var entityId = target.entityId, componentId = target.componentId;
+                    var context = _this.prefabContextMap.get(rootEntity);
+                    var targetEntity = context.entityMap.get(entityId);
+                    var targetComponent = context.components.get(componentId);
+                    if (targetComponent) {
+                        return _this._reflectionParser.parsePropsAndMethods(targetComponent, {
+                            props: props,
+                            methods: methods
+                        });
+                    } else if (targetEntity) {
+                        return Promise.resolve(_this._applyEntityData(targetEntity, props));
+                    }
+                })));
+            }
+        };
+        var _this = this;
+        var entitiesConfig = this.context.originalData.entities;
+        var entityMap = this.context.entityMap;
+        var promises = [];
+        for(var i = 0, l = entitiesConfig.length; i < l; i++)_loop(i);
+        return Promise.all(promises);
+    };
+    _proto._parsePrefabRemovedEntities = function _parsePrefabRemovedEntities() {
+        var _loop = function(i, l) {
+            var _removedEntities;
+            var entityConfig = entitiesConfig[i];
+            var id = entityConfig.id, removedEntities = entityConfig.removedEntities;
+            if ((_removedEntities = removedEntities) == null ? void 0 : _removedEntities.length) {
+                var _promises;
+                var rootEntity = entityMap.get(id);
+                (_promises = promises).push.apply(_promises, [].concat(removedEntities.map(function(target) {
+                    var entityId = target.entityId;
+                    var context = _this.prefabContextMap.get(rootEntity);
+                    var targetEntity = context.entityMap.get(entityId);
+                    if (targetEntity) {
+                        targetEntity.destroy();
+                    }
+                })));
+            }
+        };
+        var _this = this;
+        var entitiesConfig = this.context.originalData.entities;
+        var entityMap = this.context.entityMap;
+        var promises = [];
+        for(var i = 0, l = entitiesConfig.length; i < l; i++)_loop(i);
+        return Promise.all(promises);
+    };
+    _proto._parsePrefabRemovedComponents = function _parsePrefabRemovedComponents() {
+        var _loop = function(i, l) {
+            var _removedComponents;
+            var entityConfig = entitiesConfig[i];
+            var id = entityConfig.id, removedComponents = entityConfig.removedComponents;
+            if ((_removedComponents = removedComponents) == null ? void 0 : _removedComponents.length) {
+                var _promises;
+                var rootEntity = entityMap.get(id);
+                (_promises = promises).concat.apply(_promises, [].concat(removedComponents.map(function(target) {
+                    var componentId = target.componentId;
+                    var context = _this.prefabContextMap.get(rootEntity);
+                    var targetComponent = context.components.get(componentId);
+                    if (targetComponent) {
+                        targetComponent.destroy();
+                    }
+                })));
+            }
+        };
+        var _this = this;
+        var entitiesConfig = this.context.originalData.entities;
+        var entityMap = this.context.entityMap;
+        var promises = [];
+        for(var i = 0, l = entitiesConfig.length; i < l; i++)_loop(i);
+        return Promise.all(promises);
+    };
+    _proto._clearAndResolve = function _clearAndResolve() {
+        var target = this.context.target;
+        return target;
+    };
+    _proto._organizeEntities = function _organizeEntities() {
+        var _this_context = this.context, rootIds = _this_context.rootIds, strippedIds = _this_context.strippedIds;
+        var parentIds = rootIds.concat(strippedIds);
+        for(var _iterator = _create_for_of_iterator_helper_loose(parentIds), _step; !(_step = _iterator()).done;){
+            var parentId = _step.value;
+            this._parseChildren(parentId);
+        }
+        for(var i = 0; i < rootIds.length; i++){
+            this.handleRootEntity(rootIds[i]);
+        }
+    };
+    _proto._getEntityByConfig = function _getEntityByConfig(entityConfig, engine) {
+        var _this = this;
+        var entityPromise;
+        if (entityConfig.assetRefId) {
+            entityPromise = this._parseGLTF(entityConfig, engine);
+        } else if (entityConfig.strippedId) {
+            entityPromise = this._parseStrippedEntity(entityConfig);
+        } else {
+            entityPromise = this._parseEntity(entityConfig, engine);
+        }
+        return entityPromise.then(function(entity) {
+            return _this._applyEntityData(entity, entityConfig);
+        });
+    };
+    _proto._parseEntity = function _parseEntity(entityConfig, engine) {
+        var entity = new engineCore.Entity(engine, entityConfig.name);
+        if (!entityConfig.parent) this.context.rootIds.push(entityConfig.id);
+        return Promise.resolve(entity);
+    };
+    _proto._parseGLTF = function _parseGLTF(entityConfig, engine) {
+        var _this = this;
+        var assetRefId = entityConfig.assetRefId;
+        var context = new ParserContext(null, engine);
+        return engine.resourceManager// @ts-ignore
+        .getResourceByRef({
+            refId: assetRefId
+        }).then(function(glTFResource) {
+            var entity = glTFResource.instantiateSceneRoot();
+            if (!entityConfig.parent) _this.context.rootIds.push(entityConfig.id);
+            _this._traverseAddEntityToMap(entity, context, "");
+            _this.prefabContextMap.set(entity, context);
+            var cbArray = _this.prefabPromiseMap.get(entityConfig.id);
+            cbArray && cbArray.forEach(function(cb) {
+                cb.resolve(context);
+            });
+            return entity;
+        });
+    };
+    _proto._parseStrippedEntity = function _parseStrippedEntity(entityConfig) {
+        var _this = this;
+        this.context.strippedIds.push(entityConfig.id);
+        return new Promise(function(resolve, reject) {
+            var _this_prefabPromiseMap_get;
+            var cbArray = (_this_prefabPromiseMap_get = _this.prefabPromiseMap.get(entityConfig.prefabInstanceId)) != null ? _this_prefabPromiseMap_get : [];
+            cbArray.push({
+                resolve: resolve,
+                reject: reject
+            });
+            _this.prefabPromiseMap.set(entityConfig.prefabInstanceId, cbArray);
+        }).then(function(context) {
+            var entityId = entityConfig.prefabSource.entityId;
+            return context.entityMap.get(entityId);
+        });
+    };
+    _proto._parseChildren = function _parseChildren(parentId) {
+        var _this_context = this.context, entityConfigMap = _this_context.entityConfigMap, entityMap = _this_context.entityMap;
+        var children = entityConfigMap.get(parentId).children;
         if (children && children.length > 0) {
-            var parent = entities.get(parentId);
+            var parent = entityMap.get(parentId);
             for(var i = 0; i < children.length; i++){
                 var childId = children[i];
-                var entity = entities.get(childId);
+                var entity = entityMap.get(childId);
                 parent.addChild(entity);
-                this.parseChildren(entitiesConfig, entities, childId);
+                this._parseChildren(childId);
             }
         }
     };
-    return PrefabParser;
+    _proto._applyEntityData = function _applyEntityData(entity, entityConfig) {
+        if (entityConfig === void 0) entityConfig = {};
+        var _entityConfig_isActive;
+        entity.isActive = (_entityConfig_isActive = entityConfig.isActive) != null ? _entityConfig_isActive : entity.isActive;
+        var _entityConfig_name;
+        entity.name = (_entityConfig_name = entityConfig.name) != null ? _entityConfig_name : entity.name;
+        var position = entityConfig.position, rotation = entityConfig.rotation, scale = entityConfig.scale;
+        if (position) entity.transform.position.copyFrom(position);
+        if (rotation) entity.transform.rotation.copyFrom(rotation);
+        if (scale) entity.transform.scale.copyFrom(scale);
+        return entity;
+    };
+    _proto._traverseAddEntityToMap = function _traverseAddEntityToMap(entity, context, path) {
+        var entityMap = context.entityMap, components = context.components;
+        var componentsMap = {};
+        var componentIndexMap = {};
+        entityMap.set(path, entity);
+        // @ts-ignore
+        entity._components.forEach(function(component) {
+            // @ts-ignore
+            var name = engineCore.Loader.getClassName(component.constructor);
+            if (!componentsMap[name]) {
+                componentsMap[name] = entity.getComponents(component.constructor, []);
+                componentIndexMap[name] = 0;
+            }
+            components.set(path + ":" + name + "/" + componentIndexMap[name]++, component);
+        });
+        for(var i = 0, n = entity.children.length; i < n; i++){
+            var child = entity.children[i];
+            var childPath = path ? path + "/" + i : "" + i;
+            this._traverseAddEntityToMap(child, context, childPath);
+        }
+    };
+    return HierarchyParser;
 }();
 
-var ComponentMap = {
-    Transform: engineCore.Transform,
-    Animator: engineCore.Animator,
-    DirectLight: engineCore.DirectLight,
-    Camera: engineCore.Camera,
-    MeshRenderer: engineCore.MeshRenderer,
-    ParticleRenderer: engineCore.ParticleRenderer,
-    PointLight: engineCore.PointLight,
-    SpotLight: engineCore.SpotLight,
-    Script: engineCore.Script,
-    SpriteMask: engineCore.SpriteMask,
-    SpriteRenderer: engineCore.SpriteRenderer,
-    TextRenderer: engineCore.TextRenderer
-};
+var PrefabParser = /*#__PURE__*/ function(HierarchyParser1) {
+    _inherits(PrefabParser, HierarchyParser1);
+    function PrefabParser() {
+        return HierarchyParser1.apply(this, arguments);
+    }
+    var _proto = PrefabParser.prototype;
+    _proto.handleRootEntity = function handleRootEntity(id) {
+        this.context.target = this.context.entityMap.get(id);
+    };
+    /**
+   * Parse prefab data.
+   * @param engine - the engine of the parser context
+   * @param prefabData - prefab data which is exported by editor
+   * @returns a promise of prefab
+   */ PrefabParser.parse = function parse(engine, prefabData) {
+        var context = new PrefabParserContext(prefabData, engine);
+        var parser = new PrefabParser(context);
+        parser.start();
+        return parser;
+    };
+    return PrefabParser;
+}(HierarchyParser);
 
 exports.InterpolableValueType = void 0;
 (function(InterpolableValueType) {
@@ -736,7 +1070,7 @@ exports.AnimationClipDecoder = /*#__PURE__*/ function() {
             for(var i1 = 0; i1 < curveBindingsLen; ++i1){
                 var relativePath = bufferReader.nextStr();
                 var componentStr = bufferReader.nextStr();
-                var componentType = ComponentMap[componentStr];
+                var componentType = engineCore.Loader.getClass(componentStr);
                 var property = bufferReader.nextStr();
                 var getProperty = bufferReader.nextStr();
                 var curve = void 0;
@@ -915,145 +1249,28 @@ exports.SpecularMode = void 0;
     SpecularMode["Custom"] = "Custom";
 })(exports.SpecularMode || (exports.SpecularMode = {}));
 
-function _array_like_to_array(arr, len) {
-    if (len == null || len > arr.length) len = arr.length;
-
-    for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i];
-
-    return arr2;
-}
-
-function _unsupported_iterable_to_array(o, minLen) {
-    if (!o) return;
-    if (typeof o === "string") return _array_like_to_array(o, minLen);
-
-    var n = Object.prototype.toString.call(o).slice(8, -1);
-
-    if (n === "Object" && o.constructor) n = o.constructor.name;
-    if (n === "Map" || n === "Set") return Array.from(n);
-    if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _array_like_to_array(o, minLen);
-}
-
-function _create_for_of_iterator_helper_loose(o, allowArrayLike) {
-    var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"];
-
-    if (it) return (it = it.call(o)).next.bind(it);
-    // Fallback for engines without symbol support
-    if (Array.isArray(o) || (it = _unsupported_iterable_to_array(o)) || allowArrayLike && o && typeof o.length === "number") {
-        if (it) o = it;
-
-        var i = 0;
-
-        return function() {
-            if (i >= o.length) return { done: true };
-
-            return { done: false, value: o[i++] };
-        };
-    }
-
-    throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
-}
-
-var SceneParserContext = /*#__PURE__*/ function() {
-    function SceneParserContext(originalData, scene) {
-        this.originalData = originalData;
-        this.scene = scene;
-        this.entityMap = new Map();
-        this.components = new Map();
-        this.assets = new Map();
-        this.entityConfigMap = new Map();
-        this.rootIds = [];
-        this.engine = scene.engine;
-        this.resourceManager = scene.engine.resourceManager;
+var SceneParserContext = /*#__PURE__*/ function(ParserContext1) {
+    _inherits(SceneParserContext, ParserContext1);
+    function SceneParserContext(originalData, engine, scene) {
+        var _this;
+        _this = ParserContext1.call(this, originalData, engine, scene) || this;
+        _this.originalData = originalData;
+        _this.engine = engine;
+        _this.scene = scene;
+        return _this;
     }
-    var _proto = SceneParserContext.prototype;
-    _proto.destroy = function destroy() {
-        this.entityMap.clear();
-        this.components.clear();
-        this.assets.clear();
-        this.entityConfigMap.clear();
-        this.rootIds.length = 0;
-    };
     return SceneParserContext;
-}();
+}(ParserContext);
 
-/** @Internal */ var SceneParser = /*#__PURE__*/ function() {
-    function SceneParser(context) {
-        var _this = this;
-        this.context = context;
-        this._engine = context.scene.engine;
-        this._organizeEntities = this._organizeEntities.bind(this);
-        this._parseComponents = this._parseComponents.bind(this);
-        this._clearAndResolveScene = this._clearAndResolveScene.bind(this);
-        this.promise = new Promise(function(resolve, reject) {
-            _this._reject = reject;
-            _this._resolve = resolve;
-        });
-        this._reflectionParser = new ReflectionParser(context);
+/** @Internal */ var SceneParser = /*#__PURE__*/ function(HierarchyParser1) {
+    _inherits(SceneParser, HierarchyParser1);
+    function SceneParser() {
+        return HierarchyParser1.apply(this, arguments);
     }
     var _proto = SceneParser.prototype;
-    /** start parse the scene */ _proto.start = function start() {
-        this._parseEntities().then(this._organizeEntities).then(this._parseComponents).then(this._clearAndResolveScene).then(this._resolve).catch(this._reject);
-    };
-    _proto._parseEntities = function _parseEntities() {
-        var _this = this;
-        var entitiesConfig = this.context.originalData.entities;
-        var entityConfigMap = this.context.entityConfigMap;
-        var entitiesMap = this.context.entityMap;
-        var rootIds = this.context.rootIds;
-        this._engine;
-        var promises = entitiesConfig.map(function(entityConfig) {
-            entityConfigMap.set(entityConfig.id, entityConfig);
-            // record root entities
-            if (!entityConfig.parent) rootIds.push(entityConfig.id);
-            return _this._reflectionParser.parseEntity(entityConfig);
-        });
-        return Promise.all(promises).then(function(entities) {
-            for(var i = 0, l = entities.length; i < l; i++){
-                entitiesMap.set(entitiesConfig[i].id, entities[i]);
-            }
-            return entities;
-        });
-    };
-    _proto._organizeEntities = function _organizeEntities() {
-        var _this_context = this.context, entityConfigMap = _this_context.entityConfigMap, entityMap = _this_context.entityMap, scene = _this_context.scene, rootIds = _this_context.rootIds;
-        for(var _iterator = _create_for_of_iterator_helper_loose(rootIds), _step; !(_step = _iterator()).done;){
-            var rootId = _step.value;
-            PrefabParser.parseChildren(entityConfigMap, entityMap, rootId);
-        }
-        var rootEntities = rootIds.map(function(id) {
-            return entityMap.get(id);
-        });
-        for(var i = 0; i < rootEntities.length; i++){
-            scene.addRootEntity(rootEntities[i]);
-        }
-    };
-    _proto._parseComponents = function _parseComponents() {
-        var entitiesConfig = this.context.originalData.entities;
-        var entityMap = this.context.entityMap;
-        var promises = [];
-        for(var i = 0, l = entitiesConfig.length; i < l; i++){
-            var entityConfig = entitiesConfig[i];
-            var entity = entityMap.get(entityConfig.id);
-            for(var i1 = 0; i1 < entityConfig.components.length; i1++){
-                var componentConfig = entityConfig.components[i1];
-                var key = !componentConfig.refId ? componentConfig.class : componentConfig.refId;
-                var component = void 0;
-                // TODO: remove hack code when support additional edit
-                if (key === "Animator") {
-                    component = entity.getComponent(engineCore.Loader.getClass(key));
-                }
-                component = component || entity.addComponent(engineCore.Loader.getClass(key));
-                var promise = this._reflectionParser.parsePropsAndMethods(component, componentConfig);
-                promises.push(promise);
-            }
-        }
-        return Promise.all(promises);
-    };
-    _proto._clearAndResolveScene = function _clearAndResolveScene() {
-        var scene = this.context.scene;
-        this.context.destroy();
-        return scene;
+    _proto.handleRootEntity = function handleRootEntity(id) {
+        var _this_context = this.context, target = _this_context.target, entityMap = _this_context.entityMap;
+        target.addRootEntity(entityMap.get(id));
     };
     /**
    * Parse scene data.
@@ -1062,13 +1279,13 @@ var SceneParserContext = /*#__PURE__*/ function() {
    * @returns a promise of scene
    */ SceneParser.parse = function parse(engine, sceneData) {
         var scene = new engineCore.Scene(engine);
-        var context = new SceneParserContext(sceneData, scene);
+        var context = new SceneParserContext(sceneData, engine, scene);
         var parser = new SceneParser(context);
         parser.start();
         return parser.promise;
     };
     return SceneParser;
-}();
+}(HierarchyParser);
 
 exports.MeshLoader = /*#__PURE__*/ function(Loader1) {
     _inherits(MeshLoader, Loader1);
@@ -1173,7 +1390,7 @@ var AnimationClipLoader = /*#__PURE__*/ function(Loader1) {
                 resourceManager// @ts-ignore
                 .getResourceByRef(value).then(function(asset) {
                     keyframe.value = asset;
-                    resolve(keyframe);
+                    resolve(keyframe.value);
                 });
             });
         } else {
@@ -2185,7 +2402,7 @@ function registerGLTFParser(pipeline) {
     };
     /**
    * Parse the glb format.
-   */ GLTFUtils.parseGLB = function parseGLB(context, glb) {
+   */ GLTFUtils.parseGLB = function parseGLB(context, originBuffer) {
         var UINT32_LENGTH = 4;
         var GLB_HEADER_MAGIC = 0x46546c67; // 'glTF'
         var GLB_HEADER_LENGTH = 12;
@@ -2193,7 +2410,7 @@ function registerGLTFParser(pipeline) {
             JSON: 0x4e4f534a,
             BIN: 0x004e4942
         };
-        var dataView = new DataView(glb);
+        var dataView = new DataView(originBuffer);
         // read header
         var header = {
             magic: dataView.getUint32(0, true),
@@ -2201,8 +2418,9 @@ function registerGLTFParser(pipeline) {
             length: dataView.getUint32(2 * UINT32_LENGTH, true)
         };
         if (header.magic !== GLB_HEADER_MAGIC) {
-            console.error("Invalid glb magic number. Expected 0x46546C67, found 0x" + header.magic.toString(16));
-            return null;
+            return {
+                originBuffer: originBuffer
+            };
         }
         // read main data
         var chunkLength = dataView.getUint32(GLB_HEADER_LENGTH, true);
@@ -2212,7 +2430,7 @@ function registerGLTFParser(pipeline) {
             console.error("Invalid glb chunk type. Expected 0x4E4F534A, found 0x" + chunkType.toString(16));
             return null;
         }
-        var glTFData = new Uint8Array(glb, GLB_HEADER_LENGTH + 2 * UINT32_LENGTH, chunkLength);
+        var glTFData = new Uint8Array(originBuffer, GLB_HEADER_LENGTH + 2 * UINT32_LENGTH, chunkLength);
         var glTF = JSON.parse(engineCore.Utils.decodeText(glTFData));
         // read all buffers
         var buffers = [];
@@ -2226,7 +2444,7 @@ function registerGLTFParser(pipeline) {
                 return null;
             }
             var currentOffset = byteOffset + 2 * UINT32_LENGTH;
-            var buffer = glb.slice(currentOffset, currentOffset + chunkLength);
+            var buffer = originBuffer.slice(currentOffset, currentOffset + chunkLength);
             buffers.push(buffer);
             restoreGLBBufferSlice.push(new engineMath.Vector2(currentOffset, chunkLength));
             byteOffset += chunkLength + 2 * UINT32_LENGTH;
@@ -3640,23 +3858,20 @@ exports.GLTFSchemaParser = /*#__PURE__*/ function(GLTFParser1) {
         var requestConfig = {
             type: "arraybuffer"
         };
-        var isGLB = this._isGLB(url);
-        contentRestorer.isGLB = isGLB;
-        var promise = isGLB ? engineCore.request(url, requestConfig).onProgress(undefined, context._onTaskDetail).then(function(glb) {
+        return engineCore.request(url, requestConfig).onProgress(undefined, context._onTaskDetail).then(function(buffer) {
             restoreBufferRequests.push(new BufferRequestInfo(url, requestConfig));
-            return GLTFUtils.parseGLB(context, glb);
-        }).then(function(param) {
-            var glTF = param.glTF, buffers = param.buffers;
-            context.buffers = buffers;
-            return glTF;
-        }) : engineCore.request(url, {
-            type: "json"
-        }).onProgress(undefined, context._onTaskDetail);
-        return promise;
-    };
-    _proto._isGLB = function _isGLB(url) {
-        var index = url.lastIndexOf(".");
-        return url.substring(index + 1, index + 4) === "glb";
+            return GLTFUtils.parseGLB(context, buffer);
+        }).then(function(result) {
+            var _result;
+            if ((_result = result) == null ? void 0 : _result.glTF) {
+                contentRestorer.isGLB = true;
+                context.buffers = result.buffers;
+                return result.glTF;
+            } else {
+                contentRestorer.isGLB = false;
+                return JSON.parse(engineCore.Utils.decodeText(new Uint8Array(result.originBuffer)));
+            }
+        });
     };
     return GLTFSchemaParser;
 }(GLTFParser);
@@ -5628,6 +5843,86 @@ MeshLoader = __decorate([
     ])
 ], MeshLoader);
 
+var PrimitiveMeshLoader = /*#__PURE__*/ function(Loader1) {
+    _inherits(PrimitiveMeshLoader, Loader1);
+    function PrimitiveMeshLoader() {
+        return Loader1.apply(this, arguments);
+    }
+    var _proto = PrimitiveMeshLoader.prototype;
+    _proto.load = function load(item, param) {
+        var engine = param.engine;
+        return this.request(item.url, _extends({}, item, {
+            type: "json"
+        })).then(function(data) {
+            switch(data.type){
+                case "sphere":
+                    return engineCore.PrimitiveMesh.createSubdivisionSurfaceSphere(engine, data.sphereRadius, data.sphereStep);
+                case "capsule":
+                    return engineCore.PrimitiveMesh.createCapsule(engine, data.capsuleRadius, data.capsuleHeight, data.capsuleRadialSegments, data.capsuleHeightSegments);
+                case "cone":
+                    return engineCore.PrimitiveMesh.createCone(engine, data.coneRadius, data.coneHeight, data.coneRadialSegment, data.coneHeightSegment);
+                case "cuboid":
+                    return engineCore.PrimitiveMesh.createCuboid(engine, data.cuboidWidth, data.cuboidHeight, data.cuboidDepth);
+                case "cylinder":
+                    return engineCore.PrimitiveMesh.createCylinder(engine, data.cylinderRadiusTop, data.cylinderRadiusBottom, data.cylinderHeight, data.cylinderRadialSegment, data.cylinderHeightSegment);
+                case "plane":
+                    return engineCore.PrimitiveMesh.createPlane(engine, data.planeWidth, data.planeHeight, data.planeHorizontalSegments, data.planeVerticalSegments);
+                case "torus":
+                    return engineCore.PrimitiveMesh.createTorus(engine, data.torusRadius, data.torusTubeRadius, data.torusRadialSegments, data.torusTubularSegments, data.torusArc);
+            }
+        });
+    };
+    return PrimitiveMeshLoader;
+}(engineCore.Loader);
+PrimitiveMeshLoader = __decorate([
+    engineCore.resourceLoader(engineCore.AssetType.PrimitiveMesh, [
+        "mesh"
+    ], false)
+], PrimitiveMeshLoader);
+var /** @internal */ PrimitiveMeshType;
+(function(PrimitiveMeshType) {
+    PrimitiveMeshType["Sphere"] = "sphere";
+    PrimitiveMeshType["Cuboid"] = "cuboid";
+    PrimitiveMeshType["Plane"] = "plane";
+    PrimitiveMeshType["Cylinder"] = "cylinder";
+    PrimitiveMeshType["Torus"] = "torus";
+    PrimitiveMeshType["Cone"] = "cone";
+    PrimitiveMeshType["Capsule"] = "capsule";
+})(PrimitiveMeshType || (PrimitiveMeshType = {}));
+
+var ProjectLoader = /*#__PURE__*/ function(Loader1) {
+    _inherits(ProjectLoader, Loader1);
+    function ProjectLoader() {
+        return Loader1.apply(this, arguments);
+    }
+    var _proto = ProjectLoader.prototype;
+    _proto.load = function load(item, resourceManager) {
+        var _this = this;
+        var engine = resourceManager.engine;
+        return new engineCore.AssetPromise(function(resolve, reject) {
+            _this.request(item.url, {
+                type: "json"
+            }).then(function(data) {
+                // @ts-ignore
+                engine.resourceManager.initVirtualResources(data.files);
+                return resourceManager.load({
+                    type: engineCore.AssetType.Scene,
+                    url: data.scene
+                }).then(function(scene) {
+                    engine.sceneManager.activeScene = scene;
+                    resolve();
+                });
+            }).catch(reject);
+        });
+    };
+    return ProjectLoader;
+}(engineCore.Loader);
+ProjectLoader = __decorate([
+    engineCore.resourceLoader(engineCore.AssetType.Project, [
+        "proj"
+    ], false)
+], ProjectLoader);
+
 var SourceFontLoader = /*#__PURE__*/ function(Loader1) {
     _inherits(SourceFontLoader, Loader1);
     function SourceFontLoader() {
@@ -5963,39 +6258,6 @@ TextureCubeLoader = __decorate([
     ])
 ], TextureCubeLoader);
 
-var ProjectLoader = /*#__PURE__*/ function(Loader1) {
-    _inherits(ProjectLoader, Loader1);
-    function ProjectLoader() {
-        return Loader1.apply(this, arguments);
-    }
-    var _proto = ProjectLoader.prototype;
-    _proto.load = function load(item, resourceManager) {
-        var _this = this;
-        var engine = resourceManager.engine;
-        return new engineCore.AssetPromise(function(resolve, reject) {
-            _this.request(item.url, {
-                type: "json"
-            }).then(function(data) {
-                // @ts-ignore
-                engine.resourceManager.initVirtualResources(data.files);
-                return resourceManager.load({
-                    type: engineCore.AssetType.Scene,
-                    url: data.scene
-                }).then(function(scene) {
-                    engine.sceneManager.activeScene = scene;
-                    resolve();
-                });
-            }).catch(reject);
-        });
-    };
-    return ProjectLoader;
-}(engineCore.Loader);
-ProjectLoader = __decorate([
-    engineCore.resourceLoader(engineCore.AssetType.Project, [
-        "proj"
-    ], false)
-], ProjectLoader);
-
 var SceneLoader = /*#__PURE__*/ function(Loader1) {
     _inherits(SceneLoader, Loader1);
     function SceneLoader() {
@@ -6014,7 +6276,7 @@ var SceneLoader = /*#__PURE__*/ function(Loader1) {
                     // parse ambient light
                     var ambient = data.scene.ambient;
                     if (ambient) {
-                        var useCustomAmbient = ambient.specularMode === "Custom";
+                        var useCustomAmbient = ambient.specularMode === exports.SpecularMode.Custom;
                         var useSH = ambient.diffuseMode === engineCore.DiffuseMode.SphericalHarmonics;
                         scene.ambientLight.diffuseIntensity = ambient.diffuseIntensity;
                         scene.ambientLight.specularIntensity = ambient.specularIntensity;
@@ -6085,6 +6347,8 @@ var SceneLoader = /*#__PURE__*/ function(Loader1) {
                         var _shadow_shadowTwoCascadeSplits;
                         scene.shadowTwoCascadeSplits = (_shadow_shadowTwoCascadeSplits = shadow.shadowTwoCascadeSplits) != null ? _shadow_shadowTwoCascadeSplits : scene.shadowTwoCascadeSplits;
                         shadow.shadowFourCascadeSplits && scene.shadowFourCascadeSplits.copyFrom(shadow.shadowFourCascadeSplits);
+                        var _shadow_shadowFadeBorder;
+                        scene.shadowFadeBorder = (_shadow_shadowFadeBorder = shadow.shadowFadeBorder) != null ? _shadow_shadowFadeBorder : scene.shadowFadeBorder;
                     }
                     return Promise.all(promises).then(function() {
                         resolve(scene);
@@ -6488,12 +6752,12 @@ KHR_materials_anisotropy = __decorate([
 ], KHR_materials_anisotropy);
 
 exports.BufferInfo = BufferInfo;
-exports.ComponentMap = ComponentMap;
 exports.GLTFExtensionParser = GLTFExtensionParser;
 exports.GLTFParser = GLTFParser;
 exports.GLTFParserContext = GLTFParserContext;
 exports.GLTFResource = GLTFResource;
 exports.GLTFUtils = GLTFUtils;
+exports.ParserContext = ParserContext;
 exports.PrefabParser = PrefabParser;
 exports.ReflectionParser = ReflectionParser;
 exports.SceneParser = SceneParser;