@galacean/engine-core 1.2.0-beta.6 → 1.2.0-beta.7

package/dist/miniprogram.js

@@ -10981,6 +10981,38 @@ var PrimitiveType;
     PrimitiveMesh._spherePoleIdx = 0;
 })();
 
+function _is_native_reflect_construct() {
+    if (typeof Reflect === "undefined" || !Reflect.construct) return false;
+    if (Reflect.construct.sham) return false;
+    if (typeof Proxy === "function") return true;
+
+    try {
+        Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function() {}));
+
+        return true;
+    } catch (e) {
+        return false;
+    }
+}
+
+function _construct(Parent, args, Class) {
+    if (_is_native_reflect_construct()) _construct = Reflect.construct;
+    else {
+        _construct = function construct(Parent, args, Class) {
+            var a = [null];
+            a.push.apply(a, args);
+            var Constructor = Function.bind.apply(Parent, a);
+            var instance = new Constructor();
+
+            if (Class) _set_prototype_of(instance, Class.prototype);
+
+            return instance;
+        };
+    }
+
+    return _construct.apply(null, arguments);
+}
+
 /**
  * Layer, used for bit operations.
  */ exports.Layer = void 0;
@@ -11068,10 +11100,14 @@ var ComponentCloner = /*#__PURE__*/ function() {
     /**
    * Add component based on the component type.
    * @param type - The type of the component
+   * @param args - The arguments of the component
    * @returns	The component which has been added
    */ _proto.addComponent = function addComponent(type) {
+        for(var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++){
+            args[_key - 1] = arguments[_key];
+        }
         ComponentsDependencies._addCheck(this, type);
-        var component = new type(this);
+        var component = _construct(type, [].concat(this, args));
         this._components.push(component);
         component._setActive(true, ActiveChangeFlag.All);
         return component;
@@ -11240,7 +11276,7 @@ var ComponentCloner = /*#__PURE__*/ function() {
    * Clone this entity include children and components.
    * @returns Cloned entity
    */ _proto.clone = function clone() {
-        var cloneEntity = this._createCloneEntity(this);
+        var cloneEntity = this._createCloneEntity();
         this._parseCloneEntity(this, cloneEntity, this, cloneEntity, new Map());
         return cloneEntity;
     };
@@ -11250,23 +11286,23 @@ var ComponentCloner = /*#__PURE__*/ function() {
         this._isTemplate = true;
         this._templateResource = templateResource;
     };
-    _proto._createCloneEntity = function _createCloneEntity(srcEntity) {
-        var cloneEntity = new Entity(srcEntity._engine, srcEntity.name);
+    _proto._createCloneEntity = function _createCloneEntity() {
+        var cloneEntity = new Entity(this._engine, this.name);
         var templateResource = this._templateResource;
         if (templateResource) {
             cloneEntity._templateResource = templateResource;
             templateResource._addReferCount(1);
         }
-        cloneEntity.layer = srcEntity.layer;
-        cloneEntity._isActive = srcEntity._isActive;
+        cloneEntity.layer = this.layer;
+        cloneEntity._isActive = this._isActive;
         var cloneTransform = cloneEntity.transform;
-        var srcTransform = srcEntity.transform;
+        var _this = this, srcTransform = _this.transform;
         cloneTransform.position = srcTransform.position;
         cloneTransform.rotation = srcTransform.rotation;
         cloneTransform.scale = srcTransform.scale;
-        var children = srcEntity._children;
-        for(var i = 0, n = srcEntity._children.length; i < n; i++){
-            cloneEntity.addChild(this._createCloneEntity(children[i]));
+        var srcChildren = this._children;
+        for(var i = 0, n = srcChildren.length; i < n; i++){
+            cloneEntity.addChild(srcChildren[i]._createCloneEntity());
         }
         return cloneEntity;
     };
@@ -13477,7 +13513,7 @@ var /**
         if (info) {
             return info;
         }
-        info = TextUtils._measureFontOrChar(fontString);
+        info = TextUtils._measureFontOrChar(fontString, TextUtils._measureString, false);
         fontSizeInfoCache[fontString] = info;
         return info;
     };
@@ -13498,7 +13534,7 @@ var /**
         return str;
     };
     TextUtils.measureChar = function measureChar(char, fontString) {
-        return TextUtils._measureFontOrChar(fontString, char);
+        return TextUtils._measureFontOrChar(fontString, char, true);
     };
     TextUtils.measureTextWithWrap = function measureTextWithWrap(renderer) {
         var subFont = renderer._subFont;
@@ -13718,15 +13754,15 @@ var /**
     /**
    * @internal
    * Use internal for CanvasRenderer plugin.
-   */ TextUtils._measureFontOrChar = function _measureFontOrChar(fontString, char) {
-        if (char === void 0) char = "";
+   */ TextUtils._measureFontOrChar = function _measureFontOrChar(fontString, measureString, isChar) {
         var _TextUtils_textContext = TextUtils.textContext(), canvas = _TextUtils_textContext.canvas, context = _TextUtils_textContext.context;
         context.font = fontString;
-        var measureString = char || TextUtils._measureString;
         // 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 width = Math.max(1, Math.round(context.measureText(measureString).width));
+        var textMetrics = context.measureText(measureString);
+        // 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));
         var baseline = Math.ceil(context.measureText(TextUtils._measureBaseline).width);
         var height = baseline * TextUtils._heightMultiplier;
         baseline = TextUtils._baselineMultiplier * baseline | 0;
@@ -13771,12 +13807,7 @@ var /**
             descent = bottom - baseline + 1;
             size = ascent + descent;
         }
-        var sizeInfo = {
-            ascent: ascent,
-            descent: descent,
-            size: size
-        };
-        if (char) {
+        if (isChar) {
             var data = null;
             if (size > 0) {
                 var lineIntegerW = integerW * 4;
@@ -13784,7 +13815,7 @@ var /**
                 data = new Uint8Array(colorData.buffer, top * lineIntegerW, size * lineIntegerW);
             }
             return {
-                char: char,
+                char: measureString,
                 x: 0,
                 y: 0,
                 w: width,
@@ -13804,7 +13835,11 @@ var /**
                 data: data
             };
         } else {
-            return sizeInfo;
+            return {
+                ascent: ascent,
+                descent: descent,
+                size: size
+            };
         }
     };
     /**
@@ -16753,17 +16788,35 @@ var /** @internal */ PromiseState;
     };
     /**
    * @internal
-   */ _proto._onSubAssetSuccess = function _onSubAssetSuccess(assetURL, value) {
-        var _this__subAssetPromiseCallbacks_assetURL;
-        (_this__subAssetPromiseCallbacks_assetURL = this._subAssetPromiseCallbacks[assetURL]) == null ? void 0 : _this__subAssetPromiseCallbacks_assetURL.resolve(value);
-        delete this._subAssetPromiseCallbacks[assetURL];
+   */ _proto._onSubAssetSuccess = function _onSubAssetSuccess(assetBaseURL, assetSubPath, value) {
+        var _this__subAssetPromiseCallbacks_assetBaseURL;
+        var subPromiseCallback = (_this__subAssetPromiseCallbacks_assetBaseURL = this._subAssetPromiseCallbacks[assetBaseURL]) == null ? void 0 : _this__subAssetPromiseCallbacks_assetBaseURL[assetSubPath];
+        if (subPromiseCallback) {
+            // Already resolved
+            subPromiseCallback.resolve(value);
+        } else {
+            var // Pending
+            _this__subAssetPromiseCallbacks, _assetBaseURL;
+            ((_this__subAssetPromiseCallbacks = this._subAssetPromiseCallbacks)[_assetBaseURL = assetBaseURL] || (_this__subAssetPromiseCallbacks[_assetBaseURL] = {}))[assetSubPath] = {
+                resolve: value
+            };
+        }
     };
     /**
    * @internal
-   */ _proto._onSubAssetFail = function _onSubAssetFail(assetURL, value) {
-        var _this__subAssetPromiseCallbacks_assetURL;
-        (_this__subAssetPromiseCallbacks_assetURL = this._subAssetPromiseCallbacks[assetURL]) == null ? void 0 : _this__subAssetPromiseCallbacks_assetURL.reject(value);
-        delete this._subAssetPromiseCallbacks[assetURL];
+   */ _proto._onSubAssetFail = function _onSubAssetFail(assetBaseURL, assetSubPath, value) {
+        var _this__subAssetPromiseCallbacks_assetBaseURL;
+        var subPromiseCallback = (_this__subAssetPromiseCallbacks_assetBaseURL = this._subAssetPromiseCallbacks[assetBaseURL]) == null ? void 0 : _this__subAssetPromiseCallbacks_assetBaseURL[assetSubPath];
+        if (subPromiseCallback) {
+            // Already rejected
+            subPromiseCallback.reject(value);
+        } else {
+            var // Pending
+            _this__subAssetPromiseCallbacks, _assetBaseURL;
+            ((_this__subAssetPromiseCallbacks = this._subAssetPromiseCallbacks)[_assetBaseURL = assetBaseURL] || (_this__subAssetPromiseCallbacks[_assetBaseURL] = {}))[assetSubPath] = {
+                reject: value
+            };
+        }
     };
     /**
    * @internal
@@ -16908,8 +16961,21 @@ var /** @internal */ PromiseState;
         if (!loader) {
             throw "loader not found: " + item.type;
         }
-        // Load asset
+        // Check sub asset
+        if (queryPath) {
+            // Check whether load main asset
+            var mainPromise = loadingPromises[assetBaseURL] || this._loadMainAsset(loader, item, assetBaseURL);
+            mainPromise.catch(function(e) {
+                _this._onSubAssetFail(assetBaseURL, queryPath, e);
+            });
+            return this._createSubAssetPromiseCallback(assetBaseURL, assetURL, queryPath);
+        }
+        return this._loadMainAsset(loader, item, assetBaseURL);
+    };
+    _proto._loadMainAsset = function _loadMainAsset(loader, item, assetBaseURL) {
+        var _this = this;
         item.url = assetBaseURL;
+        var loadingPromises = this._loadingPromises;
         var promise = loader.load(item, this);
         loadingPromises[assetBaseURL] = promise;
         promise.then(function(resource) {
@@ -16917,32 +16983,46 @@ var /** @internal */ PromiseState;
                 _this._addAsset(assetBaseURL, resource);
             }
             delete loadingPromises[assetBaseURL];
+            _this._releaseSubAssetPromiseCallback(assetBaseURL);
         }, function() {
-            return delete loadingPromises[assetBaseURL];
+            delete loadingPromises[assetBaseURL];
+            _this._releaseSubAssetPromiseCallback(assetBaseURL);
         });
-        if (queryPath) {
-            var subPromise = new AssetPromise(function(resolve, reject) {
-                _this._pushSubAssetPromiseCallback(assetURL, resolve, reject);
-            });
-            loadingPromises[assetURL] = subPromise;
-            subPromise.then(function() {
+        return promise;
+    };
+    _proto._createSubAssetPromiseCallback = function _createSubAssetPromiseCallback(assetBaseURL, assetURL, assetSubPath) {
+        var _this = this;
+        var _this__subAssetPromiseCallbacks_assetBaseURL, _subPromiseCallback, _subPromiseCallback1;
+        var loadingPromises = this._loadingPromises;
+        var subPromiseCallback = (_this__subAssetPromiseCallbacks_assetBaseURL = this._subAssetPromiseCallbacks[assetBaseURL]) == null ? void 0 : _this__subAssetPromiseCallbacks_assetBaseURL[assetSubPath];
+        var resolvedValue = (_subPromiseCallback = subPromiseCallback) == null ? void 0 : _subPromiseCallback.resolve;
+        var rejectedValue = (_subPromiseCallback1 = subPromiseCallback) == null ? void 0 : _subPromiseCallback1.reject;
+        var promise = new AssetPromise(function(resolve, reject) {
+            if (resolvedValue) {
+                // Already resolved
+                resolve(resolvedValue);
+            } else if (rejectedValue) {
+                // Already rejected
+                reject(rejectedValue);
+            } else {
+                var _this__subAssetPromiseCallbacks, _assetBaseURL;
+                // Pending
+                loadingPromises[assetURL] = promise;
+                ((_this__subAssetPromiseCallbacks = _this._subAssetPromiseCallbacks)[_assetBaseURL = assetBaseURL] || (_this__subAssetPromiseCallbacks[_assetBaseURL] = {}))[assetSubPath] = {
+                    resolve: resolve,
+                    reject: reject
+                };
+            }
+        });
+        if (!resolvedValue && !rejectedValue) {
+            promise.then(function() {
                 delete loadingPromises[assetURL];
             }, function() {
                 return delete loadingPromises[assetURL];
             });
-            promise.catch(function(e) {
-                _this._onSubAssetFail(assetURL, e);
-            });
-            return subPromise;
         }
         return promise;
     };
-    _proto._pushSubAssetPromiseCallback = function _pushSubAssetPromiseCallback(assetURL, resolve, reject) {
-        this._subAssetPromiseCallbacks[assetURL] = {
-            resolve: resolve,
-            reject: reject
-        };
-    };
     _proto._gc = function _gc(forceDestroy) {
         var objects = Utils.objectValues(this._referResourcePool);
         for(var i = 0, n = objects.length; i < n; i++){
@@ -16999,6 +17079,9 @@ var /** @internal */ PromiseState;
         });
         return result;
     };
+    _proto._releaseSubAssetPromiseCallback = function _releaseSubAssetPromiseCallback(assetBaseURL) {
+        delete this._subAssetPromiseCallbacks[assetBaseURL];
+    };
     /**
    * @internal
    * @beta Just for internal editor, not recommended for developers.
@@ -22958,6 +23041,14 @@ __decorate([
     DepthTextureMode[DepthTextureMode[/* Generate depth texture by pre-pass rendering. */ "PrePass"] = 1] = "PrePass";
 })(exports.DepthTextureMode || (exports.DepthTextureMode = {}));
 
+/**
+ * The strategy to use when a shader replacement fails.
+ */ exports.ReplacementFailureStrategy = void 0;
+(function(ReplacementFailureStrategy) {
+    ReplacementFailureStrategy[ReplacementFailureStrategy[/** Keep the original shader. */ "KeepOriginalShader"] = 0] = "KeepOriginalShader";
+    ReplacementFailureStrategy[ReplacementFailureStrategy[/** Do not render. */ "DoNotRender"] = 1] = "DoNotRender";
+})(exports.ReplacementFailureStrategy || (exports.ReplacementFailureStrategy = {}));
+
 /**
  * PipelinePass is a base class for all pipeline passes.
  */ var PipelinePass = function PipelinePass(engine) {
@@ -24394,13 +24485,15 @@ var /**
             var replacementSubShaders = replacementShader.subShaders;
             var replacementTag = context.replacementTag;
             if (replacementTag) {
+                var materialSubShaderTagValue = materialSubShader.getTagValue(replacementTag);
                 for(var i = 0, n = replacementSubShaders.length; i < n; i++){
                     var subShader = replacementSubShaders[i];
-                    if (subShader.getTagValue(replacementTag) === materialSubShader.getTagValue(replacementTag)) {
+                    if (subShader.getTagValue(replacementTag) === materialSubShaderTagValue) {
                         this.pushRenderDataWithShader(context, data, subShader.passes, renderStates);
-                        break;
+                        return;
                     }
                 }
+                context.replacementFailureStrategy === exports.ReplacementFailureStrategy.KeepOriginalShader && this.pushRenderDataWithShader(context, data, materialSubShader.passes, renderStates);
             } else {
                 this.pushRenderDataWithShader(context, data, replacementSubShaders[0].passes, renderStates);
             }
@@ -24561,6 +24654,7 @@ exports.Camera = (_Camera = /*#__PURE__*/ function(Component1) {
         /** @internal */ _this._virtualCamera = new VirtualCamera();
         /** @internal */ _this._replacementShader = null;
         /** @internal */ _this._replacementSubShaderTag = null;
+        /** @internal */ _this._replacementFailureStrategy = null;
         /** @internal */ _this._cameraIndex = -1;
         _this._priority = 0;
         _this._shaderData = new ShaderData(ShaderDataGroup.Camera);
@@ -24738,6 +24832,7 @@ exports.Camera = (_Camera = /*#__PURE__*/ function(Component1) {
         context.virtualCamera = virtualCamera;
         context.replacementShader = this._replacementShader;
         context.replacementTag = this._replacementSubShaderTag;
+        context.replacementFailureStrategy = this._replacementFailureStrategy;
         // compute cull frustum.
         if (this.enableFrustumCulling && this._frustumChangeFlag.flag) {
             this._frustum.calculateFromMatrix(virtualCamera.viewProjectionMatrix);
@@ -24757,15 +24852,18 @@ exports.Camera = (_Camera = /*#__PURE__*/ function(Component1) {
         this._renderPipeline.render(context, cubeFace, mipLevel, clearMask);
         this._engine._renderCount++;
     };
-    _proto.setReplacementShader = function setReplacementShader(shader, replacementTag) {
+    _proto.setReplacementShader = function setReplacementShader(shader, replacementTag, failureStrategy) {
+        if (failureStrategy === void 0) failureStrategy = exports.ReplacementFailureStrategy.KeepOriginalShader;
         this._replacementShader = shader;
         this._replacementSubShaderTag = typeof replacementTag === "string" ? ShaderTagKey.getByName(replacementTag) : replacementTag;
+        this._replacementFailureStrategy = failureStrategy;
     };
     /**
    * Reset and clear the replacement shader.
    */ _proto.resetReplacementShader = function resetReplacementShader() {
         this._replacementShader = null;
         this._replacementSubShaderTag = null;
+        this._replacementFailureStrategy = null;
     };
     /**
    * @inheritdoc