@galacean/engine 1.1.0-beta.34 → 1.1.0-beta.36

package/dist/browser.js

@@ -6907,13 +6907,15 @@
         ];
     })();
     (function() {
-        /** These characters are all tall to help calculate the height required for text. */ TextUtils._measureString = "|\xc9q\xc5";
+        // _heightMultiplier used to measure the height of text, but in miniprogram performance is different from h5.
+        // so can set _heightMultiplier to adapt miniprogram, the larger the value, the worse the performance.
+        /** @internal */ TextUtils._heightMultiplier = 2;
     })();
     (function() {
-        TextUtils._measureBaseline = "M";
+        /** These characters are all tall to help calculate the height required for text. */ TextUtils._measureString = "|\xc9q\xc5";
     })();
     (function() {
-        TextUtils._heightMultiplier = 2;
+        TextUtils._measureBaseline = "M";
     })();
     (function() {
         TextUtils._baselineMultiplier = 1.4;
@@ -6996,7 +6998,7 @@
             var _this = this, engine = _this._engine;
             var fontAtlas = new FontAtlas(engine);
             var texture = new Texture2D(engine, 256, 256, exports.TextureFormat.R8G8B8A8, false);
-            texture.filterMode = exports.TextureFilterMode.Point;
+            texture.filterMode = exports.TextureFilterMode.Bilinear;
             fontAtlas.texture = texture;
             fontAtlas.isGCIgnored = texture.isGCIgnored = true;
             this._fontAtlases.push(fontAtlas);
@@ -23247,7 +23249,7 @@
         /**
        * @internal
        */ _proto._render = function _render(context) {
-            if (this._text === "" || this.enableWrapping && this.width <= 0 || this.overflowMode === exports.OverflowMode.Truncate && this.height <= 0) {
+            if (this._isTextNoVisible()) {
                 return;
             }
             if (this._isContainDirtyFlag(0x10)) {
@@ -23339,8 +23341,8 @@
             }
         };
         _proto._updateLocalData = function _updateLocalData() {
-            var _this = this, color = _this.color, charRenderDatas = _this._charRenderDatas, charFont = _this._subFont;
             var _this__localBounds = this._localBounds, min = _this__localBounds.min, max = _this__localBounds.max;
+            var _this = this, color = _this.color, charRenderDatas = _this._charRenderDatas, charFont = _this._subFont;
             var textMetrics = this.enableWrapping ? TextUtils.measureTextWithWrap(this) : TextUtils.measureTextWithoutWrap(this);
             var height = textMetrics.height, lines = textMetrics.lines, lineWidths = textMetrics.lineWidths, lineHeight = textMetrics.lineHeight, lineMaxSizes = textMetrics.lineMaxSizes;
             var charRenderDataPool = TextRenderer._charRenderDataPool;
@@ -23408,7 +23410,7 @@
                                 var left = startX * pixelsPerUnitReciprocal;
                                 var right = (startX + w) * pixelsPerUnitReciprocal;
                                 var top = (startY + ascent) * pixelsPerUnitReciprocal;
-                                var bottom = (startY - descent + 1) * pixelsPerUnitReciprocal;
+                                var bottom = (startY - descent) * pixelsPerUnitReciprocal;
                                 localPositions.set(left, top, right, bottom);
                                 i === firstLine && (maxY = Math.max(maxY, top));
                                 minY = Math.min(minY, bottom);
@@ -23449,6 +23451,9 @@
             Renderer1.prototype._onTransformChanged.call(this, bit);
             this._setDirtyFlagTrue(0x4 | 0x8);
         };
+        _proto._isTextNoVisible = function _isTextNoVisible() {
+            return this._text === "" || this._fontSize === 0 || this.enableWrapping && this.width <= 0 || this.overflowMode === exports.OverflowMode.Truncate && this.height <= 0;
+        };
         _create_class$3(TextRenderer, [
             {
                 key: "color",
@@ -23651,6 +23656,16 @@
                 get: /**
        * The bounding volume of the TextRenderer.
        */ function get() {
+                    if (this._isTextNoVisible()) {
+                        if (this._isContainDirtyFlag(0x8)) {
+                            var localBounds = this._localBounds;
+                            localBounds.min.set(0, 0, 0);
+                            localBounds.max.set(0, 0, 0);
+                            this._updateBounds(this._bounds);
+                            this._setDirtyFlagFalse(0x8);
+                        }
+                        return this._bounds;
+                    }
                     this._isContainDirtyFlag(0x1) && this._resetSubFont();
                     this._isContainDirtyFlag(0x2) && this._updateLocalData();
                     this._isContainDirtyFlag(0x4) && this._updatePosition();
@@ -26629,12 +26644,38 @@
         /**
        * @internal
        */ RenderQueue._compareFromNearToFar = function _compareFromNearToFar(a, b) {
-            return a.data.component.priority - b.data.component.priority || a.data.material._priority - b.data.material._priority || a.data.component._distanceForSort - b.data.component._distanceForSort;
+            var dataA = a.data;
+            var dataB = b.data;
+            var componentA = dataA.component;
+            var componentB = dataB.component;
+            var priorityOrder = componentA.priority - componentB.priority;
+            if (priorityOrder !== 0) {
+                return priorityOrder;
+            }
+            // make suer from the same renderer.
+            if (componentA.instanceId === componentB.instanceId) {
+                return dataA.material._priority - dataB.material._priority || componentA._distanceForSort - componentB._distanceForSort;
+            } else {
+                return componentA._distanceForSort - componentB._distanceForSort;
+            }
         };
         /**
        * @internal
        */ RenderQueue._compareFromFarToNear = function _compareFromFarToNear(a, b) {
-            return a.data.component.priority - b.data.component.priority || a.data.material._priority - b.data.material._priority || b.data.component._distanceForSort - a.data.component._distanceForSort;
+            var dataA = a.data;
+            var dataB = b.data;
+            var componentA = dataA.component;
+            var componentB = dataB.component;
+            var priorityOrder = componentA.priority - componentB.priority;
+            if (priorityOrder !== 0) {
+                return priorityOrder;
+            }
+            // make suer from the same renderer.
+            if (componentA.instanceId === componentB.instanceId) {
+                return dataA.material._priority - dataB.material._priority || componentB._distanceForSort - componentA._distanceForSort;
+            } else {
+                return componentB._distanceForSort - componentA._distanceForSort;
+            }
         };
         return RenderQueue;
     }();
@@ -43148,7 +43189,7 @@
         };
         _proto._makeSprite = function _makeSprite(engine, config, texture) {
             // Generate a SpriteAtlas object.
-            var region = config.region, atlasRegionOffset = config.atlasRegionOffset, atlasRegion = config.atlasRegion, pivot = config.pivot, border = config.border;
+            var region = config.region, atlasRegionOffset = config.atlasRegionOffset, atlasRegion = config.atlasRegion, pivot = config.pivot, border = config.border, width = config.width, height = config.height;
             var sprite = new Sprite(engine, texture, region ? this._tempRect.set(region.x, region.y, region.w, region.h) : undefined, pivot ? this._tempVec2.set(pivot.x, pivot.y) : undefined, border ? this._tempVec4.set(border.x, border.y, border.z, border.w) : undefined, config.name);
             if (texture) {
                 var invW = 1 / texture.width;
@@ -43160,6 +43201,8 @@
                 }
                 config.atlasRotated && (sprite.atlasRotated = true);
             }
+            isNaN(width) || (sprite.width = width);
+            isNaN(height) || (sprite.height = height);
             return sprite;
         };
         return SpriteAtlasLoader;
@@ -43194,11 +43237,19 @@
             if (data.texture) {
                 return resourceManager // @ts-ignore
                 .getResourceByRef(data.texture).then(function(texture) {
-                    return new Sprite(resourceManager.engine, texture, data.region, data.pivot, data.border);
+                    var sprite = new Sprite(resourceManager.engine, texture, data.region, data.pivot, data.border);
+                    var width = data.width, height = data.height;
+                    isNaN(width) || (sprite.width = width);
+                    isNaN(height) || (sprite.height = height);
+                    return sprite;
                 });
             } else {
                 return new AssetPromise(function(resolve) {
-                    resolve(new Sprite(resourceManager.engine, null, data.region, data.pivot, data.border));
+                    var sprite = new Sprite(resourceManager.engine, null, data.region, data.pivot, data.border);
+                    var width = data.width, height = data.height;
+                    isNaN(width) || (sprite.width = width);
+                    isNaN(height) || (sprite.height = height);
+                    resolve(sprite);
                 });
             }
         };
@@ -43977,7 +44028,7 @@
     ], GALACEAN_animation_event);
 
     //@ts-ignore
-    var version = "1.1.0-beta.34";
+    var version = "1.1.0-beta.36";
     console.log("Galacean engine version: " + version);
     for(var key in CoreObjects){
         Loader.registerClass(key, CoreObjects[key]);