@galacean/engine 1.1.0-beta.4 → 1.1.0-beta.5

package/dist/browser.js

@@ -7477,8 +7477,8 @@
             var _this;
             _this = EngineObject1.call(this, entity.engine) || this;
             /** @internal */ _this._awoken = false;
-            _this._phasedActive = false;
             _this._phasedActiveInScene = false;
+            _this._phasedActive = false;
             _this._enabled = true;
             _this._entity = entity;
             return _this;
@@ -7611,10 +7611,10 @@
     ], Component.prototype, "_awoken", void 0);
     __decorate$1([
         ignoreClone
-    ], Component.prototype, "_phasedActive", void 0);
+    ], Component.prototype, "_phasedActiveInScene", void 0);
     __decorate$1([
         ignoreClone
-    ], Component.prototype, "_phasedActiveInScene", void 0);
+    ], Component.prototype, "_phasedActive", void 0);
     __decorate$1([
         assignmentClone
     ], Component.prototype, "_enabled", void 0);
@@ -17362,16 +17362,31 @@
         };
         var _proto = SceneManager.prototype;
         _proto.addScene = function addScene(indexOrScene, scene) {
+            var scenes = this._scenes;
+            var index;
             if (typeof indexOrScene === "number") {
-                this._scenes.add(indexOrScene, scene);
+                if (indexOrScene < 0 || indexOrScene > scenes.length) {
+                    throw "The index is out of range.";
+                }
+                index = indexOrScene;
             } else {
+                index = scenes.length;
                 scene = indexOrScene;
-                this._scenes.push(scene);
             }
             if (scene.engine !== this.engine) {
                 throw "The scene is not belong to this engine.";
             }
-            scene._processActive(true);
+            if (scene._sceneManager) {
+                var currentIndex = scenes.indexOf(scene);
+                if (currentIndex !== index) {
+                    scenes.removeByIndex(currentIndex);
+                    scenes.add(index, scene);
+                }
+            } else {
+                scene._sceneManager = this;
+                scenes.add(index, scene);
+                scene.isActive && scene._processActive(true);
+            }
         };
         /**
        * Remove scene.
@@ -17382,7 +17397,8 @@
             if (index !== -1) {
                 var removedScene = scenes.getArray()[index];
                 scenes.removeByIndex(index);
-                removedScene._processActive(false);
+                scene._sceneManager = null;
+                removedScene.isActive && removedScene._processActive(false);
             }
         };
         /**
@@ -18574,9 +18590,9 @@
                     oldCollider.removeShape(shape);
                 }
                 this._shapes.push(shape);
-                this.scene.physics._addColliderShape(shape);
                 shape._collider = this;
                 this._nativeCollider.addShape(shape._nativeShape);
+                this._phasedActiveInScene && this.scene.physics._addColliderShape(shape);
             }
         };
         /**
@@ -18586,7 +18602,7 @@
             var index = this._shapes.indexOf(shape);
             if (index !== -1) {
                 this._shapes.splice(index, 1);
-                this.scene.physics._removeColliderShape(shape);
+                this._phasedActiveInScene && this.scene.physics._removeColliderShape(shape);
                 shape._collider = null;
                 this._nativeCollider.removeShape(shape._nativeShape);
             }
@@ -18597,7 +18613,7 @@
             var shapes = this._shapes;
             for(var i = 0, n = shapes.length; i < n; i++){
                 var shape = shapes[i];
-                this.scene.physics._removeColliderShape(shape);
+                this._phasedActiveInScene && this.scene.physics._removeColliderShape(shape);
                 shape._destroy();
                 this._nativeCollider.removeShape(shape._nativeShape);
             }
@@ -18622,12 +18638,22 @@
         /**
        * @internal
        */ _proto._onEnableInScene = function _onEnableInScene() {
-            this.scene.physics._addCollider(this);
+            var physics = this.scene.physics;
+            physics._addCollider(this);
+            var shapes = this.shapes;
+            for(var i = 0, n = shapes.length; i < n; i++){
+                physics._addColliderShape(shapes[i]);
+            }
         };
         /**
        * @internal
        */ _proto._onDisableInScene = function _onDisableInScene() {
-            this.scene.physics._removeCollider(this);
+            var physics = this.scene.physics;
+            physics._removeCollider(this);
+            var shapes = this.shapes;
+            for(var i = 0, n = shapes.length; i < n; i++){
+                physics._removeColliderShape(shapes[i]);
+            }
         };
         /**
        * @internal
@@ -19000,12 +19026,22 @@
         /**
        * @internal
        */ _proto._onEnableInScene = function _onEnableInScene() {
-            this.scene.physics._addCharacterController(this);
+            var physics = this.scene.physics;
+            physics._addCharacterController(this);
+            var shapes = this.shapes;
+            for(var i = 0, n = shapes.length; i < n; i++){
+                physics._addColliderShape(shapes[i]);
+            }
         };
         /**
        * @internal
        */ _proto._onDisableInScene = function _onDisableInScene() {
-            this.scene.physics._removeCharacterController(this);
+            var physics = this.scene.physics;
+            physics._removeCharacterController(this);
+            var shapes = this.shapes;
+            for(var i = 0, n = shapes.length; i < n; i++){
+                physics._removeColliderShape(shapes[i]);
+            }
         };
         _proto._setUpDirection = function _setUpDirection() {
             this._nativeCollider.setUpDirection(this._upDirection);
@@ -21105,10 +21141,6 @@
             magentaMaterial.isGCIgnored = true;
             magentaMaterial.shaderData.setColor("material_BaseColor", new Color(1.0, 0.0, 1.01, 1.0));
             _this._magentaMaterial = magentaMaterial;
-            var backgroundTextureMaterial = new Material(_assert_this_initialized(_this), Shader.find("background-texture"));
-            backgroundTextureMaterial.isGCIgnored = true;
-            backgroundTextureMaterial.renderState.depthState.compareFunction = exports.CompareFunction.LessEqual;
-            _this._backgroundTextureMaterial = backgroundTextureMaterial;
             var innerSettings = _this._settings;
             var colorSpace = configuration.colorSpace || exports.ColorSpace.Linear;
             colorSpace === exports.ColorSpace.Gamma && _this._macroCollection.enable(Engine._gammaMacro);
@@ -21722,6 +21754,7 @@
             this./** @internal */ _textureFillMode = exports.BackgroundTextureFillMode.AspectFitHeight;
             this._texture = null;
             this._initMesh(_engine);
+            this._initMaterial(_engine);
         };
         var _proto = Background.prototype;
         /**
@@ -21729,19 +21762,14 @@
        */ _proto.destroy = function destroy() {
             this._mesh._addReferCount(-1);
             this._mesh = null;
+            this._material._addReferCount(-1);
+            this._material = null;
             this.texture = null;
             this.solidColor = null;
             this.sky.destroy();
         };
         /**
        * @internal
-       * Standalone for CanvasRenderer plugin.
-       */ _proto._initMesh = function _initMesh(engine) {
-            this._mesh = this._createPlane(engine);
-            this._mesh._addReferCount(1);
-        };
-        /**
-       * @internal
        */ _proto._resizeBackgroundTexture = function _resizeBackgroundTexture() {
             if (!this._texture) {
                 return;
@@ -21775,6 +21803,15 @@
             _backgroundTextureMesh.setPositions(positions);
             _backgroundTextureMesh.uploadData(false);
         };
+        _proto._initMesh = function _initMesh(engine) {
+            this._mesh = this._createPlane(engine);
+            this._mesh._addReferCount(1);
+        };
+        _proto._initMaterial = function _initMaterial(engine) {
+            var material = this._material = new Material(engine, Shader.find("background-texture"));
+            material.renderState.depthState.compareFunction = exports.CompareFunction.LessEqual;
+            material._addReferCount(1);
+        };
         _proto._createPlane = function _createPlane(engine) {
             var mesh = new ModelMesh(engine);
             mesh.isGCIgnored = true;
@@ -21814,7 +21851,7 @@
                         (_value = value) == null ? void 0 : _value._addReferCount(1);
                         (_this__texture = this._texture) == null ? void 0 : _this__texture._addReferCount(-1);
                         this._texture = value;
-                        this._engine._backgroundTextureMaterial.shaderData.setTexture("material_BaseTexture", value);
+                        this._material.shaderData.setTexture("material_BaseTexture", value);
                     }
                 }
             },
@@ -22881,6 +22918,7 @@
             _this._fogEnd = 300;
             _this._fogDensity = 0.01;
             _this._fogParams = new Vector4();
+            _this._isActive = true;
             _this.name = name1 || "";
             var shaderData = _this.shaderData;
             shaderData._addReferCount(1);
@@ -23128,6 +23166,24 @@
             this._fogParams.w = density / Math.sqrt(Math.LN2);
         };
         _create_class$3(Scene, [
+            {
+                key: "isActive",
+                get: /**
+       * Whether the scene is active.
+       */ function get() {
+                    return this._isActive;
+                },
+                set: function set(value) {
+                    if (this._isActive !== value) {
+                        this._isActive = value;
+                        if (value) {
+                            this._sceneManager && this._processActive(true);
+                        } else {
+                            this._sceneManager && this._processActive(false);
+                        }
+                    }
+                }
+            },
             {
                 key: "shaderData",
                 get: /**
@@ -23445,7 +23501,11 @@
        * @internal
        */ _proto._onDestroy = function _onDestroy() {
             Component1.prototype._onDestroy.call(this);
-            this.scene._componentsManager.addPendingDestroyScript(this);
+            if (this.scene) {
+                this.scene._componentsManager.addPendingDestroyScript(this);
+            } else {
+                this.onDestroy();
+            }
         };
         return Script;
     }(Component);
@@ -24982,8 +25042,8 @@
         };
         _proto._drawBackgroundTexture = function _drawBackgroundTexture(engine, background) {
             var rhi = engine._hardwareRenderer;
-            var material = engine._backgroundTextureMaterial, canvas = engine.canvas;
-            var mesh = background._mesh;
+            var canvas = engine.canvas;
+            var material = background._material, mesh = background._mesh;
             if ((this._lastCanvasSize.x !== canvas.width || this._lastCanvasSize.y !== canvas.height) && background._textureFillMode !== exports.BackgroundTextureFillMode.Fill) {
                 this._lastCanvasSize.set(canvas.width, canvas.height);
                 background._resizeBackgroundTexture();
@@ -25156,7 +25216,7 @@
             // Use the intersection of the near clipping plane as the origin point.
             var origin = this._innerViewportToWorldPoint(point.x, point.y, 0.0, invViewProjMat, out.origin);
             // Use the intersection of the far clipping plane as the origin point.
-            var direction = this._innerViewportToWorldPoint(point.x, point.y, 1.0, invViewProjMat, out.direction);
+            var direction = this._innerViewportToWorldPoint(point.x, point.y, 1 - MathUtil$1.zeroTolerance, invViewProjMat, out.direction);
             Vector3.subtract(direction, origin, direction);
             direction.normalize();
             return out;
@@ -37439,12 +37499,12 @@
         return _construct.apply(null, arguments);
     }
     var ReflectionParser = /*#__PURE__*/ function() {
-        var ReflectionParser = function ReflectionParser() {};
-        ReflectionParser.registerCustomParseComponent = function registerCustomParseComponent(componentType, handle) {
-            this.customParseComponentHandles[componentType] = handle;
+        var ReflectionParser = function ReflectionParser(_context) {
+            this._context = _context;
         };
-        ReflectionParser.parseEntity = function parseEntity(entityConfig, engine) {
-            return ReflectionParser.getEntityByConfig(entityConfig, engine).then(function(entity) {
+        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;
@@ -37454,72 +37514,29 @@
                 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 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 = 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 _loop(key) {
+                var _this = this, _loop = function _loop(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);
@@ -37527,27 +37544,76 @@
                 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 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() {
@@ -37803,6 +37869,8 @@
             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() {
@@ -37818,7 +37886,7 @@
         var SceneParser = 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);
@@ -37826,22 +37894,24 @@
                 _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++){
@@ -37879,7 +37949,7 @@
                         component = entity.getComponent(Loader.getClass(key));
                     }
                     component = component || entity.addComponent(Loader.getClass(key));
-                    var promise = ReflectionParser.parsePropsAndMethods(component, componentConfig, entity.engine);
+                    var promise = this._reflectionParser.parsePropsAndMethods(component, componentConfig);
                     promises.push(promise);
                 }
             }
@@ -41210,8 +41280,7 @@
                             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;
                     });
@@ -42299,6 +42368,38 @@
             ""
         ])
     ], TextureCubeLoader);
+    var ProjectLoader = /*#__PURE__*/ function(Loader1) {
+        var ProjectLoader = function ProjectLoader() {
+            return Loader1.apply(this, arguments);
+        };
+        _inherits(ProjectLoader, Loader1);
+        var _proto = ProjectLoader.prototype;
+        _proto.load = function load(item, resourceManager) {
+            var _this = this;
+            var engine = resourceManager.engine;
+            return new AssetPromise(function(resolve, reject) {
+                _this.request(item.url, {
+                    type: "json"
+                }).then(function(data) {
+                    // @ts-ignore
+                    engine.resourceManager.initVirtualResources(data.files);
+                    return resourceManager.load({
+                        type: exports.AssetType.Scene,
+                        url: data.scene
+                    }).then(function(scene) {
+                        engine.sceneManager.activeScene = scene;
+                        resolve();
+                    });
+                }).catch(reject);
+            });
+        };
+        return ProjectLoader;
+    }(Loader);
+    ProjectLoader = __decorate([
+        resourceLoader(exports.AssetType.Project, [
+            "proj"
+        ], true)
+    ], ProjectLoader);
     var SceneLoader = /*#__PURE__*/ function(Loader1) {
         var SceneLoader = function SceneLoader() {
             return Loader1.apply(this, arguments);
@@ -42895,7 +42996,7 @@
     ], GALACEAN_animation_event);
 
     //@ts-ignore
-    var version = "1.1.0-beta.4";
+    var version = "1.1.0-beta.5";
     console.log("Galacean engine version: " + version);
     for(var key in CoreObjects){
         Loader.registerClass(key, CoreObjects[key]);