@galacean/engine 0.9.7 → 0.9.8

package/dist/browser.js

@@ -15116,8 +15116,10 @@
             _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;
@@ -15147,12 +15149,11 @@
         /**
        * @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);
             }
         };
         /**
@@ -15163,12 +15164,12 @@
             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;
@@ -15179,11 +15180,27 @@
             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;
@@ -15191,22 +15208,31 @@
                 case SpriteModifyFlags.atlasRegion:
                     this._dirtyUpdateFlag |= 0x2;
                     break;
+                case SpriteModifyFlags.pivot:
+                    this._dirtyUpdateFlag |= RendererUpdateFlags.WorldVolume;
+                    break;
             }
         };
         _create_class$3(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;
                     }
                 }
@@ -15214,16 +15240,22 @@
             {
                 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;
                     }
                 }
@@ -15267,9 +15299,9 @@
                     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);
@@ -15309,10 +15341,16 @@
     ], SpriteMask.prototype, "_sprite", void 0);
     __decorate$1([
         ignoreClone
-    ], SpriteMask.prototype, "_width", void 0);
+    ], SpriteMask.prototype, "_automaticWidth", void 0);
     __decorate$1([
         ignoreClone
-    ], SpriteMask.prototype, "_height", void 0);
+    ], SpriteMask.prototype, "_automaticHeight", void 0);
+    __decorate$1([
+        assignmentClone
+    ], SpriteMask.prototype, "_customWidth", void 0);
+    __decorate$1([
+        assignmentClone
+    ], SpriteMask.prototype, "_customHeight", void 0);
     __decorate$1([
         assignmentClone
     ], SpriteMask.prototype, "_flipX", void 0);
@@ -15330,7 +15368,9 @@
      */ 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 = {}));
     /**
      * Vertex element format.
@@ -23890,8 +23930,10 @@
             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 Vector2(),
                 new Vector2(),
@@ -23912,7 +23954,7 @@
             _this._region = new Rect(0, 0, 1, 1);
             _this._pivot = new Vector2(0.5, 0.5);
             _this._border = new Vector4(0, 0, 0, 0);
-            _this._dirtyUpdateFlag = 0x3;
+            _this._dirtyUpdateFlag = 0x7;
             /** @internal */ _this._updateFlagManager = new UpdateFlagManager();
             _this._texture = texture;
             region && _this._region.copyFrom(region);
@@ -23962,9 +24004,12 @@
             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;
@@ -24018,11 +24063,16 @@
         };
         _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;
@@ -24041,7 +24091,9 @@
                     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);
+                        }
                     }
                 }
             },
@@ -24049,13 +24101,21 @@
                 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);
                     }
                 }
@@ -24064,13 +24124,21 @@
                 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);
                     }
                 }
@@ -24100,7 +24168,9 @@
                     var y = MathUtil$1.clamp(value.y, 0, 1);
                     this._atlasRegion.set(x, y, MathUtil$1.clamp(value.width, 0, 1 - x), MathUtil$1.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);
+                    }
                 }
             },
             {
@@ -24115,7 +24185,9 @@
                     var y = MathUtil$1.clamp(value.y, 0, 1);
                     this._atlasRegionOffset.set(x, y, MathUtil$1.clamp(value.z, 0, 1 - x), MathUtil$1.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);
+                    }
                 }
             },
             {
@@ -24131,7 +24203,9 @@
                     var y = MathUtil$1.clamp(value.y, 0, 1);
                     region.set(x, y, MathUtil$1.clamp(value.width, 0, 1 - x), MathUtil$1.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);
+                    }
                 }
             },
             {
@@ -24181,7 +24255,8 @@
     (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;
     var SlicedSpriteAssembler = (_SlicedSpriteAssembler = /*#__PURE__*/ function() {
@@ -24331,8 +24406,10 @@
             _this = Renderer.call(this, entity) || this;
             _this._color = new Color$1(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;
@@ -24349,6 +24426,7 @@
        * @internal
        */ _proto._cloneTo = function _cloneTo(target) {
             target.sprite = this._sprite;
+            target.drawMode = this._drawMode;
         };
         /**
        * @internal
@@ -24364,12 +24442,11 @@
         /**
        * @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);
             }
         };
         /**
@@ -24379,17 +24456,17 @@
             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;
@@ -24400,6 +24477,16 @@
                 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();
@@ -24425,9 +24512,10 @@
                     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;
@@ -24481,9 +24569,9 @@
                     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);
@@ -24508,16 +24596,22 @@
             {
                 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;
                     }
                 }
@@ -24525,16 +24619,22 @@
             {
                 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;
                     }
                 }
@@ -24615,10 +24715,16 @@
     ], SpriteRenderer.prototype, "_sprite", void 0);
     __decorate$1([
         ignoreClone
-    ], SpriteRenderer.prototype, "_width", void 0);
+    ], SpriteRenderer.prototype, "_automaticWidth", void 0);
     __decorate$1([
         ignoreClone
-    ], SpriteRenderer.prototype, "_height", void 0);
+    ], SpriteRenderer.prototype, "_automaticHeight", void 0);
+    __decorate$1([
+        assignmentClone
+    ], SpriteRenderer.prototype, "_customWidth", void 0);
+    __decorate$1([
+        assignmentClone
+    ], SpriteRenderer.prototype, "_customHeight", void 0);
     __decorate$1([
         assignmentClone
     ], SpriteRenderer.prototype, "_flipX", void 0);
@@ -24639,7 +24745,9 @@
      */ 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 = {}));
     /**
      * @internal
@@ -35573,7 +35681,7 @@
                         var atlasItem = atlasItems[i];
                         if (atlasItem.img) {
                             chainPromises.push(resourceManager.load({
-                                url: atlasItem.img,
+                                url: GLTFUtil.parseRelativeUrl(item.url, atlasItem.img),
                                 type: exports.AssetType.Texture2D,
                                 params: {
                                     format: format,
@@ -35878,7 +35986,7 @@
     }));
 
     //@ts-ignore
-    var version = "0.9.7";
+    var version = "0.9.8";
     console.log("Galacean engine version: " + version);
     for(var key in CoreObjects){
         Loader.registerClass(key, CoreObjects[key]);