@galacean/engine-core 1.3.0-beta.9 → 1.3.1

package/dist/miniprogram.js

@@ -5893,7 +5893,7 @@ exports.Renderer = (_Renderer = /*#__PURE__*/ function(Component1) {
         _this._overrideUpdate = _this.update !== prototype.update;
         _this._addResourceReferCount(_this.shaderData, 1);
         _this._onTransformChanged = _this._onTransformChanged.bind(_assert_this_initialized(_this));
-        _this._registerEntityTransformListener();
+        _this._setTransform(entity.transform);
         shaderData.enableMacro(exports.Renderer._receiveShadowMacro);
         shaderData.setVector4(exports.Renderer._rendererLayerProperty, _this._rendererLayer);
         return _this;
@@ -6019,7 +6019,7 @@ exports.Renderer = (_Renderer = /*#__PURE__*/ function(Component1) {
    * @internal
    */ _proto._onDestroy = function _onDestroy() {
         Component1.prototype._onDestroy.call(this);
-        this._unRegisterEntityTransformListener();
+        this._setTransform(null);
         this._addResourceReferCount(this.shaderData, -1);
         var materials = this._materials;
         for(var i = 0, n = materials.length; i < n; i++){
@@ -6041,7 +6041,7 @@ exports.Renderer = (_Renderer = /*#__PURE__*/ function(Component1) {
     /**
    * @internal
    */ _proto._updateTransformShaderData = function _updateTransformShaderData(context, onlyMVP, batched) {
-        var worldMatrix = this.entity.transform.worldMatrix;
+        var worldMatrix = this._transform.worldMatrix;
         if (onlyMVP) {
             this._updateProjectionRelatedShaderData(context, worldMatrix, batched);
         } else {
@@ -6080,7 +6080,7 @@ exports.Renderer = (_Renderer = /*#__PURE__*/ function(Component1) {
             miniprogram.Matrix.invert(mvMatrix, mvInvMatrix);
             miniprogram.Matrix.invert(worldMatrix, normalMatrix);
             normalMatrix.transpose();
-            shaderData.setMatrix(exports.Renderer._localMatrixProperty, this.entity.transform.localMatrix);
+            shaderData.setMatrix(exports.Renderer._localMatrixProperty, this._transform.localMatrix);
             shaderData.setMatrix(exports.Renderer._worldMatrixProperty, worldMatrix);
             shaderData.setMatrix(exports.Renderer._mvMatrixProperty, mvMatrix);
             shaderData.setMatrix(exports.Renderer._mvInvMatrixProperty, mvInvMatrix);
@@ -6099,13 +6099,11 @@ exports.Renderer = (_Renderer = /*#__PURE__*/ function(Component1) {
     };
     /**
    * @internal
-   */ _proto._registerEntityTransformListener = function _registerEntityTransformListener() {
-        this.entity.transform._updateFlagManager.addListener(this._onTransformChanged);
-    };
-    /**
-   * @internal
-   */ _proto._unRegisterEntityTransformListener = function _unRegisterEntityTransformListener() {
-        this.entity.transform._updateFlagManager.removeListener(this._onTransformChanged);
+   */ _proto._setTransform = function _setTransform(transform) {
+        var _this__transform, _transform;
+        (_this__transform = this._transform) == null ? void 0 : _this__transform._updateFlagManager.removeListener(this._onTransformChanged);
+        (_transform = transform) == null ? void 0 : _transform._updateFlagManager.addListener(this._onTransformChanged);
+        this._transform = transform;
     };
     /**
    * @internal
@@ -6277,6 +6275,9 @@ __decorate([
 __decorate([
     ignoreClone
 ], exports.Renderer.prototype, "_rendererLayer", void 0);
+__decorate([
+    ignoreClone
+], exports.Renderer.prototype, "_transform", void 0);
 __decorate([
     deepClone
 ], exports.Renderer.prototype, "_shaderData", void 0);
@@ -8484,7 +8485,8 @@ exports.Camera = (_Camera = /*#__PURE__*/ function(Component1) {
    * @param mipLevel - Set mip level the data want to write, only take effect in webgl2.0
    */ _proto.render = function render(cubeFace, mipLevel) {
         if (mipLevel === void 0) mipLevel = 0;
-        var context = this.engine._renderContext;
+        var engine = this._engine;
+        var context = engine._renderContext;
         var virtualCamera = this._virtualCamera;
         var transform = this.entity.transform;
         miniprogram.Matrix.multiply(this.projectionMatrix, this.viewMatrix, virtualCamera.viewProjectionMatrix);
@@ -8505,16 +8507,16 @@ exports.Camera = (_Camera = /*#__PURE__*/ function(Component1) {
         this._updateShaderData();
         // union scene and camera macro.
         ShaderMacroCollection.unionCollection(this.scene._globalShaderMacro, this.shaderData._macroCollection, this._globalShaderMacro);
-        if (mipLevel > 0 && !this.engine._hardwareRenderer.isWebGL2) {
+        if (mipLevel > 0 && !engine._hardwareRenderer.isWebGL2) {
             mipLevel = 0;
             Logger.error("mipLevel only take effect in WebGL2.0");
         }
-        var clearMask;
-        if (this._cameraType !== exports.CameraType.Normal) {
-            clearMask = this.engine.xrManager._getCameraClearFlagsMask(this._cameraType);
+        var ignoreClearFlags;
+        if (this._cameraType !== exports.CameraType.Normal && !this._renderTarget && !this.independentCanvasEnabled) {
+            ignoreClearFlags = engine.xrManager._getCameraIgnoreClearFlags(this._cameraType);
         }
-        this._renderPipeline.render(context, cubeFace, mipLevel, clearMask);
-        this._engine._renderCount++;
+        this._renderPipeline.render(context, cubeFace, mipLevel, ignoreClearFlags);
+        engine._renderCount++;
     };
     _proto.setReplacementShader = function setReplacementShader(shader, replacementTag, failureStrategy) {
         if (failureStrategy === void 0) failureStrategy = exports.ReplacementFailureStrategy.KeepOriginalShader;
@@ -18276,9 +18278,7 @@ var SkinUpdateFlag;
     /**
    * @internal
    */ _proto._updateTransformShaderData = function _updateTransformShaderData(context, onlyMVP, batched) {
-        var _this_skin;
-        var _this_skin_rootBone;
-        var worldMatrix = ((_this_skin_rootBone = (_this_skin = this.skin) == null ? void 0 : _this_skin.rootBone) != null ? _this_skin_rootBone : this.entity).transform.worldMatrix;
+        var worldMatrix = this._transform.worldMatrix;
         if (onlyMVP) {
             this._updateProjectionRelatedShaderData(context, worldMatrix, batched);
         } else {
@@ -18363,7 +18363,7 @@ var SkinUpdateFlag;
         var _this_skin;
         var rootBone = (_this_skin = this.skin) == null ? void 0 : _this_skin.rootBone;
         if (rootBone) {
-            miniprogram.BoundingBox.transform(this._localBounds, rootBone.transform.worldMatrix, worldBounds);
+            miniprogram.BoundingBox.transform(this._localBounds, this._transform.worldMatrix, worldBounds);
         } else {
             MeshRenderer1.prototype._updateBounds.call(this, worldBounds);
         }
@@ -18404,6 +18404,7 @@ var SkinUpdateFlag;
                 }
                 break;
             case SkinUpdateFlag.RootBoneChanged:
+                this._setTransform(value.transform);
                 this._dirtyUpdateFlag |= RendererUpdateFlags.WorldVolume;
                 break;
         }
@@ -23253,7 +23254,7 @@ var unlitVs = "#define GLSLIFY 1\n#include <common>\n#include <common_vert>\n#in
     };
     /**
    * @internal
-   */ _proto._getCameraClearFlagsMask = function _getCameraClearFlagsMask(type) {
+   */ _proto._getCameraIgnoreClearFlags = function _getCameraIgnoreClearFlags(type) {
         return exports.CameraClearFlags.None;
     };
     return XRManager;

package/dist/module.js

@@ -5888,7 +5888,7 @@ var Renderer = (_Renderer = /*#__PURE__*/ function(Component1) {
         _this._overrideUpdate = _this.update !== prototype.update;
         _this._addResourceReferCount(_this.shaderData, 1);
         _this._onTransformChanged = _this._onTransformChanged.bind(_assert_this_initialized(_this));
-        _this._registerEntityTransformListener();
+        _this._setTransform(entity.transform);
         shaderData.enableMacro(Renderer._receiveShadowMacro);
         shaderData.setVector4(Renderer._rendererLayerProperty, _this._rendererLayer);
         return _this;
@@ -6014,7 +6014,7 @@ var Renderer = (_Renderer = /*#__PURE__*/ function(Component1) {
    * @internal
    */ _proto._onDestroy = function _onDestroy() {
         Component1.prototype._onDestroy.call(this);
-        this._unRegisterEntityTransformListener();
+        this._setTransform(null);
         this._addResourceReferCount(this.shaderData, -1);
         var materials = this._materials;
         for(var i = 0, n = materials.length; i < n; i++){
@@ -6036,7 +6036,7 @@ var Renderer = (_Renderer = /*#__PURE__*/ function(Component1) {
     /**
    * @internal
    */ _proto._updateTransformShaderData = function _updateTransformShaderData(context, onlyMVP, batched) {
-        var worldMatrix = this.entity.transform.worldMatrix;
+        var worldMatrix = this._transform.worldMatrix;
         if (onlyMVP) {
             this._updateProjectionRelatedShaderData(context, worldMatrix, batched);
         } else {
@@ -6075,7 +6075,7 @@ var Renderer = (_Renderer = /*#__PURE__*/ function(Component1) {
             Matrix.invert(mvMatrix, mvInvMatrix);
             Matrix.invert(worldMatrix, normalMatrix);
             normalMatrix.transpose();
-            shaderData.setMatrix(Renderer._localMatrixProperty, this.entity.transform.localMatrix);
+            shaderData.setMatrix(Renderer._localMatrixProperty, this._transform.localMatrix);
             shaderData.setMatrix(Renderer._worldMatrixProperty, worldMatrix);
             shaderData.setMatrix(Renderer._mvMatrixProperty, mvMatrix);
             shaderData.setMatrix(Renderer._mvInvMatrixProperty, mvInvMatrix);
@@ -6094,13 +6094,11 @@ var Renderer = (_Renderer = /*#__PURE__*/ function(Component1) {
     };
     /**
    * @internal
-   */ _proto._registerEntityTransformListener = function _registerEntityTransformListener() {
-        this.entity.transform._updateFlagManager.addListener(this._onTransformChanged);
-    };
-    /**
-   * @internal
-   */ _proto._unRegisterEntityTransformListener = function _unRegisterEntityTransformListener() {
-        this.entity.transform._updateFlagManager.removeListener(this._onTransformChanged);
+   */ _proto._setTransform = function _setTransform(transform) {
+        var _this__transform, _transform;
+        (_this__transform = this._transform) == null ? void 0 : _this__transform._updateFlagManager.removeListener(this._onTransformChanged);
+        (_transform = transform) == null ? void 0 : _transform._updateFlagManager.addListener(this._onTransformChanged);
+        this._transform = transform;
     };
     /**
    * @internal
@@ -6272,6 +6270,9 @@ __decorate([
 __decorate([
     ignoreClone
 ], Renderer.prototype, "_rendererLayer", void 0);
+__decorate([
+    ignoreClone
+], Renderer.prototype, "_transform", void 0);
 __decorate([
     deepClone
 ], Renderer.prototype, "_shaderData", void 0);
@@ -8479,7 +8480,8 @@ var Camera = (_Camera = /*#__PURE__*/ function(Component1) {
    * @param mipLevel - Set mip level the data want to write, only take effect in webgl2.0
    */ _proto.render = function render(cubeFace, mipLevel) {
         if (mipLevel === void 0) mipLevel = 0;
-        var context = this.engine._renderContext;
+        var engine = this._engine;
+        var context = engine._renderContext;
         var virtualCamera = this._virtualCamera;
         var transform = this.entity.transform;
         Matrix.multiply(this.projectionMatrix, this.viewMatrix, virtualCamera.viewProjectionMatrix);
@@ -8500,16 +8502,16 @@ var Camera = (_Camera = /*#__PURE__*/ function(Component1) {
         this._updateShaderData();
         // union scene and camera macro.
         ShaderMacroCollection.unionCollection(this.scene._globalShaderMacro, this.shaderData._macroCollection, this._globalShaderMacro);
-        if (mipLevel > 0 && !this.engine._hardwareRenderer.isWebGL2) {
+        if (mipLevel > 0 && !engine._hardwareRenderer.isWebGL2) {
             mipLevel = 0;
             Logger.error("mipLevel only take effect in WebGL2.0");
         }
-        var clearMask;
-        if (this._cameraType !== CameraType.Normal) {
-            clearMask = this.engine.xrManager._getCameraClearFlagsMask(this._cameraType);
+        var ignoreClearFlags;
+        if (this._cameraType !== CameraType.Normal && !this._renderTarget && !this.independentCanvasEnabled) {
+            ignoreClearFlags = engine.xrManager._getCameraIgnoreClearFlags(this._cameraType);
         }
-        this._renderPipeline.render(context, cubeFace, mipLevel, clearMask);
-        this._engine._renderCount++;
+        this._renderPipeline.render(context, cubeFace, mipLevel, ignoreClearFlags);
+        engine._renderCount++;
     };
     _proto.setReplacementShader = function setReplacementShader(shader, replacementTag, failureStrategy) {
         if (failureStrategy === void 0) failureStrategy = ReplacementFailureStrategy.KeepOriginalShader;
@@ -18271,9 +18273,7 @@ var SkinUpdateFlag;
     /**
    * @internal
    */ _proto._updateTransformShaderData = function _updateTransformShaderData(context, onlyMVP, batched) {
-        var _this_skin;
-        var _this_skin_rootBone;
-        var worldMatrix = ((_this_skin_rootBone = (_this_skin = this.skin) == null ? void 0 : _this_skin.rootBone) != null ? _this_skin_rootBone : this.entity).transform.worldMatrix;
+        var worldMatrix = this._transform.worldMatrix;
         if (onlyMVP) {
             this._updateProjectionRelatedShaderData(context, worldMatrix, batched);
         } else {
@@ -18358,7 +18358,7 @@ var SkinUpdateFlag;
         var _this_skin;
         var rootBone = (_this_skin = this.skin) == null ? void 0 : _this_skin.rootBone;
         if (rootBone) {
-            BoundingBox.transform(this._localBounds, rootBone.transform.worldMatrix, worldBounds);
+            BoundingBox.transform(this._localBounds, this._transform.worldMatrix, worldBounds);
         } else {
             MeshRenderer1.prototype._updateBounds.call(this, worldBounds);
         }
@@ -18399,6 +18399,7 @@ var SkinUpdateFlag;
                 }
                 break;
             case SkinUpdateFlag.RootBoneChanged:
+                this._setTransform(value.transform);
                 this._dirtyUpdateFlag |= RendererUpdateFlags.WorldVolume;
                 break;
         }
@@ -23248,7 +23249,7 @@ var unlitVs = "#define GLSLIFY 1\n#include <common>\n#include <common_vert>\n#in
     };
     /**
    * @internal
-   */ _proto._getCameraClearFlagsMask = function _getCameraClearFlagsMask(type) {
+   */ _proto._getCameraIgnoreClearFlags = function _getCameraIgnoreClearFlags(type) {
         return CameraClearFlags.None;
     };
     return XRManager;