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

package/dist/main.js

@@ -527,12 +527,12 @@ function _construct(Parent, args, Class) {
 }
 
 var ReflectionParser = /*#__PURE__*/ function() {
-    function ReflectionParser() {}
-    ReflectionParser.registerCustomParseComponent = function registerCustomParseComponent(componentType, handle) {
-        this.customParseComponentHandles[componentType] = handle;
-    };
-    ReflectionParser.parseEntity = function parseEntity(entityConfig, engine) {
-        return ReflectionParser.getEntityByConfig(entityConfig, engine).then(function(entity) {
+    function ReflectionParser(_context) {
+        this._context = _context;
+    }
+    var _proto = ReflectionParser.prototype;
+    _proto.parseEntity = function parseEntity(entityConfig) {
+        return this._getEntityByConfig(entityConfig).then(function(entity) {
             var _entityConfig_isActive;
             entity.isActive = (_entityConfig_isActive = entityConfig.isActive) != null ? _entityConfig_isActive : true;
             var position = entityConfig.position, rotation = entityConfig.rotation, scale = entityConfig.scale;
@@ -542,72 +542,29 @@ var ReflectionParser = /*#__PURE__*/ function() {
             return entity;
         });
     };
-    ReflectionParser.getEntityByConfig = function getEntityByConfig(entityConfig, engine) {
-        // @ts-ignore
-        var assetRefId = entityConfig.assetRefId;
-        if (assetRefId) {
-            return engine.resourceManager// @ts-ignore
-            .getResourceByRef({
-                refId: assetRefId,
-                key: entityConfig.key,
-                isClone: entityConfig.isClone
-            }).then(function(entity) {
-                entity.name = entityConfig.name;
-                return entity;
-            });
-        } else {
-            var entity = new engineCore.Entity(engine, entityConfig.name);
-            return Promise.resolve(entity);
-        }
-    };
-    ReflectionParser.parseClassObject = function parseClassObject(item, engine, resourceManager) {
-        if (resourceManager === void 0) resourceManager = engine.resourceManager;
+    _proto.parseClassObject = function parseClassObject(item) {
         var Class = engineCore.Loader.getClass(item.class);
         var _item_constructParams;
         var params = (_item_constructParams = item.constructParams) != null ? _item_constructParams : [];
         var instance = _construct(Class, [].concat(params));
-        return this.parsePropsAndMethods(instance, item, engine, resourceManager);
-    };
-    ReflectionParser.parseBasicType = function parseBasicType(value, engine, resourceManager) {
-        if (resourceManager === void 0) resourceManager = engine.resourceManager;
-        var _this = this;
-        if (Array.isArray(value)) {
-            return Promise.all(value.map(function(item) {
-                return _this.parseBasicType(item, engine, resourceManager);
-            }));
-        } else if (typeof value === "object" && value != null) {
-            if (this._isClass(value)) {
-                // class object
-                return this.parseClassObject(value, engine, resourceManager);
-            } else if (this._isRef(value)) {
-                // reference object
-                return resourceManager.getResourceByRef(value);
-            } else {
-                // basic type
-                return Promise.resolve(value);
-            }
-        } else {
-            return Promise.resolve(value);
-        }
+        return this.parsePropsAndMethods(instance, item);
     };
-    ReflectionParser.parsePropsAndMethods = function parsePropsAndMethods(instance, item, engine, resourceManager) {
-        if (resourceManager === void 0) resourceManager = engine.resourceManager;
-        var _this = this;
+    _proto.parsePropsAndMethods = function parsePropsAndMethods(instance, item) {
         var promises = [];
         if (item.methods) {
             for(var methodName in item.methods){
                 var methodParams = item.methods[methodName];
                 for(var i = 0, count = methodParams.length; i < count; i++){
                     var params = methodParams[i];
-                    var promise = this.parseMethod(instance, methodName, params, engine, resourceManager);
+                    var promise = this.parseMethod(instance, methodName, params);
                     promises.push(promise);
                 }
             }
         }
         if (item.props) {
-            var _this1 = this, _loop = function(key) {
+            var _this = this, _loop = function(key) {
                 var value = item.props[key];
-                var promise = _this1.parseBasicType(value, engine).then(function(v) {
+                var promise = _this.parseBasicType(value).then(function(v) {
                     return instance[key] = v;
                 });
                 promises.push(promise);
@@ -615,27 +572,76 @@ var ReflectionParser = /*#__PURE__*/ function() {
             for(var key in item.props)_loop(key);
         }
         return Promise.all(promises).then(function() {
-            var handle = _this.customParseComponentHandles[instance.constructor.name];
-            if (handle) return handle(instance, item, engine);
+            var handle = ReflectionParser.customParseComponentHandles[instance.constructor.name];
+            if (handle) return handle(instance, item);
             else return instance;
         });
     };
-    ReflectionParser.parseMethod = function parseMethod(instance, methodName, methodParams, engine, resourceManager) {
-        if (resourceManager === void 0) resourceManager = engine.resourceManager;
+    _proto.parseMethod = function parseMethod(instance, methodName, methodParams) {
         var _this = this;
         return Promise.all(methodParams.map(function(param) {
-            return _this.parseBasicType(param, engine, resourceManager);
+            return _this.parseBasicType(param);
         })).then(function(result) {
             var _instance;
             return (_instance = instance)[methodName].apply(_instance, [].concat(result));
         });
     };
+    _proto.parseBasicType = function parseBasicType(value) {
+        var _this = this;
+        if (Array.isArray(value)) {
+            return Promise.all(value.map(function(item) {
+                return _this.parseBasicType(item);
+            }));
+        } else if (typeof value === "object" && value != null) {
+            if (ReflectionParser._isClass(value)) {
+                // class object
+                return this.parseClassObject(value);
+            } else if (ReflectionParser._isAssetRef(value)) {
+                // reference object
+                // @ts-ignore
+                return this._context.resourceManager.getResourceByRef(value);
+            } else if (ReflectionParser._isEntityRef(value)) {
+                // entity reference
+                return Promise.resolve(this._context.entityMap.get(value.entityId));
+            } else {
+                // basic type
+                return Promise.resolve(value);
+            }
+        } else {
+            return Promise.resolve(value);
+        }
+    };
+    _proto._getEntityByConfig = function _getEntityByConfig(entityConfig) {
+        // @ts-ignore
+        var assetRefId = entityConfig.assetRefId;
+        var engine = this._context.engine;
+        if (assetRefId) {
+            return engine.resourceManager// @ts-ignore
+            .getResourceByRef({
+                refId: assetRefId,
+                key: entityConfig.key,
+                isClone: entityConfig.isClone
+            }).then(function(entity) {
+                entity.name = entityConfig.name;
+                return entity;
+            });
+        } else {
+            var entity = new engineCore.Entity(engine, entityConfig.name);
+            return Promise.resolve(entity);
+        }
+    };
+    ReflectionParser.registerCustomParseComponent = function registerCustomParseComponent(componentType, handle) {
+        this.customParseComponentHandles[componentType] = handle;
+    };
     ReflectionParser._isClass = function _isClass(value) {
         return value["class"] != undefined;
     };
-    ReflectionParser._isRef = function _isRef(value) {
+    ReflectionParser._isAssetRef = function _isAssetRef(value) {
         return value["refId"] != undefined;
     };
+    ReflectionParser._isEntityRef = function _isEntityRef(value) {
+        return value["entityId"] != undefined;
+    };
     return ReflectionParser;
 }();
 (function() {
@@ -903,6 +909,8 @@ var SceneParserContext = /*#__PURE__*/ function() {
         this.assets = new Map();
         this.entityConfigMap = new Map();
         this.rootIds = [];
+        this.engine = scene.engine;
+        this.resourceManager = scene.engine.resourceManager;
     }
     var _proto = SceneParserContext.prototype;
     _proto.destroy = function destroy() {
@@ -919,7 +927,7 @@ var SceneParserContext = /*#__PURE__*/ function() {
     function SceneParser(context) {
         var _this = this;
         this.context = context;
-        this._engine = this.context.scene.engine;
+        this._engine = context.scene.engine;
         this._organizeEntities = this._organizeEntities.bind(this);
         this._parseComponents = this._parseComponents.bind(this);
         this._clearAndResolveScene = this._clearAndResolveScene.bind(this);
@@ -927,22 +935,24 @@ var SceneParserContext = /*#__PURE__*/ function() {
             _this._reject = reject;
             _this._resolve = resolve;
         });
+        this._reflectionParser = new ReflectionParser(context);
     }
     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;
-        var engine = this._engine;
+        this._engine;
         var promises = entitiesConfig.map(function(entityConfig) {
             entityConfigMap.set(entityConfig.id, entityConfig);
             // record root entities
             if (!entityConfig.parent) rootIds.push(entityConfig.id);
-            return ReflectionParser.parseEntity(entityConfig, engine);
+            return _this._reflectionParser.parseEntity(entityConfig);
         });
         return Promise.all(promises).then(function(entities) {
             for(var i = 0, l = entities.length; i < l; i++){
@@ -980,7 +990,7 @@ var SceneParserContext = /*#__PURE__*/ function() {
                     component = entity.getComponent(engineCore.Loader.getClass(key));
                 }
                 component = component || entity.addComponent(engineCore.Loader.getClass(key));
-                var promise = ReflectionParser.parsePropsAndMethods(component, componentConfig, entity.engine);
+                var promise = this._reflectionParser.parsePropsAndMethods(component, componentConfig);
                 promises.push(promise);
             }
         }
@@ -4351,8 +4361,7 @@ exports.GLTFTextureParser = (_GLTFTextureParser = /*#__PURE__*/ function(GLTFPar
                         mipmap: (_samplerInfo = samplerInfo) == null ? void 0 : _samplerInfo.mipmap
                     }
                 }).then(function(texture) {
-                    var _texture;
-                    (_texture = texture).name || (_texture.name = textureName || imageName || "texture_" + index);
+                    texture.name = textureName || imageName || texture.name || "texture_" + index;
                     useSampler && GLTFUtils.parseSampler(texture, samplerInfo);
                     return texture;
                 });
@@ -5459,6 +5468,39 @@ 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"
+    ], true)
+], ProjectLoader);
+
 var SceneLoader = /*#__PURE__*/ function(Loader1) {
     _inherits(SceneLoader, Loader1);
     function SceneLoader() {