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

package/dist/miniprogram.js

@@ -1948,13 +1948,15 @@ var Logger = {
     ];
 })();
 (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;
@@ -2038,7 +2040,7 @@ var Logger = {
         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);
@@ -18703,7 +18705,7 @@ var /**
                             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);
@@ -21972,7 +21974,12 @@ var passNum = 0;
         if (componentA.instanceId === componentB.instanceId) {
             return dataA.material._priority - dataB.material._priority || componentA._distanceForSort - componentB._distanceForSort;
         } else {
-            return componentA._distanceForSort - componentB._distanceForSort;
+            var distanceDiff = componentA._distanceForSort - componentB._distanceForSort;
+            if (distanceDiff === 0) {
+                return componentA.instanceId - componentB.instanceId;
+            } else {
+                return distanceDiff;
+            }
         }
     };
     /**
@@ -21990,7 +21997,12 @@ var passNum = 0;
         if (componentA.instanceId === componentB.instanceId) {
             return dataA.material._priority - dataB.material._priority || componentB._distanceForSort - componentA._distanceForSort;
         } else {
-            return componentB._distanceForSort - componentA._distanceForSort;
+            var distanceDiff = componentB._distanceForSort - componentA._distanceForSort;
+            if (distanceDiff === 0) {
+                return componentA.instanceId - componentB.instanceId;
+            } else {
+                return distanceDiff;
+            }
         }
     };
     return RenderQueue;

package/dist/module.js

@@ -1943,13 +1943,15 @@ var Logger = {
     ];
 })();
 (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;
@@ -2033,7 +2035,7 @@ var Logger = {
         var _this = this, engine = _this._engine;
         var fontAtlas = new FontAtlas(engine);
         var texture = new Texture2D(engine, 256, 256, TextureFormat.R8G8B8A8, false);
-        texture.filterMode = TextureFilterMode.Point;
+        texture.filterMode = TextureFilterMode.Bilinear;
         fontAtlas.texture = texture;
         fontAtlas.isGCIgnored = texture.isGCIgnored = true;
         this._fontAtlases.push(fontAtlas);
@@ -18698,7 +18700,7 @@ var /**
                             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);
@@ -21967,7 +21969,12 @@ var passNum = 0;
         if (componentA.instanceId === componentB.instanceId) {
             return dataA.material._priority - dataB.material._priority || componentA._distanceForSort - componentB._distanceForSort;
         } else {
-            return componentA._distanceForSort - componentB._distanceForSort;
+            var distanceDiff = componentA._distanceForSort - componentB._distanceForSort;
+            if (distanceDiff === 0) {
+                return componentA.instanceId - componentB.instanceId;
+            } else {
+                return distanceDiff;
+            }
         }
     };
     /**
@@ -21985,7 +21992,12 @@ var passNum = 0;
         if (componentA.instanceId === componentB.instanceId) {
             return dataA.material._priority - dataB.material._priority || componentB._distanceForSort - componentA._distanceForSort;
         } else {
-            return componentB._distanceForSort - componentA._distanceForSort;
+            var distanceDiff = componentB._distanceForSort - componentA._distanceForSort;
+            if (distanceDiff === 0) {
+                return componentA.instanceId - componentB.instanceId;
+            } else {
+                return distanceDiff;
+            }
         }
     };
     return RenderQueue;