@galacean/engine 1.3.2 → 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;
@@ -22571,6 +22576,17 @@
             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;
@@ -22680,15 +22696,6 @@
                 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) {
@@ -23617,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;
@@ -23659,9 +23666,6 @@
         };
         return PrimitiveChunkManager;
     }();
-    (function() {
-        /** The maximum number of vertex. */ PrimitiveChunkManager.MAX_VERTEX_COUNT = 4096;
-    })();
     /**
      * @internal
      */ var BatcherManager = /*#__PURE__*/ function() {
@@ -30295,6 +30299,7 @@
             if (!isRoot) {
                 entity._isRoot = true;
                 entity._removeFromParent();
+                entity._setTransformDirty();
             }
             // Add or remove from scene's rootEntities
             var oldScene = entity._scene;
@@ -45946,57 +45951,18 @@
     ], exports.GLTFSkinParser);
     var _GLTFTextureParser;
     exports.GLTFTextureParser = (_GLTFTextureParser = /*#__PURE__*/ function(GLTFParser1) {
-        var GLTFTextureParser = function GLTFTextureParser() {
+        var GLTFTextureParser1 = function GLTFTextureParser1() {
             return GLTFParser1.apply(this, arguments);
         };
-        _inherits(GLTFTextureParser, GLTFParser1);
-        var _proto = GLTFTextureParser.prototype;
-        _proto.parse = function parse(context, index) {
-            var textureInfo = context.glTF.textures[index];
-            var glTFResource = context.glTFResource, glTF = context.glTF;
-            var engine = glTFResource.engine, url = glTFResource.url;
-            var sampler = textureInfo.sampler, _textureInfo_source = textureInfo.source, source = _textureInfo_source === void 0 ? 0 : _textureInfo_source, textureName = textureInfo.name, extensions = textureInfo.extensions;
-            var _glTF_images_source = glTF.images[source], uri = _glTF_images_source.uri, bufferViewIndex = _glTF_images_source.bufferView, mimeType = _glTF_images_source.mimeType, imageName = _glTF_images_source.name;
-            var texture = GLTFParser.executeExtensionsCreateAndParse(extensions, context, textureInfo);
+        _inherits(GLTFTextureParser1, GLTFParser1);
+        var _proto = GLTFTextureParser1.prototype;
+        _proto.parse = function parse(context, textureIndex) {
+            var textureInfo = context.glTF.textures[textureIndex];
+            var glTFResource = context.glTFResource;
+            var sampler = textureInfo.sampler, tmp = textureInfo.source, imageIndex = tmp === void 0 ? 0 : tmp, textureName = textureInfo.name, extensions = textureInfo.extensions;
+            var texture = GLTFParser.executeExtensionsCreateAndParse(extensions, context, textureInfo, textureIndex);
             if (!texture) {
-                var useSampler = sampler !== undefined;
-                var samplerInfo = sampler !== undefined && GLTFUtils.getSamplerInfo(glTF.samplers[sampler]);
-                if (uri) {
-                    var _samplerInfo;
-                    // TODO: deleted in 2.0
-                    var extIndex = uri.lastIndexOf(".");
-                    var ext = uri.substring(extIndex + 1);
-                    var type = ext.startsWith("ktx") ? exports.AssetType.KTX : exports.AssetType.Texture2D;
-                    texture = engine.resourceManager.load({
-                        url: Utils.resolveAbsoluteUrl(url, uri),
-                        type: type,
-                        params: {
-                            mipmap: (_samplerInfo = samplerInfo) == null ? void 0 : _samplerInfo.mipmap
-                        }
-                    }).onProgress(undefined, context._onTaskDetail).then(function(texture) {
-                        texture.name = textureName || imageName || texture.name || "texture_" + index;
-                        useSampler && GLTFUtils.parseSampler(texture, samplerInfo);
-                        return texture;
-                    });
-                    context._addTaskCompletePromise(texture);
-                } else {
-                    var bufferView = glTF.bufferViews[bufferViewIndex];
-                    texture = context.get(exports.GLTFParserType.Buffer).then(function(buffers) {
-                        var buffer = buffers[bufferView.buffer];
-                        var imageBuffer = new Uint8Array(buffer, bufferView.byteOffset, bufferView.byteLength);
-                        return GLTFUtils.loadImageBuffer(imageBuffer, mimeType).then(function(image) {
-                            var _samplerInfo;
-                            var texture = new Texture2D(engine, image.width, image.height, undefined, (_samplerInfo = samplerInfo) == null ? void 0 : _samplerInfo.mipmap);
-                            texture.setImageSource(image);
-                            texture.generateMipmaps();
-                            texture.name = textureName || imageName || "texture_" + index;
-                            useSampler && GLTFUtils.parseSampler(texture, samplerInfo);
-                            var bufferTextureRestoreInfo = new BufferTextureRestoreInfo(texture, bufferView, mimeType);
-                            context.contentRestorer.bufferTextures.push(bufferTextureRestoreInfo);
-                            return texture;
-                        });
-                    });
-                }
+                texture = exports.GLTFTextureParser._parseTexture(context, imageIndex, textureIndex, sampler, textureName);
             }
             return Promise.resolve(texture).then(function(texture) {
                 GLTFParser.executeExtensionsAdditiveAndParse(extensions, context, texture, textureInfo);
@@ -46005,7 +45971,51 @@
                 return texture;
             });
         };
-        return GLTFTextureParser;
+        /** @internal */ GLTFTextureParser1._parseTexture = function _parseTexture(context, imageIndex, textureIndex, sampler, textureName) {
+            var glTFResource = context.glTFResource, glTF = context.glTF;
+            var engine = glTFResource.engine, url = glTFResource.url;
+            var _glTF_images_imageIndex = glTF.images[imageIndex], uri = _glTF_images_imageIndex.uri, bufferViewIndex = _glTF_images_imageIndex.bufferView, mimeType = _glTF_images_imageIndex.mimeType, imageName = _glTF_images_imageIndex.name;
+            var useSampler = sampler !== undefined;
+            var samplerInfo = useSampler && GLTFUtils.getSamplerInfo(glTF.samplers[sampler]);
+            var texture;
+            if (uri) {
+                var _samplerInfo;
+                var extIndex = uri.lastIndexOf(".");
+                var ext = uri.substring(extIndex + 1);
+                var type = ext.startsWith("ktx") ? exports.AssetType.KTX : exports.AssetType.Texture2D;
+                texture = engine.resourceManager.load({
+                    url: Utils.resolveAbsoluteUrl(url, uri),
+                    type: type,
+                    params: {
+                        mipmap: (_samplerInfo = samplerInfo) == null ? void 0 : _samplerInfo.mipmap
+                    }
+                }).onProgress(undefined, context._onTaskDetail).then(function(texture) {
+                    texture.name = textureName || imageName || texture.name || "texture_" + textureIndex;
+                    useSampler && GLTFUtils.parseSampler(texture, samplerInfo);
+                    return texture;
+                });
+                context._addTaskCompletePromise(texture);
+            } else {
+                var bufferView = glTF.bufferViews[bufferViewIndex];
+                texture = context.get(exports.GLTFParserType.Buffer).then(function(buffers) {
+                    var buffer = buffers[bufferView.buffer];
+                    var imageBuffer = new Uint8Array(buffer, bufferView.byteOffset, bufferView.byteLength);
+                    return GLTFUtils.loadImageBuffer(imageBuffer, mimeType).then(function(image) {
+                        var _samplerInfo;
+                        var texture = new Texture2D(engine, image.width, image.height, undefined, (_samplerInfo = samplerInfo) == null ? void 0 : _samplerInfo.mipmap);
+                        texture.setImageSource(image);
+                        texture.generateMipmaps();
+                        texture.name = textureName || imageName || "texture_" + textureIndex;
+                        useSampler && GLTFUtils.parseSampler(texture, samplerInfo);
+                        var bufferTextureRestoreInfo = new BufferTextureRestoreInfo(texture, bufferView, mimeType);
+                        context.contentRestorer.bufferTextures.push(bufferTextureRestoreInfo);
+                        return texture;
+                    });
+                });
+            }
+            return texture;
+        };
+        return GLTFTextureParser1;
     }(GLTFParser), function() {
         var _obj;
         /** @internal */ _GLTFTextureParser._wrapMap = (_obj = {}, _obj[TextureWrapMode.CLAMP_TO_EDGE] = exports.TextureWrapMode.Clamp, _obj[TextureWrapMode.MIRRORED_REPEAT] = exports.TextureWrapMode.Mirror, _obj[TextureWrapMode.REPEAT] = exports.TextureWrapMode.Repeat, _obj);
@@ -48028,9 +48038,41 @@
     KHR_materials_anisotropy = __decorate([
         registerGLTFExtension("KHR_materials_anisotropy", exports.GLTFExtensionMode.AdditiveParse)
     ], KHR_materials_anisotropy);
+    var EXT_texture_webp = /*#__PURE__*/ function(GLTFExtensionParser1) {
+        var EXT_texture_webp = function EXT_texture_webp() {
+            var _this;
+            _this = GLTFExtensionParser1.call(this) || this;
+            _this._supportWebP = false;
+            var testCanvas = document.createElement("canvas");
+            testCanvas.width = testCanvas.height = 1;
+            _this._supportWebP = testCanvas.toDataURL("image/webp").indexOf("data:image/webp") == 0;
+            return _this;
+        };
+        _inherits(EXT_texture_webp, GLTFExtensionParser1);
+        var _proto = EXT_texture_webp.prototype;
+        _proto.createAndParse = function createAndParse(context, schema, textureInfo, textureIndex) {
+            var _this = this;
+            return _async_to_generator(function() {
+                var webPIndex, sampler, tmp, fallbackIndex, textureName, texture;
+                return __generator(this, function(_state) {
+                    webPIndex = schema.source;
+                    sampler = textureInfo.sampler, tmp = textureInfo.source, fallbackIndex = tmp === void 0 ? 0 : tmp, textureName = textureInfo.name;
+                    texture = exports.GLTFTextureParser._parseTexture(context, _this._supportWebP ? webPIndex : fallbackIndex, textureIndex, sampler, textureName);
+                    return [
+                        2,
+                        texture
+                    ];
+                });
+            })();
+        };
+        return EXT_texture_webp;
+    }(GLTFExtensionParser);
+    EXT_texture_webp = __decorate([
+        registerGLTFExtension("EXT_texture_webp", exports.GLTFExtensionMode.CreateAndParse)
+    ], EXT_texture_webp);
 
     //@ts-ignore
-    var version = "1.3.2";
+    var version = "1.3.5";
     console.log("Galacean engine version: " + version);
     for(var key in CoreObjects){
         Loader.registerClass(key, CoreObjects[key]);