@galacean/engine-core 1.1.0-beta.34 → 1.1.0-beta.35

package/dist/miniprogram.js

@@ -18542,7 +18542,7 @@ var /**
     /**
    * @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)) {
@@ -18634,8 +18634,8 @@ var /**
         }
     };
     _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;
@@ -18744,6 +18744,9 @@ var /**
         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(TextRenderer, [
         {
             key: "color",
@@ -18946,6 +18949,16 @@ var /**
             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();
@@ -21947,12 +21960,38 @@ var passNum = 0;
     /**
    * @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;
 }();

package/dist/module.js

@@ -18537,7 +18537,7 @@ var /**
     /**
    * @internal
    */ _proto._render = function _render(context) {
-        if (this._text === "" || this.enableWrapping && this.width <= 0 || this.overflowMode === OverflowMode.Truncate && this.height <= 0) {
+        if (this._isTextNoVisible()) {
             return;
         }
         if (this._isContainDirtyFlag(0x10)) {
@@ -18629,8 +18629,8 @@ var /**
         }
     };
     _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;
@@ -18739,6 +18739,9 @@ var /**
         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 === OverflowMode.Truncate && this.height <= 0;
+    };
     _create_class(TextRenderer, [
         {
             key: "color",
@@ -18941,6 +18944,16 @@ var /**
             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();
@@ -21942,12 +21955,38 @@ var passNum = 0;
     /**
    * @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;
 }();