@galacean/engine-core 1.3.0-beta.8 → 1.3.0

package/dist/main.js

@@ -5892,7 +5892,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;
@@ -6018,7 +6018,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++){
@@ -6040,7 +6040,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 {
@@ -6079,7 +6079,7 @@ exports.Renderer = (_Renderer = /*#__PURE__*/ function(Component1) {
             engineMath.Matrix.invert(mvMatrix, mvInvMatrix);
             engineMath.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);
@@ -6098,13 +6098,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
@@ -6276,6 +6274,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);
@@ -8483,7 +8484,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;
         engineMath.Matrix.multiply(this.projectionMatrix, this.viewMatrix, virtualCamera.viewProjectionMatrix);
@@ -8504,16 +8506,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;
@@ -18275,9 +18277,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 {
@@ -18362,7 +18362,7 @@ var SkinUpdateFlag;
         var _this_skin;
         var rootBone = (_this_skin = this.skin) == null ? void 0 : _this_skin.rootBone;
         if (rootBone) {
-            engineMath.BoundingBox.transform(this._localBounds, rootBone.transform.worldMatrix, worldBounds);
+            engineMath.BoundingBox.transform(this._localBounds, this._transform.worldMatrix, worldBounds);
         } else {
             MeshRenderer1.prototype._updateBounds.call(this, worldBounds);
         }
@@ -18403,6 +18403,7 @@ var SkinUpdateFlag;
                 }
                 break;
             case SkinUpdateFlag.RootBoneChanged:
+                this._setTransform(value.transform);
                 this._dirtyUpdateFlag |= RendererUpdateFlags.WorldVolume;
                 break;
         }
@@ -19496,13 +19497,12 @@ var /** @internal */ PromiseState;
         var _this__subAssetPromiseCallbacks_assetBaseURL;
         var subPromiseCallback = (_this__subAssetPromiseCallbacks_assetBaseURL = this._subAssetPromiseCallbacks[assetBaseURL]) == null ? void 0 : _this__subAssetPromiseCallbacks_assetBaseURL[assetSubPath];
         if (subPromiseCallback) {
-            // Already resolved
             subPromiseCallback.resolve(value);
         } else {
             var // Pending
             _this__subAssetPromiseCallbacks, _assetBaseURL;
             ((_this__subAssetPromiseCallbacks = this._subAssetPromiseCallbacks)[_assetBaseURL = assetBaseURL] || (_this__subAssetPromiseCallbacks[_assetBaseURL] = {}))[assetSubPath] = {
-                resolve: value
+                resolvedValue: value
             };
         }
     };
@@ -19512,13 +19512,12 @@ var /** @internal */ PromiseState;
         var _this__subAssetPromiseCallbacks_assetBaseURL;
         var subPromiseCallback = (_this__subAssetPromiseCallbacks_assetBaseURL = this._subAssetPromiseCallbacks[assetBaseURL]) == null ? void 0 : _this__subAssetPromiseCallbacks_assetBaseURL[assetSubPath];
         if (subPromiseCallback) {
-            // Already rejected
             subPromiseCallback.reject(value);
         } else {
             var // Pending
             _this__subAssetPromiseCallbacks, _assetBaseURL;
             ((_this__subAssetPromiseCallbacks = this._subAssetPromiseCallbacks)[_assetBaseURL = assetBaseURL] || (_this__subAssetPromiseCallbacks[_assetBaseURL] = {}))[assetSubPath] = {
-                reject: value
+                rejectedValue: value
             };
         }
     };
@@ -19699,32 +19698,32 @@ var /** @internal */ PromiseState;
         var _this__subAssetPromiseCallbacks_assetBaseURL, _subPromiseCallback, _subPromiseCallback1;
         var loadingPromises = this._loadingPromises;
         var subPromiseCallback = (_this__subAssetPromiseCallbacks_assetBaseURL = this._subAssetPromiseCallbacks[assetBaseURL]) == null ? void 0 : _this__subAssetPromiseCallbacks_assetBaseURL[assetSubPath];
-        var resolvedValue = (_subPromiseCallback = subPromiseCallback) == null ? void 0 : _subPromiseCallback.resolve;
-        var rejectedValue = (_subPromiseCallback1 = subPromiseCallback) == null ? void 0 : _subPromiseCallback1.reject;
-        var promise = new AssetPromise(function(resolve, reject) {
-            if (resolvedValue) {
-                // Already resolved
-                resolve(resolvedValue);
-            } else if (rejectedValue) {
-                // Already rejected
-                reject(rejectedValue);
-            } else {
-                var _this__subAssetPromiseCallbacks, _assetBaseURL;
-                // Pending
-                loadingPromises[assetURL] = promise;
-                ((_this__subAssetPromiseCallbacks = _this._subAssetPromiseCallbacks)[_assetBaseURL = assetBaseURL] || (_this__subAssetPromiseCallbacks[_assetBaseURL] = {}))[assetSubPath] = {
-                    resolve: resolve,
-                    reject: reject
-                };
-            }
-        });
-        if (!resolvedValue && !rejectedValue) {
-            promise.then(function() {
-                delete loadingPromises[assetURL];
-            }, function() {
-                return delete loadingPromises[assetURL];
+        var resolvedValue = (_subPromiseCallback = subPromiseCallback) == null ? void 0 : _subPromiseCallback.resolvedValue;
+        var rejectedValue = (_subPromiseCallback1 = subPromiseCallback) == null ? void 0 : _subPromiseCallback1.rejectedValue;
+        // Already resolved or rejected
+        if (resolvedValue || rejectedValue) {
+            return new AssetPromise(function(resolve, reject) {
+                if (resolvedValue) {
+                    resolve(resolvedValue);
+                } else if (rejectedValue) {
+                    reject(rejectedValue);
+                }
             });
         }
+        // Pending
+        var promise = new AssetPromise(function(resolve, reject) {
+            var _this__subAssetPromiseCallbacks, _assetBaseURL;
+            ((_this__subAssetPromiseCallbacks = _this._subAssetPromiseCallbacks)[_assetBaseURL = assetBaseURL] || (_this__subAssetPromiseCallbacks[_assetBaseURL] = {}))[assetSubPath] = {
+                resolve: resolve,
+                reject: reject
+            };
+        });
+        loadingPromises[assetURL] = promise;
+        promise.then(function() {
+            delete loadingPromises[assetURL];
+        }, function() {
+            return delete loadingPromises[assetURL];
+        });
         return promise;
     };
     _proto._gc = function _gc(forceDestroy) {
@@ -23254,7 +23253,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;
@@ -28448,7 +28447,7 @@ exports.AnimatorLayerBlendingMode = void 0;
    */ _proto.setParameterValue = function setParameterValue(name1, value) {
         var _this__animatorController;
         var parameter = (_this__animatorController = this._animatorController) == null ? void 0 : _this__animatorController._parametersMap[name1];
-        if (parameter && parameter.defaultValue !== value) {
+        if (parameter) {
             this._parametersValueMap[name1] = value;
         }
     };