@galacean/engine-core 1.3.2 → 1.3.5

package/dist/miniprogram.js

@@ -11170,9 +11170,12 @@ var /**
         // Safari gets data confusion through getImageData when the canvas width is not an integer.
         // The measure text width of some special invisible characters may be 0, so make sure the width is at least 1.
         // @todo: Text layout may vary from standard and not support emoji.
-        var textMetrics = context.measureText(measureString);
+        var _context_measureText = context.measureText(measureString), actualBoundingBoxLeft = _context_measureText.actualBoundingBoxLeft, actualBoundingBoxRight = _context_measureText.actualBoundingBoxRight, actualWidth = _context_measureText.width;
         // In some case (ex: " "), actualBoundingBoxRight and actualBoundingBoxLeft will be 0, so use width.
-        var width = Math.max(1, Math.round(textMetrics.actualBoundingBoxRight - textMetrics.actualBoundingBoxLeft || textMetrics.width));
+        // TODO: With testing, actualBoundingBoxLeft + actualBoundingBoxRight is the actual rendering width
+        // but the space rules between characters are unclear. Using actualBoundingBoxRight + Math.abs(actualBoundingBoxLeft) is the closest to the native effect.
+        var width = Math.max(1, Math.round(Math.max(actualBoundingBoxRight + Math.abs(actualBoundingBoxLeft), actualWidth)));
+        // Make sure enough width.
         var baseline = Math.ceil(context.measureText(TextUtils._measureBaseline).width);
         var height = baseline * TextUtils._heightMultiplier;
         baseline = TextUtils._baselineMultiplier * baseline | 0;
@@ -11186,7 +11189,11 @@ var /**
         context.clearRect(0, 0, width, height);
         context.textBaseline = "middle";
         context.fillStyle = "#fff";
-        context.fillText(measureString, 0, baseline);
+        if (actualBoundingBoxLeft > 0) {
+            context.fillText(measureString, actualBoundingBoxLeft, baseline);
+        } else {
+            context.fillText(measureString, 0, baseline);
+        }
         var colorData = context.getImageData(0, 0, width, height).data;
         var len = colorData.length;
         var top = -1;
@@ -11230,9 +11237,9 @@ var /**
                 y: 0,
                 w: width,
                 h: size,
-                offsetX: 0,
+                offsetX: actualBoundingBoxLeft > 0 ? actualBoundingBoxLeft : 0,
                 offsetY: (ascent - descent) * 0.5,
-                xAdvance: width,
+                xAdvance: Math.round(actualWidth),
                 uvs: [
                     new miniprogram.Vector2(),
                     new miniprogram.Vector2(),
@@ -11801,7 +11808,7 @@ var /**
                             j === firstRow && (minX = Math.min(minX, left));
                             maxX = Math.max(maxX, right);
                         }
-                        startX += charInfo.xAdvance;
+                        startX += charInfo.xAdvance + charInfo.offsetX;
                     }
                 }
                 startY -= lineHeight;
@@ -12631,8 +12638,6 @@ var BufferUtil = /*#__PURE__*/ function() {
         _this = ReferResource1.call(this, engine) || this;
         /** @internal */ _this._renderStates = [] // todo: later will as a part of shaderData when shader effect frame is OK, that is more powerful and flexible.
         ;
-        /** @internal */ _this._priority = 0 // todo: temporary resolution of submesh rendering order issue.
-        ;
         _this._shaderData = new ShaderData(ShaderDataGroup.Material);
         _this.shader = shader;
         return _this;
@@ -17824,6 +17829,17 @@ var ComponentCloner = /*#__PURE__*/ function() {
         this._setInActiveInHierarchy(this._activeChangedComponents, activeChangeFlag);
         this._setActiveComponents(false, activeChangeFlag);
     };
+    /**
+   * @internal
+   */ _proto._setTransformDirty = function _setTransformDirty() {
+        if (this.transform) {
+            this.transform._parentChange();
+        } else {
+            for(var i = 0, len = this._children.length; i < len; i++){
+                this._children[i]._setTransformDirty();
+            }
+        }
+    };
     _proto._addToChildrenList = function _addToChildrenList(index, child) {
         var children = this._children;
         var childCount = children.length;
@@ -17933,15 +17949,6 @@ var ComponentCloner = /*#__PURE__*/ function() {
             child.isActive && child._setInActiveInHierarchy(activeChangedComponents, activeChangeFlag);
         }
     };
-    _proto._setTransformDirty = function _setTransformDirty() {
-        if (this.transform) {
-            this.transform._parentChange();
-        } else {
-            for(var i = 0, len = this._children.length; i < len; i++){
-                this._children[i]._setTransformDirty();
-            }
-        }
-    };
     _proto._setSiblingIndex = function _setSiblingIndex(sibling, target) {
         target = Math.min(target, sibling.length - 1);
         if (target < 0) {
@@ -18880,7 +18887,7 @@ var ObjectPool = /*#__PURE__*/ function() {
  * @internal
  */ var PrimitiveChunkManager = /*#__PURE__*/ function() {
     function PrimitiveChunkManager(engine, maxVertexCount) {
-        if (maxVertexCount === void 0) maxVertexCount = PrimitiveChunkManager.MAX_VERTEX_COUNT;
+        if (maxVertexCount === void 0) maxVertexCount = 4096;
         this.engine = engine;
         this.maxVertexCount = maxVertexCount;
         this.primitiveChunks = new Array();
@@ -18921,9 +18928,6 @@ var ObjectPool = /*#__PURE__*/ function() {
     };
     return PrimitiveChunkManager;
 }();
-(function() {
-    /** The maximum number of vertex. */ PrimitiveChunkManager.MAX_VERTEX_COUNT = 4096;
-})();
 
 /**
  * @internal
@@ -25667,6 +25671,7 @@ Shader.create(_PostProcessManager.UBER_SHADER_NAME, blitVs, UberPost);
         if (!isRoot) {
             entity._isRoot = true;
             entity._removeFromParent();
+            entity._setTransformDirty();
         }
         // Add or remove from scene's rootEntities
         var oldScene = entity._scene;

package/dist/module.js

@@ -11165,9 +11165,12 @@ var /**
         // Safari gets data confusion through getImageData when the canvas width is not an integer.
         // The measure text width of some special invisible characters may be 0, so make sure the width is at least 1.
         // @todo: Text layout may vary from standard and not support emoji.
-        var textMetrics = context.measureText(measureString);
+        var _context_measureText = context.measureText(measureString), actualBoundingBoxLeft = _context_measureText.actualBoundingBoxLeft, actualBoundingBoxRight = _context_measureText.actualBoundingBoxRight, actualWidth = _context_measureText.width;
         // In some case (ex: " "), actualBoundingBoxRight and actualBoundingBoxLeft will be 0, so use width.
-        var width = Math.max(1, Math.round(textMetrics.actualBoundingBoxRight - textMetrics.actualBoundingBoxLeft || textMetrics.width));
+        // TODO: With testing, actualBoundingBoxLeft + actualBoundingBoxRight is the actual rendering width
+        // but the space rules between characters are unclear. Using actualBoundingBoxRight + Math.abs(actualBoundingBoxLeft) is the closest to the native effect.
+        var width = Math.max(1, Math.round(Math.max(actualBoundingBoxRight + Math.abs(actualBoundingBoxLeft), actualWidth)));
+        // Make sure enough width.
         var baseline = Math.ceil(context.measureText(TextUtils._measureBaseline).width);
         var height = baseline * TextUtils._heightMultiplier;
         baseline = TextUtils._baselineMultiplier * baseline | 0;
@@ -11181,7 +11184,11 @@ var /**
         context.clearRect(0, 0, width, height);
         context.textBaseline = "middle";
         context.fillStyle = "#fff";
-        context.fillText(measureString, 0, baseline);
+        if (actualBoundingBoxLeft > 0) {
+            context.fillText(measureString, actualBoundingBoxLeft, baseline);
+        } else {
+            context.fillText(measureString, 0, baseline);
+        }
         var colorData = context.getImageData(0, 0, width, height).data;
         var len = colorData.length;
         var top = -1;
@@ -11225,9 +11232,9 @@ var /**
                 y: 0,
                 w: width,
                 h: size,
-                offsetX: 0,
+                offsetX: actualBoundingBoxLeft > 0 ? actualBoundingBoxLeft : 0,
                 offsetY: (ascent - descent) * 0.5,
-                xAdvance: width,
+                xAdvance: Math.round(actualWidth),
                 uvs: [
                     new Vector2(),
                     new Vector2(),
@@ -11796,7 +11803,7 @@ var /**
                             j === firstRow && (minX = Math.min(minX, left));
                             maxX = Math.max(maxX, right);
                         }
-                        startX += charInfo.xAdvance;
+                        startX += charInfo.xAdvance + charInfo.offsetX;
                     }
                 }
                 startY -= lineHeight;
@@ -12626,8 +12633,6 @@ var BufferUtil = /*#__PURE__*/ function() {
         _this = ReferResource1.call(this, engine) || this;
         /** @internal */ _this._renderStates = [] // todo: later will as a part of shaderData when shader effect frame is OK, that is more powerful and flexible.
         ;
-        /** @internal */ _this._priority = 0 // todo: temporary resolution of submesh rendering order issue.
-        ;
         _this._shaderData = new ShaderData(ShaderDataGroup.Material);
         _this.shader = shader;
         return _this;
@@ -17819,6 +17824,17 @@ var ComponentCloner = /*#__PURE__*/ function() {
         this._setInActiveInHierarchy(this._activeChangedComponents, activeChangeFlag);
         this._setActiveComponents(false, activeChangeFlag);
     };
+    /**
+   * @internal
+   */ _proto._setTransformDirty = function _setTransformDirty() {
+        if (this.transform) {
+            this.transform._parentChange();
+        } else {
+            for(var i = 0, len = this._children.length; i < len; i++){
+                this._children[i]._setTransformDirty();
+            }
+        }
+    };
     _proto._addToChildrenList = function _addToChildrenList(index, child) {
         var children = this._children;
         var childCount = children.length;
@@ -17928,15 +17944,6 @@ var ComponentCloner = /*#__PURE__*/ function() {
             child.isActive && child._setInActiveInHierarchy(activeChangedComponents, activeChangeFlag);
         }
     };
-    _proto._setTransformDirty = function _setTransformDirty() {
-        if (this.transform) {
-            this.transform._parentChange();
-        } else {
-            for(var i = 0, len = this._children.length; i < len; i++){
-                this._children[i]._setTransformDirty();
-            }
-        }
-    };
     _proto._setSiblingIndex = function _setSiblingIndex(sibling, target) {
         target = Math.min(target, sibling.length - 1);
         if (target < 0) {
@@ -18875,7 +18882,7 @@ var ObjectPool = /*#__PURE__*/ function() {
  * @internal
  */ var PrimitiveChunkManager = /*#__PURE__*/ function() {
     function PrimitiveChunkManager(engine, maxVertexCount) {
-        if (maxVertexCount === void 0) maxVertexCount = PrimitiveChunkManager.MAX_VERTEX_COUNT;
+        if (maxVertexCount === void 0) maxVertexCount = 4096;
         this.engine = engine;
         this.maxVertexCount = maxVertexCount;
         this.primitiveChunks = new Array();
@@ -18916,9 +18923,6 @@ var ObjectPool = /*#__PURE__*/ function() {
     };
     return PrimitiveChunkManager;
 }();
-(function() {
-    /** The maximum number of vertex. */ PrimitiveChunkManager.MAX_VERTEX_COUNT = 4096;
-})();
 
 /**
  * @internal
@@ -25662,6 +25666,7 @@ Shader.create(_PostProcessManager.UBER_SHADER_NAME, blitVs, UberPost);
         if (!isRoot) {
             entity._isRoot = true;
             entity._removeFromParent();
+            entity._setTransformDirty();
         }
         // Add or remove from scene's rootEntities
         var oldScene = entity._scene;