@galacean/engine 1.3.3 → 1.3.5

package/dist/browser.js

@@ -15967,9 +15967,12 @@
             // 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;
@@ -15983,7 +15986,11 @@
             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;
@@ -16027,9 +16034,9 @@
                     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(),
@@ -16594,7 +16601,7 @@
                                 j === firstRow && (minX = Math.min(minX, left));
                                 maxX = Math.max(maxX, right);
                             }
-                            startX += charInfo.xAdvance;
+                            startX += charInfo.xAdvance + charInfo.offsetX;
                         }
                     }
                     startY -= lineHeight;
@@ -17411,8 +17418,6 @@
             _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;
@@ -23619,12 +23624,12 @@
     /**
      * @internal
      */ var PrimitiveChunkManager = /*#__PURE__*/ function() {
-        function PrimitiveChunkManager(engine, maxVertexCount) {
-            if (maxVertexCount === void 0) maxVertexCount = PrimitiveChunkManager.MAX_VERTEX_COUNT;
+        var PrimitiveChunkManager = function PrimitiveChunkManager(engine, maxVertexCount) {
+            if (maxVertexCount === void 0) maxVertexCount = 4096;
             this.engine = engine;
             this.maxVertexCount = maxVertexCount;
             this.primitiveChunks = new Array();
-        }
+        };
         var _proto = PrimitiveChunkManager.prototype;
         _proto.allocateSubChunk = function allocateSubChunk(vertexCount) {
             var _primitiveChunks, _length;
@@ -23661,9 +23666,6 @@
         };
         return PrimitiveChunkManager;
     }();
-    (function() {
-        /** The maximum number of vertex. */ PrimitiveChunkManager.MAX_VERTEX_COUNT = 4096;
-    })();
     /**
      * @internal
      */ var BatcherManager = /*#__PURE__*/ function() {
@@ -48070,7 +48072,7 @@
     ], EXT_texture_webp);
 
     //@ts-ignore
-    var version = "1.3.3";
+    var version = "1.3.5";
     console.log("Galacean engine version: " + version);
     for(var key in CoreObjects){
         Loader.registerClass(key, CoreObjects[key]);