@galacean/engine-core 0.9.7 → 0.9.8

package/dist/main.js

@@ -10489,8 +10489,10 @@ SimpleSpriteAssembler = __decorate([
         _this = Renderer.call(this, entity) || this;
         /** The mask layers the sprite mask influence to. */ _this.influenceLayers = exports.SpriteMaskLayer.Everything;
         _this._sprite = null;
-        _this._width = undefined;
-        _this._height = undefined;
+        _this._automaticWidth = 0;
+        _this._automaticHeight = 0;
+        _this._customWidth = undefined;
+        _this._customHeight = undefined;
         _this._flipX = false;
         _this._flipY = false;
         _this._alphaCutoff = 0.5;
@@ -10520,12 +10522,11 @@ SimpleSpriteAssembler = __decorate([
     /**
    * @override
    */ _proto._updateBounds = function _updateBounds(worldBounds) {
-        var _this_sprite;
-        if (!((_this_sprite = this.sprite) == null ? void 0 : _this_sprite.texture) || !this.width || !this.height) {
+        if (this.sprite) {
+            SimpleSpriteAssembler.updatePositions(this);
+        } else {
             worldBounds.min.set(0, 0, 0);
             worldBounds.max.set(0, 0, 0);
-        } else {
-            SimpleSpriteAssembler.updatePositions(this);
         }
     };
     /**
@@ -10536,12 +10537,12 @@ SimpleSpriteAssembler = __decorate([
         if (!((_this_sprite = this.sprite) == null ? void 0 : _this_sprite.texture) || !this.width || !this.height) {
             return;
         }
-        // Update position.
+        // Update position
         if (this._dirtyUpdateFlag & RendererUpdateFlags.WorldVolume) {
             SimpleSpriteAssembler.updatePositions(this);
             this._dirtyUpdateFlag &= ~RendererUpdateFlags.WorldVolume;
         }
-        // Update uv.
+        // Update uv
         if (this._dirtyUpdateFlag & 0x2) {
             SimpleSpriteAssembler.updateUVs(this);
             this._dirtyUpdateFlag &= ~0x2;
@@ -10552,11 +10553,27 @@ SimpleSpriteAssembler = __decorate([
         context.camera._renderPipeline._allSpriteMasks.add(this);
         this._maskElement = maskElement;
     };
+    _proto._calDefaultSize = function _calDefaultSize() {
+        var sprite = this._sprite;
+        if (sprite) {
+            this._automaticWidth = sprite.width;
+            this._automaticHeight = sprite.height;
+        } else {
+            this._automaticWidth = this._automaticHeight = 0;
+        }
+        this._dirtyUpdateFlag &= ~0x4;
+    };
     _proto._onSpriteChange = function _onSpriteChange(type) {
         switch(type){
             case SpriteModifyFlags.texture:
                 this.shaderData.setTexture(SpriteMask._textureProperty, this.sprite.texture);
                 break;
+            case SpriteModifyFlags.size:
+                this._dirtyUpdateFlag |= 0x4;
+                if (this._customWidth === undefined || this._customHeight === undefined) {
+                    this._dirtyUpdateFlag |= RendererUpdateFlags.WorldVolume;
+                }
+                break;
             case SpriteModifyFlags.region:
             case SpriteModifyFlags.atlasRegionOffset:
                 this._dirtyUpdateFlag |= 0x3;
@@ -10564,22 +10581,31 @@ SimpleSpriteAssembler = __decorate([
             case SpriteModifyFlags.atlasRegion:
                 this._dirtyUpdateFlag |= 0x2;
                 break;
+            case SpriteModifyFlags.pivot:
+                this._dirtyUpdateFlag |= RendererUpdateFlags.WorldVolume;
+                break;
         }
     };
     _create_class(SpriteMask, [
         {
             key: "width",
             get: /**
-   * Render width.
+   * Render width (in world coordinates).
+   *
+   * @remarks
+   * If width is set, return the set value,
+   * otherwise return `SpriteMask.sprite.width`.
    */ function get() {
-                if (this._width === undefined && this._sprite) {
-                    this.width = this._sprite.width;
+                if (this._customWidth !== undefined) {
+                    return this._customWidth;
+                } else {
+                    this._dirtyUpdateFlag & 0x4 && this._calDefaultSize();
+                    return this._automaticWidth;
                 }
-                return this._width;
             },
             set: function set(value) {
-                if (this._width !== value) {
-                    this._width = value;
+                if (this._customWidth !== value) {
+                    this._customWidth = value;
                     this._dirtyUpdateFlag |= RendererUpdateFlags.WorldVolume;
                 }
             }
@@ -10587,16 +10613,22 @@ SimpleSpriteAssembler = __decorate([
         {
             key: "height",
             get: /**
-   * Render height.
+   * Render height (in world coordinates).
+   *
+   * @remarks
+   * If height is set, return the set value,
+   * otherwise return `SpriteMask.sprite.height`.
    */ function get() {
-                if (this._height === undefined && this._sprite) {
-                    this.height = this._sprite.height;
+                if (this._customHeight !== undefined) {
+                    return this._customHeight;
+                } else {
+                    this._dirtyUpdateFlag & 0x4 && this._calDefaultSize();
+                    return this._automaticHeight;
                 }
-                return this._height;
             },
             set: function set(value) {
-                if (this._height !== value) {
-                    this._height = value;
+                if (this._customHeight !== value) {
+                    this._customHeight = value;
                     this._dirtyUpdateFlag |= RendererUpdateFlags.WorldVolume;
                 }
             }
@@ -10640,9 +10672,9 @@ SimpleSpriteAssembler = __decorate([
                 var lastSprite = this._sprite;
                 if (lastSprite !== value) {
                     lastSprite && lastSprite._updateFlagManager.removeListener(this._onSpriteChange);
+                    this._dirtyUpdateFlag |= 0x7;
                     if (value) {
                         value._updateFlagManager.addListener(this._onSpriteChange);
-                        this._dirtyUpdateFlag |= 0x3;
                         this.shaderData.setTexture(SpriteMask._textureProperty, value.texture);
                     } else {
                         this.shaderData.setTexture(SpriteMask._textureProperty, null);
@@ -10682,10 +10714,16 @@ __decorate([
 ], SpriteMask.prototype, "_sprite", void 0);
 __decorate([
     ignoreClone
-], SpriteMask.prototype, "_width", void 0);
+], SpriteMask.prototype, "_automaticWidth", void 0);
 __decorate([
     ignoreClone
-], SpriteMask.prototype, "_height", void 0);
+], SpriteMask.prototype, "_automaticHeight", void 0);
+__decorate([
+    assignmentClone
+], SpriteMask.prototype, "_customWidth", void 0);
+__decorate([
+    assignmentClone
+], SpriteMask.prototype, "_customHeight", void 0);
 __decorate([
     assignmentClone
 ], SpriteMask.prototype, "_flipX", void 0);
@@ -10703,7 +10741,9 @@ var /**
  */ SpriteMaskUpdateFlags;
 (function(SpriteMaskUpdateFlags) {
     SpriteMaskUpdateFlags[SpriteMaskUpdateFlags[/** UV. */ "UV"] = 0x2] = "UV";
-    SpriteMaskUpdateFlags[SpriteMaskUpdateFlags[/** All. */ "All"] = 0x3] = "All";
+    SpriteMaskUpdateFlags[SpriteMaskUpdateFlags[/** WorldVolume and UV . */ "RenderData"] = 0x3] = "RenderData";
+    SpriteMaskUpdateFlags[SpriteMaskUpdateFlags[/** Automatic Size. */ "AutomaticSize"] = 0x4] = "AutomaticSize";
+    SpriteMaskUpdateFlags[SpriteMaskUpdateFlags[/** All. */ "All"] = 0x7] = "All";
 })(SpriteMaskUpdateFlags || (SpriteMaskUpdateFlags = {}));
 
 /**
@@ -19358,8 +19398,10 @@ exports.TextVerticalAlignment = void 0;
         if (name === void 0) name = null;
         var _this;
         _this = RefObject.call(this, engine) || this;
-        _this._width = undefined;
-        _this._height = undefined;
+        _this._automaticWidth = 0;
+        _this._automaticHeight = 0;
+        _this._customWidth = undefined;
+        _this._customHeight = undefined;
         _this._positions = [
             new engineMath.Vector2(),
             new engineMath.Vector2(),
@@ -19380,7 +19422,7 @@ exports.TextVerticalAlignment = void 0;
         _this._region = new engineMath.Rect(0, 0, 1, 1);
         _this._pivot = new engineMath.Vector2(0.5, 0.5);
         _this._border = new engineMath.Vector4(0, 0, 0, 0);
-        _this._dirtyUpdateFlag = 0x3;
+        _this._dirtyUpdateFlag = 0x7;
         /** @internal */ _this._updateFlagManager = new UpdateFlagManager();
         _this._texture = texture;
         region && _this._region.copyFrom(region);
@@ -19429,9 +19471,12 @@ exports.TextVerticalAlignment = void 0;
         if (this._texture) {
             var _this = this, _texture = _this._texture, _atlasRegion = _this._atlasRegion, _atlasRegionOffset = _this._atlasRegionOffset, _region = _this._region;
             var pixelsPerUnitReciprocal = 1.0 / Engine._pixelsPerUnit;
-            this._width = _texture.width * _atlasRegion.width / (1 - _atlasRegionOffset.x - _atlasRegionOffset.z) * _region.width * pixelsPerUnitReciprocal;
-            this._height = _texture.height * _atlasRegion.height / (1 - _atlasRegionOffset.y - _atlasRegionOffset.w) * _region.height * pixelsPerUnitReciprocal;
+            this._automaticWidth = _texture.width * _atlasRegion.width / (1 - _atlasRegionOffset.x - _atlasRegionOffset.z) * _region.width * pixelsPerUnitReciprocal;
+            this._automaticHeight = _texture.height * _atlasRegion.height / (1 - _atlasRegionOffset.y - _atlasRegionOffset.w) * _region.height * pixelsPerUnitReciprocal;
+        } else {
+            this._automaticWidth = this._automaticHeight = 0;
         }
+        this._dirtyUpdateFlag &= ~0x4;
     };
     _proto._updatePositions = function _updatePositions() {
         var blank = this._atlasRegionOffset;
@@ -19485,11 +19530,16 @@ exports.TextVerticalAlignment = void 0;
     };
     _proto._dispatchSpriteChange = function _dispatchSpriteChange(type) {
         switch(type){
+            case SpriteModifyFlags.texture:
+                this._dirtyUpdateFlag |= 0x4;
+                break;
             case SpriteModifyFlags.atlasRegionOffset:
             case SpriteModifyFlags.region:
-                this._dirtyUpdateFlag |= 0x3;
+                this._dirtyUpdateFlag |= 0x7;
                 break;
             case SpriteModifyFlags.atlasRegion:
+                this._dirtyUpdateFlag |= 0x4 | 0x2;
+                break;
             case SpriteModifyFlags.border:
                 this._dirtyUpdateFlag |= 0x2;
                 break;
@@ -19508,7 +19558,9 @@ exports.TextVerticalAlignment = void 0;
                 if (this._texture !== value) {
                     this._texture = value;
                     this._dispatchSpriteChange(SpriteModifyFlags.texture);
-                    (this._width === undefined || this._height === undefined) && this._dispatchSpriteChange(SpriteModifyFlags.size);
+                    if (this._customWidth === undefined || this._customHeight === undefined) {
+                        this._dispatchSpriteChange(SpriteModifyFlags.size);
+                    }
                 }
             }
         },
@@ -19516,13 +19568,21 @@ exports.TextVerticalAlignment = void 0;
             key: "width",
             get: /**
    * The width of the sprite (in world coordinates).
+   * 
+   * @remarks
+   * If width is set, return the set value,
+   * otherwise return the width calculated according to `Texture.width`, `Sprite.region`, `Sprite.atlasRegion`, `Sprite.atlasRegionOffset` and `Engine._pixelsPerUnit`.
    */ function get() {
-                this._width === undefined && this._calDefaultSize();
-                return this._width;
+                if (this._customWidth !== undefined) {
+                    return this._customWidth;
+                } else {
+                    this._dirtyUpdateFlag & 0x4 && this._calDefaultSize();
+                    return this._automaticWidth;
+                }
             },
             set: function set(value) {
-                if (this._width !== value) {
-                    this._width = value;
+                if (this._customWidth !== value) {
+                    this._customWidth = value;
                     this._dispatchSpriteChange(SpriteModifyFlags.size);
                 }
             }
@@ -19531,13 +19591,21 @@ exports.TextVerticalAlignment = void 0;
             key: "height",
             get: /**
    * The height of the sprite (in world coordinates).
+   * 
+   * @remarks
+   * If height is set, return the set value,
+   * otherwise return the height calculated according to `Texture.height`, `Sprite.region`, `Sprite.atlasRegion`, `Sprite.atlasRegionOffset` and `Engine._pixelsPerUnit`.
    */ function get() {
-                this._height === undefined && this._calDefaultSize();
-                return this._height;
+                if (this._customHeight !== undefined) {
+                    return this._customHeight;
+                } else {
+                    this._dirtyUpdateFlag & 0x4 && this._calDefaultSize();
+                    return this._automaticHeight;
+                }
             },
             set: function set(value) {
-                if (this._height !== value) {
-                    this._height = value;
+                if (this._customHeight !== value) {
+                    this._customHeight = value;
                     this._dispatchSpriteChange(SpriteModifyFlags.size);
                 }
             }
@@ -19567,7 +19635,9 @@ exports.TextVerticalAlignment = void 0;
                 var y = engineMath.MathUtil.clamp(value.y, 0, 1);
                 this._atlasRegion.set(x, y, engineMath.MathUtil.clamp(value.width, 0, 1 - x), engineMath.MathUtil.clamp(value.height, 0, 1 - y));
                 this._dispatchSpriteChange(SpriteModifyFlags.atlasRegion);
-                (this._width === undefined || this._height === undefined) && this._dispatchSpriteChange(SpriteModifyFlags.size);
+                if (this._customWidth === undefined || this._customHeight === undefined) {
+                    this._dispatchSpriteChange(SpriteModifyFlags.size);
+                }
             }
         },
         {
@@ -19582,7 +19652,9 @@ exports.TextVerticalAlignment = void 0;
                 var y = engineMath.MathUtil.clamp(value.y, 0, 1);
                 this._atlasRegionOffset.set(x, y, engineMath.MathUtil.clamp(value.z, 0, 1 - x), engineMath.MathUtil.clamp(value.w, 0, 1 - y));
                 this._dispatchSpriteChange(SpriteModifyFlags.atlasRegionOffset);
-                (this._width === undefined || this._height === undefined) && this._dispatchSpriteChange(SpriteModifyFlags.size);
+                if (this._customWidth === undefined || this._customHeight === undefined) {
+                    this._dispatchSpriteChange(SpriteModifyFlags.size);
+                }
             }
         },
         {
@@ -19598,7 +19670,9 @@ exports.TextVerticalAlignment = void 0;
                 var y = engineMath.MathUtil.clamp(value.y, 0, 1);
                 region.set(x, y, engineMath.MathUtil.clamp(value.width, 0, 1 - x), engineMath.MathUtil.clamp(value.height, 0, 1 - y));
                 this._dispatchSpriteChange(SpriteModifyFlags.region);
-                (this._width === undefined || this._height === undefined) && this._dispatchSpriteChange(SpriteModifyFlags.size);
+                if (this._customWidth === undefined || this._customHeight === undefined) {
+                    this._dispatchSpriteChange(SpriteModifyFlags.size);
+                }
             }
         },
         {
@@ -19648,7 +19722,8 @@ var SpriteUpdateFlags;
 (function(SpriteUpdateFlags) {
     SpriteUpdateFlags[SpriteUpdateFlags["positions"] = 0x1] = "positions";
     SpriteUpdateFlags[SpriteUpdateFlags["uvs"] = 0x2] = "uvs";
-    SpriteUpdateFlags[SpriteUpdateFlags["all"] = 0x3] = "all";
+    SpriteUpdateFlags[SpriteUpdateFlags["automaticSize"] = 0x4] = "automaticSize";
+    SpriteUpdateFlags[SpriteUpdateFlags["all"] = 0x7] = "all";
 })(SpriteUpdateFlags || (SpriteUpdateFlags = {}));
 
 var _SlicedSpriteAssembler;
@@ -19801,8 +19876,10 @@ SlicedSpriteAssembler = __decorate([
         _this = Renderer.call(this, entity) || this;
         _this._color = new engineMath.Color(1, 1, 1, 1);
         _this._sprite = null;
-        _this._width = undefined;
-        _this._height = undefined;
+        _this._automaticWidth = 0;
+        _this._automaticHeight = 0;
+        _this._customWidth = undefined;
+        _this._customHeight = undefined;
         _this._flipX = false;
         _this._flipY = false;
         _this._maskLayer = exports.SpriteMaskLayer.Layer0;
@@ -19818,6 +19895,7 @@ SlicedSpriteAssembler = __decorate([
    * @internal
    */ _proto._cloneTo = function _cloneTo(target) {
         target.sprite = this._sprite;
+        target.drawMode = this._drawMode;
     };
     /**
    * @internal
@@ -19833,12 +19911,11 @@ SlicedSpriteAssembler = __decorate([
     /**
    * @override
    */ _proto._updateBounds = function _updateBounds(worldBounds) {
-        var _this_sprite;
-        if (!((_this_sprite = this.sprite) == null ? void 0 : _this_sprite.texture) || !this.width || !this.height) {
+        if (this.sprite) {
+            this._assembler.updatePositions(this);
+        } else {
             worldBounds.min.set(0, 0, 0);
             worldBounds.max.set(0, 0, 0);
-        } else {
-            this._assembler.updatePositions(this);
         }
     };
     /**
@@ -19848,17 +19925,17 @@ SlicedSpriteAssembler = __decorate([
         if (!((_this_sprite = this.sprite) == null ? void 0 : _this_sprite.texture) || !this.width || !this.height) {
             return;
         }
-        // Update position.
+        // Update position
         if (this._dirtyUpdateFlag & RendererUpdateFlags.WorldVolume) {
             this._assembler.updatePositions(this);
             this._dirtyUpdateFlag &= ~RendererUpdateFlags.WorldVolume;
         }
-        // Update uv.
+        // Update uv
         if (this._dirtyUpdateFlag & 0x2) {
             this._assembler.updateUVs(this);
             this._dirtyUpdateFlag &= ~0x2;
         }
-        // Push primitive.
+        // Push primitive
         var material = this.getMaterial();
         var passes = material.shader.passes;
         var renderStates = material.renderStates;
@@ -19869,6 +19946,16 @@ SlicedSpriteAssembler = __decorate([
             context.camera._renderPipeline.pushPrimitive(spriteElement);
         }
     };
+    _proto._calDefaultSize = function _calDefaultSize() {
+        var sprite = this._sprite;
+        if (sprite) {
+            this._automaticWidth = sprite.width;
+            this._automaticHeight = sprite.height;
+        } else {
+            this._automaticWidth = this._automaticHeight = 0;
+        }
+        this._dirtyUpdateFlag &= ~0x4;
+    };
     _proto._updateStencilState = function _updateStencilState() {
         // Update stencil.
         var material = this.getInstanceMaterial();
@@ -19894,9 +19981,10 @@ SlicedSpriteAssembler = __decorate([
                 this.shaderData.setTexture(SpriteRenderer._textureProperty, this.sprite.texture);
                 break;
             case SpriteModifyFlags.size:
+                this._dirtyUpdateFlag |= 0x4;
                 // When the width and height of `SpriteRenderer` are `undefined`,
                 // the `size` of `Sprite` will affect the position of `SpriteRenderer`.
-                if (this._drawMode === exports.SpriteDrawMode.Sliced || this._width === undefined || this._height === undefined) {
+                if (this._drawMode === exports.SpriteDrawMode.Sliced || this._customWidth === undefined || this._customHeight === undefined) {
                     this._dirtyUpdateFlag |= RendererUpdateFlags.WorldVolume;
                 }
                 break;
@@ -19950,9 +20038,9 @@ SlicedSpriteAssembler = __decorate([
                 var lastSprite = this._sprite;
                 if (lastSprite !== value) {
                     lastSprite && lastSprite._updateFlagManager.removeListener(this._onSpriteChange);
+                    this._dirtyUpdateFlag |= 0x7;
                     if (value) {
                         value._updateFlagManager.addListener(this._onSpriteChange);
-                        this._dirtyUpdateFlag |= 0x3;
                         this.shaderData.setTexture(SpriteRenderer._textureProperty, value.texture);
                     } else {
                         this.shaderData.setTexture(SpriteRenderer._textureProperty, null);
@@ -19977,16 +20065,22 @@ SlicedSpriteAssembler = __decorate([
         {
             key: "width",
             get: /**
-   * Render width.
+   * Render width (in world coordinates).
+   *
+   * @remarks
+   * If width is set, return the set value,
+   * otherwise return `SpriteRenderer.sprite.width`.
    */ function get() {
-                this._width === undefined && this._sprite && (this.width = this._sprite.width);
-                return this._width;
+                if (this._customWidth !== undefined) {
+                    return this._customWidth;
+                } else {
+                    this._dirtyUpdateFlag & 0x4 && this._calDefaultSize();
+                    return this._automaticWidth;
+                }
             },
             set: function set(value) {
-                // Update width if undefined
-                this._width === undefined && this._sprite && (this._width = this._sprite.width);
-                if (this._width !== value) {
-                    this._width = value;
+                if (this._customWidth !== value) {
+                    this._customWidth = value;
                     this._dirtyUpdateFlag |= RendererUpdateFlags.WorldVolume;
                 }
             }
@@ -19994,16 +20088,22 @@ SlicedSpriteAssembler = __decorate([
         {
             key: "height",
             get: /**
-   * Render height.
+   * Render height (in world coordinates).
+   *
+   * @remarks
+   * If height is set, return the set value,
+   * otherwise return `SpriteRenderer.sprite.height`.
    */ function get() {
-                this._height === undefined && this._sprite && (this.height = this._sprite.height);
-                return this._height;
+                if (this._customHeight !== undefined) {
+                    return this._customHeight;
+                } else {
+                    this._dirtyUpdateFlag & 0x4 && this._calDefaultSize();
+                    return this._automaticHeight;
+                }
             },
             set: function set(value) {
-                // Update height if undefined
-                this._height === undefined && this._sprite && (this._height = this._sprite.height);
-                if (this._height !== value) {
-                    this._height = value;
+                if (this._customHeight !== value) {
+                    this._customHeight = value;
                     this._dirtyUpdateFlag |= RendererUpdateFlags.WorldVolume;
                 }
             }
@@ -20084,10 +20184,16 @@ __decorate([
 ], SpriteRenderer.prototype, "_sprite", void 0);
 __decorate([
     ignoreClone
-], SpriteRenderer.prototype, "_width", void 0);
+], SpriteRenderer.prototype, "_automaticWidth", void 0);
 __decorate([
     ignoreClone
-], SpriteRenderer.prototype, "_height", void 0);
+], SpriteRenderer.prototype, "_automaticHeight", void 0);
+__decorate([
+    assignmentClone
+], SpriteRenderer.prototype, "_customWidth", void 0);
+__decorate([
+    assignmentClone
+], SpriteRenderer.prototype, "_customHeight", void 0);
 __decorate([
     assignmentClone
 ], SpriteRenderer.prototype, "_flipX", void 0);
@@ -20108,7 +20214,9 @@ var /**
  */ SpriteRendererUpdateFlags;
 (function(SpriteRendererUpdateFlags) {
     SpriteRendererUpdateFlags[SpriteRendererUpdateFlags[/** UV. */ "UV"] = 0x2] = "UV";
-    SpriteRendererUpdateFlags[SpriteRendererUpdateFlags[/** All. */ "All"] = 0x3] = "All";
+    SpriteRendererUpdateFlags[SpriteRendererUpdateFlags[/** WorldVolume and UV . */ "RenderData"] = 0x3] = "RenderData";
+    SpriteRendererUpdateFlags[SpriteRendererUpdateFlags[/** Automatic Size. */ "AutomaticSize"] = 0x4] = "AutomaticSize";
+    SpriteRendererUpdateFlags[SpriteRendererUpdateFlags[/** All. */ "All"] = 0x7] = "All";
 })(SpriteRendererUpdateFlags || (SpriteRendererUpdateFlags = {}));
 
 /**