@galacean/engine-core 0.0.0-experimental-1.4-small-language.0 → 0.0.0-experimental-1.4-small-language.1

package/dist/main.js

@@ -1220,7 +1220,11 @@ var Logger = {
         }
         if (width > 0 && height > 0 && data) {
             charInfo.bufferOffset = new engineMath.Vector2(this._curX, this._curY);
-            texture.setPixelBuffer(data, 0, this._curX, this._curY, width, height);
+            if (_instanceof(data, Uint8Array)) {
+                texture.setPixelBuffer(data, 0, this._curX, this._curY, width, height);
+            } else {
+                texture.setImageSource(data, 0, false, false, this._curX, this._curY);
+            }
             texture.generateMipmaps();
         }
         var textureSizeReciprocal = 1.0 / textureSize;
@@ -1577,6 +1581,7 @@ FontAtlas.textureSize = 256;
         context.clearRect(0, 0, width, height);
         context.textBaseline = "middle";
         context.fillStyle = "#fff";
+        context.lineJoin = 'round';
         if (actualBoundingBoxLeft > 0) {
             context.fillText(measureString, actualBoundingBoxLeft, baseline);
         } else {
@@ -1592,19 +1597,24 @@ FontAtlas.textureSize = 256;
         var size = 0;
         var integerW = canvas.width;
         var integerWReciprocal = 1.0 / integerW;
-        for(var i = 0; i < len; i += 4){
-            if (colorData[i + 3] !== 0) {
-                var idx = i * 0.25;
-                y = ~~(idx * integerWReciprocal);
-                if (top === -1) {
-                    top = y;
-                }
-                if (y > bottom) {
-                    bottom = y;
+        if (this.useImageData) {
+            for(var i = 0; i < len; i += 4){
+                if (colorData[i + 3] !== 0) {
+                    var idx = i * 0.25;
+                    y = ~~(idx * integerWReciprocal);
+                    if (top === -1) {
+                        top = y;
+                    }
+                    if (y > bottom) {
+                        bottom = y;
+                    }
+                } else {
+                    colorData[i] = colorData[i + 1] = colorData[i + 2] = 255;
                 }
-            } else {
-                colorData[i] = colorData[i + 1] = colorData[i + 2] = 255;
             }
+        } else {
+            top = 0;
+            bottom = height - 1;
         }
         if (top !== -1 && bottom !== -1) {
             ascent = baseline - top;
@@ -1615,9 +1625,13 @@ FontAtlas.textureSize = 256;
         if (isChar) {
             var data = null;
             if (size > 0) {
-                var lineIntegerW = integerW * 4;
-                // gl.texSubImage2D uploading data of type Uint8ClampedArray is not supported in some devices(eg: IphoneX IOS 13.6.1).
-                data = new Uint8Array(colorData.buffer, top * lineIntegerW, size * lineIntegerW);
+                if (this.useImageData) {
+                    // gl.texSubImage2D uploading data of type Uint8ClampedArray is not supported in some devices(eg: IphoneX IOS 13.6.1).
+                    var lineIntegerW = integerW * 4;
+                    data = new Uint8Array(colorData.buffer, top * lineIntegerW, size * lineIntegerW);
+                } else {
+                    data = canvas;
+                }
             }
             return {
                 char: measureString,
@@ -1680,6 +1694,7 @@ FontAtlas.textureSize = 256;
     "emoji",
     "fangsong"
 ];
+TextUtils.useImageData = true;
 // _extendHeight used to extend the height of canvas, because in miniprogram performance is different from h5.
 /** @internal */ TextUtils._extendHeight = 0;
 /** These characters are all tall to help calculate the height required for text. */ TextUtils._measureString = "|ÉqÅ";
@@ -1782,7 +1797,11 @@ TextUtils._textContext = null;
                     var data = TextUtils.measureChar(charInfo.char, nativeFontString).data;
                     if (charInfo.w > 0 && charInfo.h > 0 && data) {
                         var bufferOffset = charInfo.bufferOffset;
-                        texture.setPixelBuffer(data, 0, bufferOffset.x, bufferOffset.y, charInfo.w, charInfo.h);
+                        if (_instanceof(data, Uint8Array)) {
+                            texture.setPixelBuffer(data, 0, bufferOffset.x, bufferOffset.y, charInfo.w, charInfo.h);
+                        } else {
+                            texture.setImageSource(data, 0, false, false, bufferOffset.x, bufferOffset.y);
+                        }
                     }
                 }
                 texture.generateMipmaps();