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

package/dist/miniprogram.js

@@ -2542,8 +2542,8 @@ var ActiveChangeFlag;
         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;
@@ -2675,10 +2675,10 @@ __decorate([
 ], Component.prototype, "_awoken", void 0);
 __decorate([
     ignoreClone
-], Component.prototype, "_phasedActive", void 0);
+], Component.prototype, "_phasedActiveInScene", void 0);
 __decorate([
     ignoreClone
-], Component.prototype, "_phasedActiveInScene", void 0);
+], Component.prototype, "_phasedActive", void 0);
 __decorate([
     assignmentClone
 ], Component.prototype, "_enabled", void 0);
@@ -12592,16 +12592,31 @@ var SafeLoopArray = /*#__PURE__*/ function() {
     }
     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.
@@ -12612,7 +12627,8 @@ var SafeLoopArray = /*#__PURE__*/ function() {
         if (index !== -1) {
             var removedScene = scenes.getArray()[index];
             scenes.removeByIndex(index);
-            removedScene._processActive(false);
+            scene._sceneManager = null;
+            removedScene.isActive && removedScene._processActive(false);
         }
     };
     /**
@@ -13816,9 +13832,9 @@ exports.Collider = /*#__PURE__*/ function(Component1) {
                 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);
         }
     };
     /**
@@ -13828,7 +13844,7 @@ exports.Collider = /*#__PURE__*/ function(Component1) {
         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);
         }
@@ -13839,7 +13855,7 @@ exports.Collider = /*#__PURE__*/ function(Component1) {
         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);
         }
@@ -13864,12 +13880,22 @@ exports.Collider = /*#__PURE__*/ function(Component1) {
     /**
    * @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
@@ -14247,12 +14273,22 @@ var Collision = function Collision() {
     /**
    * @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);
@@ -16404,10 +16440,6 @@ ShaderPool.init();
         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);
@@ -17025,6 +17057,7 @@ ShaderPool.init();
         this./** @internal */ _textureFillMode = exports.BackgroundTextureFillMode.AspectFitHeight;
         this._texture = null;
         this._initMesh(_engine);
+        this._initMaterial(_engine);
     }
     var _proto = Background.prototype;
     /**
@@ -17032,19 +17065,14 @@ ShaderPool.init();
    */ _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;
@@ -17078,6 +17106,15 @@ ShaderPool.init();
         _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;
@@ -17117,7 +17154,7 @@ ShaderPool.init();
                     (_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);
                 }
             }
         },
@@ -18197,6 +18234,7 @@ __decorate([
         _this._fogEnd = 300;
         _this._fogDensity = 0.01;
         _this._fogParams = new miniprogram.Vector4();
+        _this._isActive = true;
         _this.name = name || "";
         var shaderData = _this.shaderData;
         shaderData._addReferCount(1);
@@ -18444,6 +18482,24 @@ __decorate([
         this._fogParams.w = density / Math.sqrt(Math.LN2);
     };
     _create_class(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: /**
@@ -18762,7 +18818,11 @@ __decorate([
    * @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);
@@ -20312,8 +20372,8 @@ var /**
     };
     _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();
@@ -20488,7 +20548,7 @@ exports.Camera = (_Camera = /*#__PURE__*/ function(Component1) {
         // 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 - miniprogram.MathUtil.zeroTolerance, invViewProjMat, out.direction);
         miniprogram.Vector3.subtract(direction, origin, direction);
         direction.normalize();
         return out;

package/dist/module.js

@@ -2537,8 +2537,8 @@ var ActiveChangeFlag;
         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;
@@ -2670,10 +2670,10 @@ __decorate([
 ], Component.prototype, "_awoken", void 0);
 __decorate([
     ignoreClone
-], Component.prototype, "_phasedActive", void 0);
+], Component.prototype, "_phasedActiveInScene", void 0);
 __decorate([
     ignoreClone
-], Component.prototype, "_phasedActiveInScene", void 0);
+], Component.prototype, "_phasedActive", void 0);
 __decorate([
     assignmentClone
 ], Component.prototype, "_enabled", void 0);
@@ -12587,16 +12587,31 @@ var SafeLoopArray = /*#__PURE__*/ function() {
     }
     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.
@@ -12607,7 +12622,8 @@ var SafeLoopArray = /*#__PURE__*/ function() {
         if (index !== -1) {
             var removedScene = scenes.getArray()[index];
             scenes.removeByIndex(index);
-            removedScene._processActive(false);
+            scene._sceneManager = null;
+            removedScene.isActive && removedScene._processActive(false);
         }
     };
     /**
@@ -13811,9 +13827,9 @@ var Collider = /*#__PURE__*/ function(Component1) {
                 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);
         }
     };
     /**
@@ -13823,7 +13839,7 @@ var Collider = /*#__PURE__*/ function(Component1) {
         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);
         }
@@ -13834,7 +13850,7 @@ var Collider = /*#__PURE__*/ function(Component1) {
         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);
         }
@@ -13859,12 +13875,22 @@ var Collider = /*#__PURE__*/ function(Component1) {
     /**
    * @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
@@ -14242,12 +14268,22 @@ var Collision = function Collision() {
     /**
    * @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);
@@ -16399,10 +16435,6 @@ ShaderPool.init();
         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 = CompareFunction.LessEqual;
-        _this._backgroundTextureMaterial = backgroundTextureMaterial;
         var innerSettings = _this._settings;
         var colorSpace = configuration.colorSpace || ColorSpace.Linear;
         colorSpace === ColorSpace.Gamma && _this._macroCollection.enable(Engine._gammaMacro);
@@ -17020,6 +17052,7 @@ ShaderPool.init();
         this./** @internal */ _textureFillMode = BackgroundTextureFillMode.AspectFitHeight;
         this._texture = null;
         this._initMesh(_engine);
+        this._initMaterial(_engine);
     }
     var _proto = Background.prototype;
     /**
@@ -17027,19 +17060,14 @@ ShaderPool.init();
    */ _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;
@@ -17073,6 +17101,15 @@ ShaderPool.init();
         _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 = CompareFunction.LessEqual;
+        material._addReferCount(1);
+    };
     _proto._createPlane = function _createPlane(engine) {
         var mesh = new ModelMesh(engine);
         mesh.isGCIgnored = true;
@@ -17112,7 +17149,7 @@ ShaderPool.init();
                     (_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);
                 }
             }
         },
@@ -18192,6 +18229,7 @@ __decorate([
         _this._fogEnd = 300;
         _this._fogDensity = 0.01;
         _this._fogParams = new Vector4();
+        _this._isActive = true;
         _this.name = name || "";
         var shaderData = _this.shaderData;
         shaderData._addReferCount(1);
@@ -18439,6 +18477,24 @@ __decorate([
         this._fogParams.w = density / Math.sqrt(Math.LN2);
     };
     _create_class(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: /**
@@ -18757,7 +18813,11 @@ __decorate([
    * @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);
@@ -20307,8 +20367,8 @@ var /**
     };
     _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 !== BackgroundTextureFillMode.Fill) {
             this._lastCanvasSize.set(canvas.width, canvas.height);
             background._resizeBackgroundTexture();
@@ -20483,7 +20543,7 @@ var Camera = (_Camera = /*#__PURE__*/ function(Component1) {
         // 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;