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

package/dist/browser.js

@@ -6272,7 +6272,11 @@
             }
             if (width > 0 && height > 0 && data) {
                 charInfo.bufferOffset = new Vector2(this._curX, this._curY);
-                texture.setPixelBuffer(data, 0, this._curX, this._curY, width, height);
+                if (_instanceof1$2(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;
@@ -6626,6 +6630,7 @@
             context.clearRect(0, 0, width, height);
             context.textBaseline = "middle";
             context.fillStyle = "#fff";
+            context.lineJoin = 'round';
             if (actualBoundingBoxLeft > 0) {
                 context.fillText(measureString, actualBoundingBoxLeft, baseline);
             } else {
@@ -6641,19 +6646,24 @@
             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;
@@ -6664,9 +6674,13 @@
             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,
@@ -6729,6 +6743,7 @@
         "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Å";
@@ -6830,7 +6845,11 @@
                         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 (_instanceof1$2(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();
@@ -50344,7 +50363,7 @@
     ], EXT_texture_webp);
 
     //@ts-ignore
-    var version = "0.0.0-experimental-1.4-small-language.0";
+    var version = "0.0.0-experimental-1.4-small-language.2";
     console.log("Galacean Engine Version: " + version);
     for(var key in CoreObjects){
         Loader.registerClass(key, CoreObjects[key]);