@galacean/engine-core 1.1.0-beta.36 → 1.1.0-beta.39

package/dist/miniprogram.js

@@ -1838,6 +1838,9 @@ var Logger = {
         var baseline = Math.ceil(context.measureText(TextUtils._measureBaseline).width);
         var height = baseline * TextUtils._heightMultiplier;
         baseline = TextUtils._baselineMultiplier * baseline | 0;
+        var _extendHeight = TextUtils._extendHeight;
+        height += _extendHeight;
+        baseline += _extendHeight * 0.5;
         canvas.width = width;
         canvas.height = height;
         context.font = fontString;
@@ -1872,6 +1875,7 @@ var Logger = {
         }
         if (top !== -1 && bottom !== -1) {
             ascent = baseline - top;
+            // Baseline belong to descent
             descent = bottom - baseline + 1;
             size = ascent + descent;
         }
@@ -1948,9 +1952,8 @@ var Logger = {
     ];
 })();
 (function() {
-    // _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;
+    // _extendHeight used to extend the height of canvas, because in miniprogram performance is different from h5.
+    /** @internal */ TextUtils._extendHeight = 0;
 })();
 (function() {
     /** These characters are all tall to help calculate the height required for text. */ TextUtils._measureString = "|\xc9q\xc5";
@@ -1958,6 +1961,9 @@ var Logger = {
 (function() {
     TextUtils._measureBaseline = "M";
 })();
+(function() {
+    TextUtils._heightMultiplier = 2;
+})();
 (function() {
     TextUtils._baselineMultiplier = 1.4;
 })();
@@ -8315,7 +8321,7 @@ var BufferUtil = /*#__PURE__*/ function() {
             _this._byteLength = byteLength;
             _this._platformBuffer = engine._hardwareRenderer.createPlatformBuffer(type, byteLength, bufferUsage, data);
             if (readable) {
-                var buffer = (data.constructor === ArrayBuffer ? data : data.buffer).slice(0, byteLength);
+                var buffer = data.constructor === ArrayBuffer ? data.slice(0) : data.buffer.slice(data.byteOffset, data.byteOffset + byteLength);
                 _this._data = new Uint8Array(buffer);
             }
         }
@@ -16266,6 +16272,7 @@ __decorate([
             this._pointers.length = 0;
             this._downList.length = 0;
             this._upList.length = 0;
+            this._nativeEvents.length = 0;
         }
     };
     /**
@@ -21974,7 +21981,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;
+            }
         }
     };
     /**
@@ -21992,7 +22004,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

@@ -1833,6 +1833,9 @@ var Logger = {
         var baseline = Math.ceil(context.measureText(TextUtils._measureBaseline).width);
         var height = baseline * TextUtils._heightMultiplier;
         baseline = TextUtils._baselineMultiplier * baseline | 0;
+        var _extendHeight = TextUtils._extendHeight;
+        height += _extendHeight;
+        baseline += _extendHeight * 0.5;
         canvas.width = width;
         canvas.height = height;
         context.font = fontString;
@@ -1867,6 +1870,7 @@ var Logger = {
         }
         if (top !== -1 && bottom !== -1) {
             ascent = baseline - top;
+            // Baseline belong to descent
             descent = bottom - baseline + 1;
             size = ascent + descent;
         }
@@ -1943,9 +1947,8 @@ var Logger = {
     ];
 })();
 (function() {
-    // _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;
+    // _extendHeight used to extend the height of canvas, because in miniprogram performance is different from h5.
+    /** @internal */ TextUtils._extendHeight = 0;
 })();
 (function() {
     /** These characters are all tall to help calculate the height required for text. */ TextUtils._measureString = "|\xc9q\xc5";
@@ -1953,6 +1956,9 @@ var Logger = {
 (function() {
     TextUtils._measureBaseline = "M";
 })();
+(function() {
+    TextUtils._heightMultiplier = 2;
+})();
 (function() {
     TextUtils._baselineMultiplier = 1.4;
 })();
@@ -8310,7 +8316,7 @@ var BufferUtil = /*#__PURE__*/ function() {
             _this._byteLength = byteLength;
             _this._platformBuffer = engine._hardwareRenderer.createPlatformBuffer(type, byteLength, bufferUsage, data);
             if (readable) {
-                var buffer = (data.constructor === ArrayBuffer ? data : data.buffer).slice(0, byteLength);
+                var buffer = data.constructor === ArrayBuffer ? data.slice(0) : data.buffer.slice(data.byteOffset, data.byteOffset + byteLength);
                 _this._data = new Uint8Array(buffer);
             }
         }
@@ -16261,6 +16267,7 @@ __decorate([
             this._pointers.length = 0;
             this._downList.length = 0;
             this._upList.length = 0;
+            this._nativeEvents.length = 0;
         }
     };
     /**
@@ -21969,7 +21976,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;
+            }
         }
     };
     /**
@@ -21987,7 +21999,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;