@galacean/engine-core 1.3.0-alpha.3 → 1.3.0-beta.5

package/dist/miniprogram.js

@@ -10321,14 +10321,17 @@ var /**
                 var replacementSubShaders = replacementShader.subShaders;
                 var replacementTag = context.replacementTag;
                 if (replacementTag) {
+                    var replacementSuccess = false;
                     for(var j = 0, m = replacementSubShaders.length; j < m; j++){
                         var subShader = replacementSubShaders[j];
                         if (subShader.getTagValue(replacementTag) === materialSubShader.getTagValue(replacementTag)) {
                             this.pushRenderElementByType(renderElement, subRenderElement, subShader.passes, renderStates);
-                            break;
+                            replacementSuccess = true;
                         }
                     }
-                    context.replacementFailureStrategy === exports.ReplacementFailureStrategy.KeepOriginalShader && this.pushRenderElementByType(renderElement, subRenderElement, materialSubShader.passes, renderStates);
+                    if (!replacementSuccess && context.replacementFailureStrategy === exports.ReplacementFailureStrategy.KeepOriginalShader) {
+                        this.pushRenderElementByType(renderElement, subRenderElement, materialSubShader.passes, renderStates);
+                    }
                 } else {
                     this.pushRenderElementByType(renderElement, subRenderElement, replacementSubShaders[0].passes, renderStates);
                 }
@@ -10912,7 +10915,7 @@ var /**
         if (info) {
             return info;
         }
-        info = TextUtils._measureFontOrChar(fontString);
+        info = TextUtils._measureFontOrChar(fontString, TextUtils._measureString, false);
         fontSizeInfoCache[fontString] = info;
         return info;
     };
@@ -10933,7 +10936,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._getSubFont();
@@ -11152,15 +11155,15 @@ var /**
     };
     /**
    * @internal
-   */ 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;
@@ -11205,12 +11208,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;
@@ -11218,7 +11216,7 @@ var /**
                 data = new Uint8Array(colorData.buffer, top * lineIntegerW, size * lineIntegerW);
             }
             return {
-                char: char,
+                char: measureString,
                 x: 0,
                 y: 0,
                 w: width,
@@ -11238,7 +11236,11 @@ var /**
                 data: data
             };
         } else {
-            return sizeInfo;
+            return {
+                ascent: ascent,
+                descent: descent,
+                size: size
+            };
         }
     };
     /**
@@ -17431,6 +17433,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);
+}
+
 var ComponentCloner = /*#__PURE__*/ function() {
     function ComponentCloner() {}
     /**
@@ -17478,10 +17512,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;
@@ -19007,6 +19045,15 @@ var SafeLoopArray = /*#__PURE__*/ function() {
         this._loopArrayDirty = true;
     };
     /**
+   * Remove item from array that pass the specified comparison function.
+   * @param filter - The comparison function
+   */ _proto.findAndRemove = function findAndRemove(filter) {
+        var array = this._array;
+        for(var i = array.length - 1; i >= 0; i--){
+            filter(array[i]) && this.removeByIndex(i);
+        }
+    };
+    /**
    * The index of the item.
    * @param item - The item which want to get the index
    * @returns Index of the item
@@ -19440,17 +19487,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
@@ -19595,8 +19660,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) {
@@ -19604,32 +19682,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++){
@@ -19686,6 +19778,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.
@@ -28330,10 +28425,7 @@ exports.AnimatorLayerBlendingMode = void 0;
     /**
    * @internal
    */ _proto._onEnable = function _onEnable() {
-        var layersData = this._animatorLayersData;
-        for(var i = 0, n = layersData.length; i < n; i++){
-            layersData[i].layerState = LayerState.Standby;
-        }
+        this._reset();
         this._entity.getComponentsIncludeChildren(exports.Renderer, this._controlledRenderers);
     };
     /**
@@ -28887,8 +28979,11 @@ exports.AnimatorLayerBlendingMode = void 0;
             if (exitTime >= lastClipTime) {
                 playState.currentTransitionIndex = Math.min(transitionIndex + 1, n - 1);
                 if (this._checkConditions(state, transition)) {
-                    this._applyTransition(layerIndex, layerData, stateMachine, transition);
-                    return transition;
+                    if (this._applyTransition(layerIndex, layerData, stateMachine, transition)) {
+                        return transition;
+                    } else {
+                        return null;
+                    }
                 }
             }
         }
@@ -28907,8 +29002,11 @@ exports.AnimatorLayerBlendingMode = void 0;
             if (exitTime <= lastClipTime) {
                 playState.currentTransitionIndex = Math.max(transitionIndex - 1, 0);
                 if (this._checkConditions(state, transition)) {
-                    this._applyTransition(layerIndex, layerData, stateMachine, transition);
-                    return transition;
+                    if (this._applyTransition(layerIndex, layerData, stateMachine, transition)) {
+                        return transition;
+                    } else {
+                        return null;
+                    }
                 }
             }
         }
@@ -28918,8 +29016,11 @@ exports.AnimatorLayerBlendingMode = void 0;
         for(var i = 0, n = transitions.length; i < n; i++){
             var transition = transitions[i];
             if (this._checkConditions(state, transition)) {
-                this._applyTransition(layerIndex, layerData, stateMachine, transition);
-                return transition;
+                if (this._applyTransition(layerIndex, layerData, stateMachine, transition)) {
+                    return transition;
+                } else {
+                    return null;
+                }
             }
         }
     };
@@ -28939,11 +29040,12 @@ exports.AnimatorLayerBlendingMode = void 0;
     };
     _proto._applyTransition = function _applyTransition(layerIndex, layerData, stateMachine, transition) {
         // Need prepare first, it should crossFade when to exit
-        this._prepareCrossFadeByTransition(transition, layerIndex);
+        var success = this._prepareCrossFadeByTransition(transition, layerIndex);
         if (transition.isExit) {
             this._checkAnyAndEntryState(layerIndex, layerData, stateMachine);
-            return;
+            return true;
         }
+        return success;
     };
     _proto._checkConditions = function _checkConditions(state, transition) {
         var _state;
@@ -28955,6 +29057,9 @@ exports.AnimatorLayerBlendingMode = void 0;
             var pass = false;
             var _conditions_i = conditions[i], mode = _conditions_i.mode, name1 = _conditions_i.parameterName, threshold = _conditions_i.threshold;
             var parameter = this.getParameter(name1);
+            if (!parameter) {
+                return false;
+            }
             switch(mode){
                 case exports.AnimatorConditionMode.Equals:
                     if (parameter.value === threshold) {
@@ -34255,8 +34360,10 @@ exports.AnimationClipCurveBinding = AnimationClipCurveBinding;
 exports.AnimationCurve = AnimationCurve;
 exports.AnimationEvent = AnimationEvent;
 exports.Animator = Animator;
+exports.AnimatorCondition = AnimatorCondition;
 exports.AnimatorController = AnimatorController;
 exports.AnimatorControllerLayer = AnimatorControllerLayer;
+exports.AnimatorControllerParameter = AnimatorControllerParameter;
 exports.AnimatorLayerMask = AnimatorLayerMask;
 exports.AnimatorState = AnimatorState;
 exports.AnimatorStateMachine = AnimatorStateMachine;
@@ -34310,6 +34417,7 @@ exports.InputManager = InputManager;
 exports.JointLimits = JointLimits;
 exports.JointMotor = JointMotor;
 exports.Keyframe = Keyframe;
+exports.LayerPathMask = LayerPathMask;
 exports.Light = Light;
 exports.Loader = Loader;
 exports.Logger = Logger;
@@ -34345,6 +34453,7 @@ exports.RenderTargetBlendState = RenderTargetBlendState;
 exports.ResourceManager = ResourceManager;
 exports.ReturnableObjectPool = ReturnableObjectPool;
 exports.RotationOverLifetimeModule = RotationOverLifetimeModule;
+exports.SafeLoopArray = SafeLoopArray;
 exports.Scene = Scene;
 exports.SceneManager = SceneManager;
 exports.Script = Script;