@galacean/engine-core 2.0.0-alpha.37 → 2.0.0-alpha.38

package/dist/main.js

@@ -3852,7 +3852,7 @@ exports.TiledSpriteAssembler = __decorate([
                 sprite.name === name && outSprites.push(sprite);
             }
         } else {
-            console.warn("The name of the sprite you want to find is not exit in SpriteAtlas.");
+            console.warn("There is no sprite named " + name + " in the atlas.");
         }
         return outSprites;
     };
@@ -6063,6 +6063,9 @@ __decorate([
 __decorate([
     ignoreClone
 ], Transform.prototype, "_isParentDirty", void 0);
+__decorate([
+    ignoreClone
+], Transform.prototype, "_parentTransformCache", void 0);
 __decorate([
     ignoreClone
 ], Transform.prototype, "_dirtyFlag", void 0);
@@ -17075,9 +17078,10 @@ var ComponentCloner = /*#__PURE__*/ function() {
     };
     /**
    * Get the components which match the type of the entity and it's children.
+   * @remarks The components are returned in depth-first pre-order: the entity itself first, then each child's subtree in sibling order.
    * @param type - The component type
    * @param results - The components collection
-   * @returns	The components collection which match the type
+   * @returns The components collection which match the type
    */ _proto.getComponentsIncludeChildren = function getComponentsIncludeChildren(type, results) {
         results.length = 0;
         this._getComponentsInChildren(type, results);
@@ -17382,14 +17386,16 @@ var ComponentCloner = /*#__PURE__*/ function() {
         }
     };
     _proto._getComponentsInChildren = function _getComponentsInChildren(type, results) {
-        for(var i = this._components.length - 1; i >= 0; i--){
-            var component = this._components[i];
+        var components = this._components;
+        for(var i = 0, n = components.length; i < n; i++){
+            var component = components[i];
             if (_instanceof(component, type)) {
                 results.push(component);
             }
         }
-        for(var i1 = this._children.length - 1; i1 >= 0; i1--){
-            this._children[i1]._getComponentsInChildren(type, results);
+        var children = this._children;
+        for(var i1 = 0, n1 = children.length; i1 < n1; i1++){
+            children[i1]._getComponentsInChildren(type, results);
         }
     };
     _proto._setActiveComponents = function _setActiveComponents(isActive, activeChangeFlag) {
@@ -18821,37 +18827,39 @@ var MultiExecutor = /*#__PURE__*/ function() {
         this._contentRestorerPool = null;
         this._loadingPromises = null;
     };
-    _proto._assignDefaultOptions = function _assignDefaultOptions(assetInfo) {
-        var _assetInfo_type;
-        assetInfo.type = (_assetInfo_type = assetInfo.type) != null ? _assetInfo_type : ResourceManager._getTypeByUrl(assetInfo.url);
+    _proto._resolveLoadItemOptions = function _resolveLoadItemOptions(assetInfo, virtualResourceEntry) {
+        var _assetInfo;
+        var _virtualResourceEntry_type, _ref;
+        assetInfo.type = (_ref = (_virtualResourceEntry_type = virtualResourceEntry == null ? void 0 : virtualResourceEntry.type) != null ? _virtualResourceEntry_type : assetInfo.type) != null ? _ref : ResourceManager._getTypeByUrl(assetInfo.url);
         if (assetInfo.type === undefined) {
             throw "asset type should be specified: " + assetInfo.url;
         }
+        var _params;
+        (_params = (_assetInfo = assetInfo).params) != null ? _params : _assetInfo.params = virtualResourceEntry == null ? void 0 : virtualResourceEntry.params;
         var _assetInfo_retryCount;
         assetInfo.retryCount = (_assetInfo_retryCount = assetInfo.retryCount) != null ? _assetInfo_retryCount : this.retryCount;
         var _assetInfo_timeout;
         assetInfo.timeout = (_assetInfo_timeout = assetInfo.timeout) != null ? _assetInfo_timeout : this.timeout;
         var _assetInfo_retryInterval;
         assetInfo.retryInterval = (_assetInfo_retryInterval = assetInfo.retryInterval) != null ? _assetInfo_retryInterval : this.retryInterval;
-        var _assetInfo_url;
-        assetInfo.url = (_assetInfo_url = assetInfo.url) != null ? _assetInfo_url : assetInfo.urls.join(",");
-        return assetInfo;
     };
     _proto._loadSingleItem = function _loadSingleItem(itemOrURL) {
         var _this = this;
-        var item = this._assignDefaultOptions(typeof itemOrURL === "string" ? {
+        var item = typeof itemOrURL === "string" ? {
             url: itemOrURL
-        } : itemOrURL);
-        var url = item.url;
-        // Not absolute and base url is set
-        if (!Utils.isAbsoluteUrl(url) && this.baseUrl) url = Utils.resolveAbsoluteUrl(this.baseUrl, url);
+        } : itemOrURL;
+        var _item_url;
+        item.url = (_item_url = item.url) != null ? _item_url : item.urls.join(",");
         // Parse url
-        var _this__parseURL = this._parseURL(url), assetBaseURL = _this__parseURL.assetBaseURL, queryPath = _this__parseURL.queryPath;
+        var _this__parseURL = this._parseURL(item.url), assetBaseURL = _this__parseURL.assetBaseURL, queryPath = _this__parseURL.queryPath;
         var paths = queryPath ? this._parseQueryPath(queryPath) : [];
         // Get remote asset base url
-        var remoteConfig = this._virtualPathResourceMap[assetBaseURL];
-        var _remoteConfig_path;
-        var remoteAssetBaseURL = (_remoteConfig_path = remoteConfig == null ? void 0 : remoteConfig.path) != null ? _remoteConfig_path : assetBaseURL;
+        var virtualResourceEntry = this._virtualPathResourceMap[assetBaseURL];
+        this._resolveLoadItemOptions(item, virtualResourceEntry);
+        // Not absolute and base url is set
+        item.url = !Utils.isAbsoluteUrl(assetBaseURL) && this.baseUrl ? Utils.resolveAbsoluteUrl(this.baseUrl, assetBaseURL) : assetBaseURL;
+        var _virtualResourceEntry_path;
+        var remoteAssetBaseURL = (_virtualResourceEntry_path = virtualResourceEntry == null ? void 0 : virtualResourceEntry.path) != null ? _virtualResourceEntry_path : item.url;
         // Check cache
         var cacheObject = this._assetUrlPool[remoteAssetBaseURL];
         if (cacheObject) {
@@ -18885,25 +18893,24 @@ var MultiExecutor = /*#__PURE__*/ function() {
         if (!loader) {
             throw "loader not found: " + item.type;
         }
-        var subpackageName = remoteConfig == null ? void 0 : remoteConfig.subpackageName;
+        var subpackageName = virtualResourceEntry == null ? void 0 : virtualResourceEntry.subpackageName;
         // Check sub asset
         if (queryPath) {
             // Check whether load main asset
-            var mainPromise = loadingPromises[remoteAssetBaseURL] || this._loadSubpackageAndMainAsset(loader, item, remoteAssetBaseURL, assetBaseURL, subpackageName);
+            var mainPromise = loadingPromises[remoteAssetBaseURL] || this._loadSubpackageAndMainAsset(loader, item, remoteAssetBaseURL, subpackageName);
             mainPromise.catch(function(e) {
                 _this._onSubAssetFail(remoteAssetBaseURL, queryPath, e);
             });
             return this._createSubAssetPromiseCallback(remoteAssetBaseURL, remoteAssetURL, queryPath);
         }
-        return this._loadSubpackageAndMainAsset(loader, item, remoteAssetBaseURL, assetBaseURL, subpackageName);
+        return this._loadSubpackageAndMainAsset(loader, item, remoteAssetBaseURL, subpackageName);
     };
     // For adapter mini-game platform
-    _proto._loadSubpackageAndMainAsset = function _loadSubpackageAndMainAsset(loader, item, remoteAssetBaseURL, assetBaseURL, subpackageName) {
-        return this._loadMainAsset(loader, item, remoteAssetBaseURL, assetBaseURL);
+    _proto._loadSubpackageAndMainAsset = function _loadSubpackageAndMainAsset(loader, item, remoteAssetBaseURL, subpackageName) {
+        return this._loadMainAsset(loader, item, remoteAssetBaseURL);
     };
-    _proto._loadMainAsset = function _loadMainAsset(loader, item, remoteAssetBaseURL, assetBaseURL) {
+    _proto._loadMainAsset = function _loadMainAsset(loader, item, remoteAssetBaseURL) {
         var _this = this;
-        item.url = assetBaseURL;
         var loadingPromises = this._loadingPromises;
         var promise = loader.load(item, this);
         loadingPromises[remoteAssetBaseURL] = promise;
@@ -19030,10 +19037,9 @@ var MultiExecutor = /*#__PURE__*/ function() {
             return AssetPromise.resolve(null);
         }
         var loadUrl = key ? url + "?q=" + key : url;
+        // type and params omitted: resolved from the virtualPath map, the single source of truth
         var promise = this.load({
-            url: loadUrl,
-            type: mapped.type,
-            params: mapped.params
+            url: loadUrl
         });
         return isClone ? promise.then(function(item) {
             return item.clone();
@@ -20440,6 +20446,13 @@ __decorate([
         this._phasedActiveInScene && this._nativeCollider.addForce(force);
     };
     /**
+   * Apply a force to the DynamicCollider at a given position in world space.
+   * @param force - The force to apply, in world space
+   * @param position - The position where the force is applied, in world space
+   */ _proto.applyForceAtPosition = function applyForceAtPosition(force, position) {
+        this._phasedActiveInScene && this._nativeCollider.addForceAtPosition(force, position);
+    };
+    /**
    * Apply a torque to the DynamicCollider.
    * @param torque - The force make the collider rotate
    */ _proto.applyTorque = function applyTorque(torque) {
@@ -26792,6 +26805,7 @@ CascadedShadowCasterPass._tempMatrix0 = new engineMath.Matrix();
             depthOnlyPass.release();
             camera.shaderData.setTexture(exports.Camera._cameraDepthTextureProperty, engine._basicResources.whiteTexture2D);
         }
+        var pool = engine._renderTargetPool;
         // Check if need to create internal color texture or grab texture
         if (independentCanvasEnabled) {
             var depthFormat;
@@ -26807,26 +26821,12 @@ CascadedShadowCasterPass._tempMatrix0 = new engineMath.Matrix();
                 depthFormat = null;
             }
             var viewport = camera.pixelViewport;
-            var internalColorTarget = PipelineUtils.recreateRenderTargetIfNeeded(engine, this._internalColorTarget, viewport.width, viewport.height, camera._getInternalColorTextureFormat(), depthFormat, false, false, !camera.enableHDR, msaaSamples, TextureWrapMode.Clamp, TextureFilterMode.Bilinear);
+            this._internalColorTarget = pool.allocateRenderTarget(viewport.width, viewport.height, camera._getInternalColorTextureFormat(), depthFormat, false, false, !camera.enableHDR, msaaSamples, TextureWrapMode.Clamp, TextureFilterMode.Bilinear);
             if (this._shouldCopyBackgroundColor) {
                 var _camera_renderTarget;
                 var colorTexture = (_camera_renderTarget = camera.renderTarget) == null ? void 0 : _camera_renderTarget.getColorTexture(0);
                 var _colorTexture_format, _colorTexture_isSRGBColorSpace;
-                var copyBackgroundTexture = PipelineUtils.recreateTextureIfNeeded(engine, this._copyBackgroundTexture, viewport.width, viewport.height, (_colorTexture_format = colorTexture == null ? void 0 : colorTexture.format) != null ? _colorTexture_format : TextureFormat.R8G8B8A8, false, (_colorTexture_isSRGBColorSpace = colorTexture == null ? void 0 : colorTexture.isSRGBColorSpace) != null ? _colorTexture_isSRGBColorSpace : false, TextureWrapMode.Clamp, TextureFilterMode.Bilinear);
-                this._copyBackgroundTexture = copyBackgroundTexture;
-            }
-            this._internalColorTarget = internalColorTarget;
-        } else {
-            var internalColorTarget1 = this._internalColorTarget;
-            var copyBackgroundTexture1 = this._copyBackgroundTexture;
-            var pool = engine._renderTargetPool;
-            if (internalColorTarget1) {
-                pool.freeRenderTarget(internalColorTarget1);
-                this._internalColorTarget = null;
-            }
-            if (copyBackgroundTexture1) {
-                pool.freeTexture(copyBackgroundTexture1);
-                this._copyBackgroundTexture = null;
+                this._copyBackgroundTexture = pool.allocateTexture(viewport.width, viewport.height, (_colorTexture_format = colorTexture == null ? void 0 : colorTexture.format) != null ? _colorTexture_format : TextureFormat.R8G8B8A8, false, (_colorTexture_isSRGBColorSpace = colorTexture == null ? void 0 : colorTexture.isSRGBColorSpace) != null ? _colorTexture_isSRGBColorSpace : false, TextureWrapMode.Clamp, TextureFilterMode.Bilinear);
             }
         }
         // Scalable ambient obscurance pass
@@ -26839,6 +26839,15 @@ CascadedShadowCasterPass._tempMatrix0 = new engineMath.Matrix();
             this._saoPass.release();
         }
         this._drawRenderPass(context, camera, finalClearFlags, cubeFace, mipLevel);
+        // Return the per-frame leases so the next camera with matching shape can reuse them
+        if (this._internalColorTarget) {
+            pool.freeRenderTarget(this._internalColorTarget);
+            this._internalColorTarget = null;
+        }
+        if (this._copyBackgroundTexture) {
+            pool.freeTexture(this._copyBackgroundTexture);
+            this._copyBackgroundTexture = null;
+        }
     };
     _proto._drawRenderPass = function _drawRenderPass(context, camera, finalClearFlags, cubeFace, mipLevel) {
         var cullingResults = this._cullingResults;
@@ -27172,7 +27181,9 @@ var OverlayCamera = function OverlayCamera() {
     _inherits(Engine, EventDispatcher);
     function Engine(canvas, hardwareRenderer, configuration) {
         var _this;
-        _this = EventDispatcher.call(this) || this, /** @internal */ _this._renderingStatistics = new RenderingStatistics(), /** @internal */ _this._isDeviceLost = false, /** @internal */ _this._frameInProcess = false, /** @internal */ _this._pendingDestroyObjects = [], /** @internal */ _this._processingPendingDestroys = false, /** @internal */ _this._physicsInitialized = false, /* @internal */ _this._lastRenderState = new RenderState(), /* @internal */ _this._renderElementPool = new ClearableObjectPool(RenderElement), /* @internal */ _this._textRenderElementPool = new ClearableObjectPool(RenderElement), /* @internal */ _this._charRenderInfoPool = new ReturnableObjectPool(CharRenderInfo, 50), /* @internal */ _this._renderContext = new RenderContext(), /* @internal */ _this._renderCount = 0, /* @internal */ _this._shaderProgramMaps = [], /** @internal */ _this._fontMap = {}, /** @internal */ _this._macroCollection = new ShaderMacroCollection(), /** @internal */ _this._postProcessPassNeedRefresh = false, _this._settings = {}, _this._resourceManager = new ResourceManager(_this), _this._sceneManager = new SceneManager(_this), _this._vSyncCount = 1, _this._targetFrameRate = 60, _this._time = new Time(), _this._isPaused = true, _this._vSyncCounter = 1, _this._targetFrameInterval = 1000 / 60, _this._destroyed = false, _this._waitingDestroy = false, _this._waitingGC = false, _this._postProcessPasses = new Array(), _this._activePostProcessPasses = new Array(), _this._animate = function() {
+        _this = EventDispatcher.call(this) || this, /** @internal */ _this._renderingStatistics = new RenderingStatistics(), /** @internal */ _this._isDeviceLost = false, /** @internal */ _this._frameInProcess = false, /** @internal */ _this._pendingDestroyObjects = [], /** @internal */ _this._processingPendingDestroys = false, /** @internal */ _this._physicsInitialized = false, /* @internal */ _this._lastRenderState = new RenderState(), /* @internal */ _this._renderElementPool = new ClearableObjectPool(RenderElement), /* @internal */ _this._textRenderElementPool = new ClearableObjectPool(RenderElement), /* @internal */ _this._charRenderInfoPool = new ReturnableObjectPool(CharRenderInfo, 50), /* @internal */ _this._renderContext = new RenderContext(), /* @internal */ _this._renderCount = 0, /* @internal */ _this._shaderProgramMaps = [], /** @internal */ _this._fontMap = {}, /** @internal */ _this._macroCollection = new ShaderMacroCollection(), /** @internal */ _this._postProcessPassNeedRefresh = false, _this._settings = {}, _this._resourceManager = new ResourceManager(_this), _this._sceneManager = new SceneManager(_this), _this._vSyncCount = 1, _this._targetFrameRate = 60, _this._time = new Time(), _this._isPaused = true, _this._vSyncCounter = 1, _this._targetFrameInterval = 1000 / 60, _this._destroyed = false, _this._waitingDestroy = false, _this._waitingGC = false, _this._postProcessPasses = new Array(), _this._activePostProcessPasses = new Array(), _this._onCanvasResize = function() {
+            return _this._renderTargetPool.gc();
+        }, _this._animate = function() {
             if (_this._vSyncCount) {
                 var _this_xrManager;
                 var raf = ((_this_xrManager = _this.xrManager) == null ? void 0 : _this_xrManager._getRequestAnimationFrame()) || requestAnimationFrame;
@@ -27193,6 +27204,7 @@ var OverlayCamera = function OverlayCamera() {
         _this._textDefaultFont.isGCIgnored = true;
         _this._batcherManager = new BatcherManager(_this);
         _this._renderTargetPool = new RenderTargetPool(_this);
+        canvas._sizeUpdateFlagManager.addListener(_this._onCanvasResize);
         _this.inputManager = new InputManager(_this, configuration.input);
         var xrDevice = configuration.xrDevice;
         if (xrDevice) {
@@ -27396,6 +27408,7 @@ var OverlayCamera = function OverlayCamera() {
         var _this_xrManager;
         this._destroyed = true;
         this._waitingDestroy = false;
+        this._canvas._sizeUpdateFlagManager.removeListener(this._onCanvasResize);
         this._sceneManager._destroyAllScene();
         this._resourceManager._destroy();
         this.inputManager._destroy();
@@ -29730,7 +29743,7 @@ var PointerMethods = /*#__PURE__*/ function(PointerMethods) {
                 for(var _len = arguments.length, signalArgs = new Array(_len), _key = 0; _key < _len; _key++){
                     signalArgs[_key] = arguments[_key];
                 }
-                return (_target = target)[methodName].apply(_target, [].concat(args, signalArgs));
+                return (_target = target)[methodName].apply(_target, [].concat(signalArgs, args));
             } : function() {
                 for(var _len = arguments.length, signalArgs = new Array(_len), _key = 0; _key < _len; _key++){
                     signalArgs[_key] = arguments[_key];
@@ -30164,7 +30177,7 @@ AnimationCurveOwner.registerAssembler(SkinnedMeshRenderer, "blendShapeWeights",
  */ var AnimationClipCurveBinding = /*#__PURE__*/ function() {
     function AnimationClipCurveBinding() {
         /** The index of the component that is animated. */ this.typeIndex = 0;
-        this._tempCurveOwner = {};
+        this._tempCurveOwner = new WeakMap();
     }
     var _proto = AnimationClipCurveBinding.prototype;
     /**
@@ -30190,11 +30203,12 @@ AnimationCurveOwner.registerAssembler(SkinnedMeshRenderer, "blendShapeWeights",
     /**
    * @internal
    */ _proto._getTempCurveOwner = function _getTempCurveOwner(entity, component) {
-        var instanceId = entity.instanceId;
-        if (!this._tempCurveOwner[instanceId]) {
-            this._tempCurveOwner[instanceId] = this._createCurveOwner(entity, component);
+        var owner = this._tempCurveOwner.get(entity);
+        if (!owner) {
+            owner = this._createCurveOwner(entity, component);
+            this._tempCurveOwner.set(entity, owner);
         }
-        return this._tempCurveOwner[instanceId];
+        return owner;
     };
     return AnimationClipCurveBinding;
 }();
@@ -30276,11 +30290,10 @@ AnimationCurveOwner.registerAssembler(SkinnedMeshRenderer, "blendShapeWeights",
         this._length = 0;
     };
     /**
-   * @internal
    * Samples an animation at a given time.
    * @param entity - The animated entity
    * @param time - The time to sample an animation
-   */ _proto._sampleAnimation = function _sampleAnimation(entity, time) {
+   */ _proto.sampleAnimation = function sampleAnimation(entity, time) {
         var _this = this, curveBindings = _this._curveBindings;
         var components = AnimationCurveOwner._components;
         for(var i = curveBindings.length - 1; i >= 0; i--){
@@ -31455,12 +31468,6 @@ var AnimatorLayerBlendingMode = /*#__PURE__*/ function(AnimatorLayerBlendingMode
     return LayerState;
 }({});
 
-/**
- * @internal
- */ var AnimationEventHandler = function AnimationEventHandler() {
-    this.handlers = [];
-};
-
 /**
  * Animation wrap mode.
  */ var WrapMode = /*#__PURE__*/ function(WrapMode) {
@@ -31469,6 +31476,12 @@ var AnimatorLayerBlendingMode = /*#__PURE__*/ function(AnimatorLayerBlendingMode
     return WrapMode;
 }({});
 
+/**
+ * @internal
+ */ var AnimationEventHandler = function AnimationEventHandler() {
+    this.handlers = [];
+};
+
 /**
  * @internal
  */ var AnimatorStatePlayData = /*#__PURE__*/ function() {
@@ -31509,19 +31522,21 @@ var AnimatorLayerBlendingMode = /*#__PURE__*/ function(AnimatorLayerBlendingMode
         this.playedTime += deltaTime;
         var instance = this.instance;
         var state = instance._state;
+        var clipLength = state.clip.length;
+        var clipStartTime = state.clipStartTime;
         var time = this.playedTime + this.offsetFrameTime;
-        var duration = state._getDuration();
+        var duration = (state.clipEndTime - clipStartTime) * clipLength;
         this.playState = AnimatorStatePlayState.Playing;
         if (instance.wrapMode === WrapMode.Loop) {
             time = duration ? time % duration : 0;
-        } else {
-            if (Math.abs(time) >= duration) {
-                time = time < 0 ? -duration : duration;
-                this.playState = AnimatorStatePlayState.Finished;
-            }
+        } else if (time >= duration || time <= -duration) {
+            time = time < 0 ? -duration : duration;
+            this.playState = AnimatorStatePlayState.Finished;
         }
-        time < 0 && (time += duration);
-        this.clipTime = time + state.clipStartTime * state.clip.length;
+        if (time < 0) {
+            time += duration;
+        }
+        this.clipTime = time + clipStartTime * clipLength;
         if (this._changedOrientation) {
             !this.isForward && this._correctTime();
             this._changedOrientation = false;
@@ -31534,6 +31549,26 @@ var AnimatorLayerBlendingMode = /*#__PURE__*/ function(AnimatorLayerBlendingMode
             this.clipTime = state.clipEndTime * state.clip.length;
         }
     };
+    _create_class(AnimatorStatePlayData, [
+        {
+            key: "state",
+            get: function get() {
+                return this.instance._state;
+            }
+        },
+        {
+            key: "speed",
+            get: function get() {
+                return this.instance.speed;
+            }
+        },
+        {
+            key: "wrapMode",
+            get: function get() {
+                return this.instance.wrapMode;
+            }
+        }
+    ]);
     return AnimatorStatePlayData;
 }();
 
@@ -31712,8 +31747,8 @@ function _type_of(obj) {
  * @internal
  */ var AnimatorLayerData = /*#__PURE__*/ function() {
     function AnimatorLayerData() {
-        this.curveOwnerPool = Object.create(null);
-        this.animatorStateDataMap = new WeakMap();
+        this.curveOwnerPool = new WeakMap();
+        this.animatorStateDataMap = new Map();
         this.instanceMap = new WeakMap();
         this.srcPlayData = null;
         this.destPlayData = null;
@@ -31732,15 +31767,6 @@ function _type_of(obj) {
         }
         return instance;
     };
-    _proto.completeCrossFade = function completeCrossFade() {
-        this.srcPlayData = this.destPlayData;
-        this.destPlayData = null;
-        this.crossFadeTransition = null;
-    };
-    _proto.clearCrossFadeSlot = function clearCrossFadeSlot() {
-        this.destPlayData = null;
-        this.crossFadeTransition = null;
-    };
     _proto.resetCurrentCheckIndex = function resetCurrentCheckIndex() {
         this.layer.stateMachine._entryTransitionCollection.needResetCurrentCheckIndex = true;
         this.layer.stateMachine._anyStateTransitionCollection.needResetCurrentCheckIndex = true;
@@ -31764,7 +31790,7 @@ function _type_of(obj) {
     _inherits(Animator, Component);
     function Animator(entity) {
         var _this;
-        _this = Component.call(this, entity) || this, /** Culling mode of this Animator. */ _this.cullingMode = AnimatorCullingMode.None, /** The playback speed of the Animator, 1.0 is normal playback speed. */ _this.speed = 1.0, /** @internal */ _this._playFrameCount = -1, /** @internal */ _this._onUpdateIndex = -1, _this._updateMark = 0, _this._animatorLayersData = new Array(), _this._curveOwnerPool = Object.create(null), _this._parametersValueMap = Object.create(null), _this._tempAnimatorStateInfo = {
+        _this = Component.call(this, entity) || this, /** Culling mode of this Animator. */ _this.cullingMode = AnimatorCullingMode.None, /** The playback speed of the Animator, 1.0 is normal playback speed. */ _this.speed = 1.0, /** Whether the Animator sends AnimationEvent callbacks. */ _this.fireEvents = true, /** @internal */ _this._playFrameCount = -1, /** @internal */ _this._onUpdateIndex = -1, _this._updateMark = 0, _this._animatorLayersData = new Array(), _this._curveOwnerPool = new WeakMap(), _this._parametersValueMap = Object.create(null), _this._tempAnimatorStateInfo = {
             layerIndex: -1,
             state: null
         }, _this._controlledRenderers = new Array();
@@ -31947,16 +31973,21 @@ function _type_of(obj) {
     /**
    * @internal
    */ _proto._reset = function _reset() {
-        var _this = this, animationCurveOwners = _this._curveOwnerPool;
-        for(var instanceId in animationCurveOwners){
-            var propertyOwners = animationCurveOwners[instanceId];
-            for(var property in propertyOwners){
-                var owner = propertyOwners[property];
-                owner.revertDefaultValue();
+        var layersData = this._animatorLayersData;
+        for(var i = 0, n = layersData.length; i < n; i++){
+            var layerData = layersData[i];
+            if (!layerData) continue;
+            for(var _iterator = _create_for_of_iterator_helper_loose(layerData.animatorStateDataMap.values()), _step; !(_step = _iterator()).done;){
+                var stateData = _step.value;
+                var layerOwners = stateData.curveLayerOwner;
+                for(var k = 0, l = layerOwners.length; k < l; k++){
+                    var _layerOwners_k_curveOwner, _layerOwners_k;
+                    (_layerOwners_k = layerOwners[k]) == null ? void 0 : (_layerOwners_k_curveOwner = _layerOwners_k.curveOwner) == null ? void 0 : _layerOwners_k_curveOwner.revertDefaultValue();
+                }
             }
         }
         this._animatorLayersData.length = 0;
-        this._curveOwnerPool = Object.create(null);
+        this._curveOwnerPool = new WeakMap();
         this._parametersValueMap = Object.create(null);
         if (this._controllerUpdateFlag) {
             this._controllerUpdateFlag.flag = false;
@@ -31979,6 +32010,7 @@ function _type_of(obj) {
     };
     _proto._onDestroy = function _onDestroy() {
         Component.prototype._onDestroy.call(this);
+        this._reset();
         var controller = this._animatorController;
         if (controller) {
             var _this__controllerUpdateFlag;
@@ -31992,7 +32024,8 @@ function _type_of(obj) {
         if (!state) {
             return;
         }
-        var manuallyTransition = this._getAnimatorLayerData(playLayerIndex).manuallyTransition;
+        var animatorLayerData = this._getAnimatorLayerData(playLayerIndex);
+        var manuallyTransition = animatorLayerData.manuallyTransition;
         manuallyTransition.duration = duration;
         manuallyTransition.offset = normalizedTimeOffset;
         manuallyTransition.isFixedDuration = isFixedDuration;
@@ -32047,20 +32080,30 @@ function _type_of(obj) {
             var relativePath = curve.relativePath;
             var targetEntity = curve.relativePath === "" ? entity : entity.findByPath(curve.relativePath);
             if (targetEntity) {
-                var _curveOwnerPool, _instanceId, _propertyOwners, _property, _layerCurveOwnerPool, _instanceId1, _layerPropertyOwners, _property1;
+                var _layerPropertyOwners, _property;
                 var component = curve.typeIndex > 0 ? targetEntity.getComponents(curve.type, components)[curve.typeIndex] : targetEntity.getComponent(curve.type);
                 components.length = 0;
                 if (!component) {
                     continue;
                 }
                 var property = curve.property;
-                var instanceId = component.instanceId;
-                // Get owner
-                var propertyOwners = (_curveOwnerPool = curveOwnerPool)[_instanceId = instanceId] || (_curveOwnerPool[_instanceId] = Object.create(null));
-                var owner = (_propertyOwners = propertyOwners)[_property = property] || (_propertyOwners[_property] = curve._createCurveOwner(targetEntity, component));
-                // Get layer owner
-                var layerPropertyOwners = (_layerCurveOwnerPool = layerCurveOwnerPool)[_instanceId1 = instanceId] || (_layerCurveOwnerPool[_instanceId1] = Object.create(null));
-                var layerOwner = (_layerPropertyOwners = layerPropertyOwners)[_property1 = property] || (_layerPropertyOwners[_property1] = curve._createCurveLayerOwner(owner));
+                // Key owner lookup by Component identity instead of instanceId.
+                var propertyOwners = curveOwnerPool.get(component);
+                if (!propertyOwners) {
+                    propertyOwners = Object.create(null);
+                    curveOwnerPool.set(component, propertyOwners);
+                }
+                var owner = propertyOwners[property];
+                if (!owner) {
+                    owner = curve._createCurveOwner(targetEntity, component);
+                    propertyOwners[property] = owner;
+                }
+                var layerPropertyOwners = layerCurveOwnerPool.get(component);
+                if (!layerPropertyOwners) {
+                    layerPropertyOwners = Object.create(null);
+                    layerCurveOwnerPool.set(component, layerPropertyOwners);
+                }
+                var layerOwner = (_layerPropertyOwners = layerPropertyOwners)[_property = property] || (_layerPropertyOwners[_property] = curve._createCurveLayerOwner(owner));
                 if (mask && mask.pathMasks.length) {
                     var _mask_getPathMask;
                     var _mask_getPathMask_active;
@@ -32074,8 +32117,6 @@ function _type_of(obj) {
         }
     };
     _proto._ensureEventHandlers = function _ensureEventHandlers(state, animatorStateData) {
-        // state._updateFlagManager dispatches on both clip-swap and clip-events-mutation,
-        // so its version covers every input that affects eventHandlers binding
         var stateVersion = state._updateFlagManager.version;
         var scriptsVersion = this._entity._scriptsVersion;
         if (animatorStateData.eventsBuiltVersion === stateVersion && animatorStateData.eventsBuiltScriptsVersion === scriptsVersion) {
@@ -32199,8 +32240,8 @@ function _type_of(obj) {
     };
     _proto._updatePlayingState = function _updatePlayingState(layerData, weight, additive, deltaTime, aniUpdate) {
         var srcPlayData = layerData.srcPlayData;
-        var state = srcPlayData.instance._state;
-        var playSpeed = srcPlayData.instance.speed * this.speed;
+        var state = srcPlayData.state;
+        var playSpeed = srcPlayData.speed * this.speed;
         var playDeltaTime = playSpeed * deltaTime;
         srcPlayData.updateOrientation(playDeltaTime);
         var lastClipTime = srcPlayData.clipTime, lastPlayState = srcPlayData.playState;
@@ -32244,14 +32285,13 @@ function _type_of(obj) {
         this._evaluatePlayingState(srcPlayData, weight, additive, aniUpdate);
         this._fireAnimationEventsAndCallScripts(layerData.layerIndex, srcPlayData, state, lastClipTime, lastPlayState, playCostTime);
         if (transition) {
-            // Remove speed factor, use actual cost time. Per-instance speed=0 means the source
-            // state is paused, so it consumes no time — pass deltaTime through to the destination.
+            // Remove speed factor, use actual cost time
             var remainDeltaTime = playSpeed === 0 ? deltaTime : deltaTime - playCostTime / playSpeed;
             remainDeltaTime > 0 && this._updateState(layerData, remainDeltaTime, aniUpdate);
         }
     };
     _proto._evaluatePlayingState = function _evaluatePlayingState(playData, weight, additive, aniUpdate) {
-        var curveBindings = playData.instance.clip._curveBindings;
+        var curveBindings = playData.state.clip._curveBindings;
         var finished = playData.playState === AnimatorStatePlayState.Finished;
         if (aniUpdate || finished) {
             var curveLayerOwner = playData.stateData.curveLayerOwner;
@@ -32274,14 +32314,14 @@ function _type_of(obj) {
     _proto._updateCrossFadeState = function _updateCrossFadeState(layerData, weight, additive, deltaTime, aniUpdate) {
         var srcPlayData = layerData.srcPlayData, destPlayData = layerData.destPlayData, layerIndex = layerData.layerIndex;
         var speed = this.speed;
-        var srcState = srcPlayData.instance._state;
-        var destState = destPlayData.instance._state;
+        var srcState = srcPlayData.state;
+        var destState = destPlayData.state;
         var transitionDuration = layerData.crossFadeTransition._getFixedDuration();
         if (this._tryCrossFadeInterrupt(layerData, transitionDuration, destState, deltaTime, aniUpdate)) {
             return;
         }
-        var srcPlaySpeed = srcPlayData.instance.speed * speed;
-        var dstPlaySpeed = destPlayData.instance.speed * speed;
+        var srcPlaySpeed = srcPlayData.speed * speed;
+        var dstPlaySpeed = destPlayData.speed * speed;
         var dstPlayDeltaTime = dstPlaySpeed * deltaTime;
         srcPlayData.updateOrientation(srcPlaySpeed * deltaTime);
         destPlayData.updateOrientation(dstPlayDeltaTime);
@@ -32324,8 +32364,8 @@ function _type_of(obj) {
     };
     _proto._evaluateCrossFadeState = function _evaluateCrossFadeState(layerData, srcPlayData, destPlayData, weight, crossWeight, additive, aniUpdate) {
         var crossLayerOwnerCollection = layerData.crossLayerOwnerCollection;
-        var _srcPlayData_instance_clip = srcPlayData.instance.clip, srcCurves = _srcPlayData_instance_clip._curveBindings;
-        var destState = destPlayData.instance._state;
+        var _srcPlayData_state_clip = srcPlayData.state.clip, srcCurves = _srcPlayData_state_clip._curveBindings;
+        var destState = destPlayData.state;
         var _destState_clip = destState.clip, destCurves = _destState_clip._curveBindings;
         var finished = destPlayData.playState === AnimatorStatePlayState.Finished;
         if (aniUpdate || finished) {
@@ -32344,12 +32384,12 @@ function _type_of(obj) {
     };
     _proto._updateCrossFadeFromPoseState = function _updateCrossFadeFromPoseState(layerData, weight, additive, deltaTime, aniUpdate) {
         var destPlayData = layerData.destPlayData;
-        var state = destPlayData.instance._state;
+        var state = destPlayData.state;
         var transitionDuration = layerData.crossFadeTransition._getFixedDuration();
         if (this._tryCrossFadeInterrupt(layerData, transitionDuration, state, deltaTime, aniUpdate)) {
             return;
         }
-        var playSpeed = destPlayData.instance.speed * this.speed;
+        var playSpeed = destPlayData.speed * this.speed;
         var playDeltaTime = playSpeed * deltaTime;
         destPlayData.updateOrientation(playDeltaTime);
         var lastDestClipTime = destPlayData.clipTime, lastPlayState = destPlayData.playState;
@@ -32386,7 +32426,7 @@ function _type_of(obj) {
     };
     _proto._evaluateCrossFadeFromPoseState = function _evaluateCrossFadeFromPoseState(layerData, destPlayData, weight, crossWeight, additive, aniUpdate) {
         var crossLayerOwnerCollection = layerData.crossLayerOwnerCollection;
-        var state = destPlayData.instance._state;
+        var state = destPlayData.state;
         var _state_clip = state.clip, curveBindings = _state_clip._curveBindings;
         var destClipTime = destPlayData.clipTime, playState = destPlayData.playState;
         var finished = playState === AnimatorStatePlayState.Finished;
@@ -32398,7 +32438,7 @@ function _type_of(obj) {
                 if (!owner) continue;
                 var curveIndex = layerOwner.crossDestCurveIndex;
                 this._checkRevertOwner(owner, additive);
-                var value = layerOwner.curveOwner.crossFadeFromPoseAndApplyValue(curveIndex >= 0 ? curveBindings[curveIndex].curve : null, destClipTime, crossWeight, additive);
+                var value = owner.crossFadeFromPoseAndApplyValue(curveIndex >= 0 ? curveBindings[curveIndex].curve : null, destClipTime, crossWeight, additive);
                 aniUpdate && owner.applyValue(value, weight, additive);
                 finished && layerOwner.saveFinalValue();
             }
@@ -32406,8 +32446,8 @@ function _type_of(obj) {
     };
     _proto._updateFinishedState = function _updateFinishedState(layerData, weight, additive, deltaTime, aniUpdate) {
         var playData = layerData.srcPlayData;
-        var state = playData.instance._state;
-        var actualSpeed = playData.instance.speed * this.speed;
+        var state = playData.state;
+        var actualSpeed = playData.speed * this.speed;
         var actualDeltaTime = actualSpeed * deltaTime;
         playData.updateOrientation(actualDeltaTime);
         var clipTime = playData.clipTime, isForward = playData.isForward;
@@ -32425,7 +32465,7 @@ function _type_of(obj) {
             return;
         }
         var curveLayerOwner = playData.stateData.curveLayerOwner;
-        var _playData_instance_clip = playData.instance.clip, curveBindings = _playData_instance_clip._curveBindings;
+        var _playData_state_clip = playData.state.clip, curveBindings = _playData_state_clip._curveBindings;
         for(var i = curveBindings.length - 1; i >= 0; i--){
             var layerOwner = curveLayerOwner[i];
             var owner = layerOwner == null ? void 0 : layerOwner.curveOwner;
@@ -32441,12 +32481,14 @@ function _type_of(obj) {
         } else {
             layerData.layerState = LayerState.Playing;
         }
-        layerData.completeCrossFade();
+        layerData.srcPlayData = destPlayData;
+        layerData.destPlayData = null;
+        layerData.crossFadeTransition = null;
     };
     _proto._preparePlayOwner = function _preparePlayOwner(layerData, playState) {
         if (layerData.layerState === LayerState.Playing) {
             var srcPlayData = layerData.srcPlayData;
-            if (srcPlayData.instance._state !== playState) {
+            if (srcPlayData.state !== playState) {
                 var curveLayerOwner = srcPlayData.stateData.curveLayerOwner;
                 for(var i = curveLayerOwner.length - 1; i >= 0; i--){
                     var _curveLayerOwner_i;
@@ -32461,17 +32503,17 @@ function _type_of(obj) {
         }
     };
     _proto._applyStateTransitions = function _applyStateTransitions(layerData, isForward, playData, transitionCollection, lastClipTime, clipTime, deltaTime, aniUpdate) {
-        var state = playData.instance._state;
-        var clipDuration = state.clip.length;
+        var state = playData.state;
         var targetTransition = null;
-        var startTime = state.clipStartTime * clipDuration;
-        var endTime = state.clipEndTime * clipDuration;
         if (transitionCollection.noExitTimeCount) {
             targetTransition = this._checkNoExitTimeTransitions(layerData, transitionCollection, aniUpdate);
             if (targetTransition) {
                 return targetTransition;
             }
         }
+        var clipDuration = state.clip.length;
+        var startTime = state.clipStartTime * clipDuration;
+        var endTime = state.clipEndTime * clipDuration;
         if (isForward) {
             if (lastClipTime + deltaTime >= endTime) {
                 targetTransition = this._checkSubTransition(layerData, state, transitionCollection, lastClipTime, endTime, aniUpdate);
@@ -32578,9 +32620,8 @@ function _type_of(obj) {
         var playData = animatorLayerData.getOrCreateInstance(state)._playData;
         playData.reset(animatorStateData, state._getClipActualEndTime() * normalizedTimeOffset);
         animatorLayerData.srcPlayData = playData;
-        // Drop any dangling cross-fade slot from a previously-interrupted crossFade
-        // so a later crossFade(B) isn't wrongly no-op'd by the active-dest guard.
-        animatorLayerData.clearCrossFadeSlot();
+        animatorLayerData.destPlayData = null;
+        animatorLayerData.crossFadeTransition = null;
         animatorLayerData.resetCurrentCheckIndex();
         return true;
     };
@@ -32664,9 +32705,7 @@ function _type_of(obj) {
             return false;
         }
         var animatorLayerData = this._getAnimatorLayerData(layerIndex);
-        // Self/active-dest cross-fade is a no-op: each state has one persistent
-        // instance per layer, so a second concurrent fade has nowhere to live.
-        if (((_animatorLayerData_srcPlayData = animatorLayerData.srcPlayData) == null ? void 0 : _animatorLayerData_srcPlayData.instance._state) === crossState || ((_animatorLayerData_destPlayData = animatorLayerData.destPlayData) == null ? void 0 : _animatorLayerData_destPlayData.instance._state) === crossState) {
+        if (((_animatorLayerData_srcPlayData = animatorLayerData.srcPlayData) == null ? void 0 : _animatorLayerData_srcPlayData.state) === crossState || ((_animatorLayerData_destPlayData = animatorLayerData.destPlayData) == null ? void 0 : _animatorLayerData_destPlayData.state) === crossState) {
             return false;
         }
         var animatorStateData = this._getAnimatorStateData(crossState, animatorLayerData, layerIndex);
@@ -32698,23 +32737,27 @@ function _type_of(obj) {
         return true;
     };
     _proto._fireAnimationEvents = function _fireAnimationEvents(playData, eventHandlers, lastClipTime, deltaTime) {
-        var isForward = playData.isForward, clipTime = playData.clipTime;
-        var state = playData.instance._state;
+        var state = playData.state, isForward = playData.isForward, clipTime = playData.clipTime, wrapMode = playData.wrapMode;
         var startTime = state._getClipActualStartTime();
         var endTime = state._getClipActualEndTime();
+        var canWrap = wrapMode === WrapMode.Loop;
         if (isForward) {
             if (lastClipTime + deltaTime >= endTime) {
                 this._fireSubAnimationEvents(playData, eventHandlers, lastClipTime, endTime);
-                playData.currentEventIndex = 0;
-                this._fireSubAnimationEvents(playData, eventHandlers, startTime, clipTime);
+                if (canWrap) {
+                    playData.currentEventIndex = 0;
+                    this._fireSubAnimationEvents(playData, eventHandlers, startTime, clipTime);
+                }
             } else {
                 this._fireSubAnimationEvents(playData, eventHandlers, lastClipTime, clipTime);
             }
         } else {
             if (lastClipTime + deltaTime <= startTime) {
                 this._fireBackwardSubAnimationEvents(playData, eventHandlers, lastClipTime, startTime);
-                playData.currentEventIndex = eventHandlers.length - 1;
-                this._fireBackwardSubAnimationEvents(playData, eventHandlers, endTime, clipTime);
+                if (canWrap) {
+                    playData.currentEventIndex = eventHandlers.length - 1;
+                    this._fireBackwardSubAnimationEvents(playData, eventHandlers, endTime, clipTime);
+                }
             } else {
                 this._fireBackwardSubAnimationEvents(playData, eventHandlers, lastClipTime, clipTime);
             }
@@ -32730,8 +32773,10 @@ function _type_of(obj) {
             }
             var handlers = eventHandler.handlers;
             if (time >= lastClipTime) {
-                for(var j = handlers.length - 1; j >= 0; j--){
-                    handlers[j](parameter);
+                if (this.fireEvents) {
+                    for(var j = handlers.length - 1; j >= 0; j--){
+                        handlers[j](parameter);
+                    }
                 }
                 playState.currentEventIndex = Math.min(eventIndex + 1, n - 1);
             }
@@ -32747,8 +32792,10 @@ function _type_of(obj) {
             }
             if (time <= lastClipTime) {
                 var handlers = eventHandler.handlers;
-                for(var j = handlers.length - 1; j >= 0; j--){
-                    handlers[j](parameter);
+                if (this.fireEvents) {
+                    for(var j = handlers.length - 1; j >= 0; j--){
+                        handlers[j](parameter);
+                    }
                 }
                 playState.currentEventIndex = Math.max(eventIndex - 1, 0);
             }
@@ -32779,9 +32826,6 @@ function _type_of(obj) {
         owner.updateMark = this._updateMark;
     };
     _proto._fireAnimationEventsAndCallScripts = function _fireAnimationEventsAndCallScripts(layerIndex, playData, state, lastClipTime, lastPlayState, deltaTime) {
-        // Re-check whether the clip events/scripts changed since the last build —
-        // play()/crossFade() entry points already ensure on enter, but addEvent()
-        // or addComponent(Script) after play() must also flow through.
         this._ensureEventHandlers(state, playData.stateData);
         var eventHandlers = playData.stateData.eventHandlers;
         eventHandlers.length && this._fireAnimationEvents(playData, eventHandlers, lastClipTime, deltaTime);
@@ -32849,6 +32893,9 @@ Animator._tempScripts = [];
 __decorate([
     assignmentClone
 ], Animator.prototype, "speed", void 0);
+__decorate([
+    assignmentClone
+], Animator.prototype, "fireEvents", void 0);
 __decorate([
     assignmentClone
 ], Animator.prototype, "_animatorController", void 0);
@@ -32920,7 +32967,10 @@ function _assert_this_initialized(self) {
             /** @internal */ _this._parametersMap = {},
             /** @internal */ _this._layers = [],
             /** @internal */ _this._layersMap = {},
-            _this._updateFlagManager = new UpdateFlagManager()
+            _this._updateFlagManager = new UpdateFlagManager(),
+            _this._onStatesInvalidate = function() {
+                return _this._updateFlagManager.dispatch();
+            }
         ][0];
         return _assert_this_initialized(_this);
     }
@@ -32975,6 +33025,7 @@ function _assert_this_initialized(self) {
    */ _proto.addLayer = function addLayer(layer) {
         this._layers.push(layer);
         this._layersMap[layer.name] = layer;
+        layer._setStatesInvalidateCallback(this._onStatesInvalidate);
         layer._setEngine(this._engine);
         this._updateFlagManager.dispatch();
     };
@@ -32984,13 +33035,18 @@ function _assert_this_initialized(self) {
    */ _proto.removeLayer = function removeLayer(layerIndex) {
         var theLayer = this.layers[layerIndex];
         this._layers.splice(layerIndex, 1);
+        theLayer._setStatesInvalidateCallback(null);
         delete this._layersMap[theLayer.name];
         this._updateFlagManager.dispatch();
     };
     /**
    * Clear layers.
    */ _proto.clearLayers = function clearLayers() {
-        this._layers.length = 0;
+        var _this = this, layers = _this._layers;
+        for(var i = 0, n = layers.length; i < n; i++){
+            layers[i]._setStatesInvalidateCallback(null);
+        }
+        layers.length = 0;
         for(var name in this._layersMap){
             delete this._layersMap[name];
         }
@@ -33006,7 +33062,9 @@ function _assert_this_initialized(self) {
    */ _proto._setEngine = function _setEngine(engine) {
         var _this = this, layers = _this._layers;
         for(var i = 0, n = layers.length; i < n; i++){
-            layers[i]._setEngine(engine);
+            var layer = layers[i];
+            layer._setStatesInvalidateCallback(this._onStatesInvalidate);
+            layer._setEngine(engine);
         }
     };
     _proto._addParameter = function _addParameter(name, defaultValue, isTrigger) {
@@ -33393,6 +33451,7 @@ function _assert_this_initialized(self) {
  */ var AnimatorStateMachine = /*#__PURE__*/ function() {
     function AnimatorStateMachine() {
         /** The list of states. */ this.states = [];
+        this._onStatesInvalidate = null;
         /**
    * The state will be played automatically.
    * @remarks When the Animator's AnimatorController changed or the Animator's onEnable be triggered. Cleared to `null` if the state is removed via `removeState`.
@@ -33429,6 +33488,7 @@ function _assert_this_initialized(self) {
             if (this.defaultState === state) {
                 this.defaultState = null;
             }
+            this._onStatesInvalidate == null ? void 0 : this._onStatesInvalidate.call(this);
         }
     };
     /**
@@ -33488,6 +33548,11 @@ function _assert_this_initialized(self) {
             states[i]._setEngine(engine);
         }
     };
+    /**
+   * @internal
+   */ _proto._setStatesInvalidateCallback = function _setStatesInvalidateCallback(onStatesInvalidate) {
+        this._onStatesInvalidate = onStatesInvalidate;
+    };
     _create_class(AnimatorStateMachine, [
         {
             key: "entryTransitions",
@@ -33516,14 +33581,43 @@ function _assert_this_initialized(self) {
         this.name = name;
         this./** The blending weight that the layers has. It is not taken into account for the first layer. */ weight = 1.0;
         this./** The blending mode used by the layer. It is not taken into account for the first layer. */ blendingMode = AnimatorLayerBlendingMode.Override;
-        this.stateMachine = new AnimatorStateMachine();
+        this._onStatesInvalidate = null;
+        this._stateMachine = new AnimatorStateMachine();
     }
     var _proto = AnimatorControllerLayer.prototype;
     /**
    * @internal
    */ _proto._setEngine = function _setEngine(engine) {
-        this.stateMachine._setEngine(engine);
+        this._engine = engine;
+        this._stateMachine._setEngine(engine);
     };
+    /**
+   * @internal
+   */ _proto._setStatesInvalidateCallback = function _setStatesInvalidateCallback(onStatesInvalidate) {
+        this._onStatesInvalidate = onStatesInvalidate;
+        this._stateMachine._setStatesInvalidateCallback(onStatesInvalidate);
+    };
+    _create_class(AnimatorControllerLayer, [
+        {
+            key: "stateMachine",
+            get: /**
+   * The state machine for the layer.
+   */ function get() {
+                return this._stateMachine;
+            },
+            set: function set(value) {
+                var lastStateMachine = this._stateMachine;
+                if (lastStateMachine === value) {
+                    return;
+                }
+                lastStateMachine._setStatesInvalidateCallback(null);
+                this._stateMachine = value;
+                value._setStatesInvalidateCallback(this._onStatesInvalidate);
+                this._engine && value._setEngine(this._engine);
+                this._onStatesInvalidate == null ? void 0 : this._onStatesInvalidate.call(this);
+            }
+        }
+    ]);
     return AnimatorControllerLayer;
 }();
 
@@ -35125,6 +35219,7 @@ __decorate([
     /**
    * @internal
    */ _proto._getMax = function _getMax() {
+        var minMaxRange = ParticleCompositeCurve._minMaxRange;
         switch(this.mode){
             case ParticleCurveMode.Constant:
                 return this.constantMax;
@@ -35132,17 +35227,18 @@ __decorate([
                 return Math.max(this.constantMin, this.constantMax);
             case ParticleCurveMode.Curve:
                 var _this_curveMax;
-                return this._getMaxKeyValue((_this_curveMax = this.curveMax) == null ? void 0 : _this_curveMax.keys);
+                this._getKeyMinMax((_this_curveMax = this.curveMax) == null ? void 0 : _this_curveMax.keys, minMaxRange);
+                return minMaxRange.y;
             case ParticleCurveMode.TwoCurves:
                 var _this_curveMin, _this_curveMax1;
-                var min = this._getMaxKeyValue((_this_curveMin = this.curveMin) == null ? void 0 : _this_curveMin.keys);
-                var max = this._getMaxKeyValue((_this_curveMax1 = this.curveMax) == null ? void 0 : _this_curveMax1.keys);
-                return min > max ? min : max;
+                this._getKeyMinMax((_this_curveMin = this.curveMin) == null ? void 0 : _this_curveMin.keys, minMaxRange);
+                var maxCurveMin = minMaxRange.y;
+                this._getKeyMinMax((_this_curveMax1 = this.curveMax) == null ? void 0 : _this_curveMax1.keys, minMaxRange);
+                return maxCurveMin > minMaxRange.y ? maxCurveMin : minMaxRange.y;
         }
     };
     /**
    * @internal
-
    */ _proto._getMinMax = function _getMinMax(out) {
         switch(this.mode){
             case ParticleCurveMode.Constant:
@@ -35152,23 +35248,40 @@ __decorate([
                 out.set(Math.min(this.constantMin, this.constantMax), Math.max(this.constantMin, this.constantMax));
                 break;
             case ParticleCurveMode.Curve:
-                var _this_curveMax, _this_curveMax1;
-                out.set(this._getMinKeyValue((_this_curveMax = this.curveMax) == null ? void 0 : _this_curveMax.keys), this._getMaxKeyValue((_this_curveMax1 = this.curveMax) == null ? void 0 : _this_curveMax1.keys));
+                var _this_curveMax;
+                this._getKeyMinMax((_this_curveMax = this.curveMax) == null ? void 0 : _this_curveMax.keys, out);
                 break;
             case ParticleCurveMode.TwoCurves:
-                var _this_curveMax2, _this_curveMin, _this_curveMax3, _this_curveMin1;
-                var minCurveMax = this._getMinKeyValue((_this_curveMax2 = this.curveMax) == null ? void 0 : _this_curveMax2.keys);
-                var minCurveMin = this._getMinKeyValue((_this_curveMin = this.curveMin) == null ? void 0 : _this_curveMin.keys);
-                var maxCurveMax = this._getMaxKeyValue((_this_curveMax3 = this.curveMax) == null ? void 0 : _this_curveMax3.keys);
-                var maxCurveMin = this._getMaxKeyValue((_this_curveMin1 = this.curveMin) == null ? void 0 : _this_curveMin1.keys);
-                var min = minCurveMax < minCurveMin ? minCurveMax : minCurveMin;
-                var max = maxCurveMax > maxCurveMin ? maxCurveMax : maxCurveMin;
-                out.set(min, max);
+                var _this_curveMin, _this_curveMax1;
+                this._getKeyMinMax((_this_curveMin = this.curveMin) == null ? void 0 : _this_curveMin.keys, out);
+                var minCurveMin = out.x;
+                var maxCurveMin = out.y;
+                this._getKeyMinMax((_this_curveMax1 = this.curveMax) == null ? void 0 : _this_curveMax1.keys, out);
+                var minCurveMax = out.x;
+                var maxCurveMax = out.y;
+                out.set(minCurveMax < minCurveMin ? minCurveMax : minCurveMin, maxCurveMax > maxCurveMin ? maxCurveMax : maxCurveMin);
                 break;
         }
     };
     /**
    * @internal
+   */ _proto._isZero = function _isZero() {
+        var minMax = ParticleCompositeCurve._minMaxRange;
+        this._getMinMax(minMax);
+        return minMax.x === 0 && minMax.y === 0;
+    };
+    /**
+   * @internal
+   */ _proto._isCurveMode = function _isCurveMode() {
+        return this._mode === ParticleCurveMode.Curve || this._mode === ParticleCurveMode.TwoCurves;
+    };
+    /**
+   * @internal
+   */ _proto._isRandomMode = function _isRandomMode() {
+        return this._mode === ParticleCurveMode.TwoConstants || this._mode === ParticleCurveMode.TwoCurves;
+    };
+    /**
+   * @internal
    */ _proto._registerOnValueChanged = function _registerOnValueChanged(listener) {
         this._updateManager.addListener(listener);
     };
@@ -35177,31 +35290,20 @@ __decorate([
    */ _proto._unRegisterOnValueChanged = function _unRegisterOnValueChanged(listener) {
         this._updateManager.removeListener(listener);
     };
-    _proto._getMaxKeyValue = function _getMaxKeyValue(keys) {
-        var max = undefined;
-        var _keys_length;
-        var count = (_keys_length = keys == null ? void 0 : keys.length) != null ? _keys_length : 0;
-        if (count > 0) {
-            max = keys[0].value;
-            for(var i = 1; i < count; i++){
-                var value = keys[i].value;
-                max = Math.max(max, value);
-            }
-        }
-        return max;
-    };
-    _proto._getMinKeyValue = function _getMinKeyValue(keys) {
+    _proto._getKeyMinMax = function _getKeyMinMax(keys, out) {
         var min = undefined;
+        var max = undefined;
         var _keys_length;
         var count = (_keys_length = keys == null ? void 0 : keys.length) != null ? _keys_length : 0;
         if (count > 0) {
-            min = keys[0].value;
+            min = max = keys[0].value;
             for(var i = 1; i < count; i++){
                 var value = keys[i].value;
                 min = Math.min(min, value);
+                max = Math.max(max, value);
             }
         }
-        return min;
+        out.set(min != null ? min : 0, max != null ? max : 0);
     };
     _proto._onCurveChange = function _onCurveChange(lastValue, value) {
         var dispatch = this._updateDispatch;
@@ -35307,6 +35409,7 @@ __decorate([
     ]);
     return ParticleCompositeCurve;
 }();
+ParticleCompositeCurve._minMaxRange = new engineMath.Vector2();
 __decorate([
     ignoreClone
 ], ParticleCompositeCurve.prototype, "_updateManager", void 0);
@@ -37644,10 +37747,20 @@ __decorate([
     _inherits(VelocityOverLifetimeModule, ParticleGeneratorModule);
     function VelocityOverLifetimeModule(generator) {
         var _this;
-        _this = ParticleGeneratorModule.call(this, generator) || this, /** @internal */ _this._velocityRand = new engineMath.Rand(0, ParticleRandomSubSeeds.VelocityOverLifetime), _this._velocityMinConstant = new engineMath.Vector3(), _this._velocityMaxConstant = new engineMath.Vector3(), _this._space = ParticleSimulationSpace.Local;
+        _this = ParticleGeneratorModule.call(this, generator) || this, /** @internal */ _this._velocityRand = new engineMath.Rand(0, ParticleRandomSubSeeds.VelocityOverLifetime), _this._velocityMinConstant = new engineMath.Vector3(), _this._velocityMaxConstant = new engineMath.Vector3(), _this._orbitalMinConstant = new engineMath.Vector3(), _this._orbitalConstant = new engineMath.Vector3(), _this._offset = new engineMath.Vector3(), _this._space = ParticleSimulationSpace.Local, _this._onTransformFeedbackDirty = function() {
+            return _this._generator._setTransformFeedback();
+        };
         _this.velocityX = new ParticleCompositeCurve(0);
         _this.velocityY = new ParticleCompositeCurve(0);
         _this.velocityZ = new ParticleCompositeCurve(0);
+        _this.orbitalX = new ParticleCompositeCurve(0);
+        _this.orbitalY = new ParticleCompositeCurve(0);
+        _this.orbitalZ = new ParticleCompositeCurve(0);
+        _this.radial = new ParticleCompositeCurve(0);
+        // @ts-ignore
+        _this._offset._onValueChanged = function() {
+            return _this._generator._renderer._onGeneratorParamsChanged();
+        };
         return _this;
     }
     var _proto = VelocityOverLifetimeModule.prototype;
@@ -37656,6 +37769,10 @@ __decorate([
    */ _proto._updateShaderData = function _updateShaderData(shaderData) {
         var velocityMacro = null;
         var isRandomModeMacro = null;
+        var orbitalMacro = null;
+        var orbitalRandomModeMacro = null;
+        var radialMacro = null;
+        var radialRandomModeMacro = null;
         if (this.enabled) {
             var velocityX = this.velocityX;
             var velocityY = this.velocityY;
@@ -37685,15 +37802,111 @@ __decorate([
                 }
             }
             shaderData.setInt(VelocityOverLifetimeModule._spaceProperty, this.space);
+            var needTransformFeedback = this._needTransformFeedback();
+            var orbitalActive = needTransformFeedback && this._isOrbitalActive();
+            var radialActive = needTransformFeedback && this._isRadialActive();
+            if (orbitalActive) {
+                var orbitalX = this._orbitalX;
+                var orbitalY = this._orbitalY;
+                var orbitalZ = this._orbitalZ;
+                var isOrbitalRandomCurveMode = orbitalX.mode === ParticleCurveMode.TwoCurves && orbitalY.mode === ParticleCurveMode.TwoCurves && orbitalZ.mode === ParticleCurveMode.TwoCurves;
+                if (isOrbitalRandomCurveMode || orbitalX.mode === ParticleCurveMode.Curve && orbitalY.mode === ParticleCurveMode.Curve && orbitalZ.mode === ParticleCurveMode.Curve) {
+                    shaderData.setFloatArray(VelocityOverLifetimeModule._orbitalMaxCurveXProperty, orbitalX.curveMax._getTypeArray());
+                    shaderData.setFloatArray(VelocityOverLifetimeModule._orbitalMaxCurveYProperty, orbitalY.curveMax._getTypeArray());
+                    shaderData.setFloatArray(VelocityOverLifetimeModule._orbitalMaxCurveZProperty, orbitalZ.curveMax._getTypeArray());
+                    orbitalMacro = VelocityOverLifetimeModule._orbitalCurveModeMacro;
+                    if (isOrbitalRandomCurveMode) {
+                        shaderData.setFloatArray(VelocityOverLifetimeModule._orbitalMinCurveXProperty, orbitalX.curveMin._getTypeArray());
+                        shaderData.setFloatArray(VelocityOverLifetimeModule._orbitalMinCurveYProperty, orbitalY.curveMin._getTypeArray());
+                        shaderData.setFloatArray(VelocityOverLifetimeModule._orbitalMinCurveZProperty, orbitalZ.curveMin._getTypeArray());
+                        orbitalRandomModeMacro = VelocityOverLifetimeModule._orbitalRandomModeMacro;
+                    }
+                } else {
+                    this._orbitalConstant.set(orbitalX.constantMax, orbitalY.constantMax, orbitalZ.constantMax);
+                    shaderData.setVector3(VelocityOverLifetimeModule._orbitalMaxConstantProperty, this._orbitalConstant);
+                    orbitalMacro = VelocityOverLifetimeModule._orbitalConstantModeMacro;
+                    if (orbitalX.mode === ParticleCurveMode.TwoConstants && orbitalY.mode === ParticleCurveMode.TwoConstants && orbitalZ.mode === ParticleCurveMode.TwoConstants) {
+                        this._orbitalMinConstant.set(orbitalX.constantMin, orbitalY.constantMin, orbitalZ.constantMin);
+                        shaderData.setVector3(VelocityOverLifetimeModule._orbitalMinConstantProperty, this._orbitalMinConstant);
+                        orbitalRandomModeMacro = VelocityOverLifetimeModule._orbitalRandomModeMacro;
+                    }
+                }
+            }
+            if (radialActive) {
+                var radial = this._radial;
+                var isRadialRandomMode = radial._isRandomMode();
+                if (radial._isCurveMode()) {
+                    shaderData.setFloatArray(VelocityOverLifetimeModule._radialMaxCurveProperty, radial.curveMax._getTypeArray());
+                    radialMacro = VelocityOverLifetimeModule._radialCurveModeMacro;
+                    if (isRadialRandomMode) {
+                        shaderData.setFloatArray(VelocityOverLifetimeModule._radialMinCurveProperty, radial.curveMin._getTypeArray());
+                        radialRandomModeMacro = VelocityOverLifetimeModule._radialRandomModeMacro;
+                    }
+                } else {
+                    shaderData.setFloat(VelocityOverLifetimeModule._radialMaxConstantProperty, radial.constantMax);
+                    radialMacro = VelocityOverLifetimeModule._radialConstantModeMacro;
+                    if (isRadialRandomMode) {
+                        shaderData.setFloat(VelocityOverLifetimeModule._radialMinConstantProperty, radial.constantMin);
+                        radialRandomModeMacro = VelocityOverLifetimeModule._radialRandomModeMacro;
+                    }
+                }
+            }
+            if (orbitalActive || radialActive) {
+                shaderData.setVector3(VelocityOverLifetimeModule._offsetProperty, this._offset);
+            }
         }
         this._velocityMacro = this._enableMacro(shaderData, this._velocityMacro, velocityMacro);
         this._randomModeMacro = this._enableMacro(shaderData, this._randomModeMacro, isRandomModeMacro);
+        this._orbitalMacro = this._enableMacro(shaderData, this._orbitalMacro, orbitalMacro);
+        this._orbitalRandomModeMacro = this._enableMacro(shaderData, this._orbitalRandomModeMacro, orbitalRandomModeMacro);
+        this._radialMacro = this._enableMacro(shaderData, this._radialMacro, radialMacro);
+        this._radialRandomModeMacro = this._enableMacro(shaderData, this._radialRandomModeMacro, radialRandomModeMacro);
     };
     /**
    * @internal
    */ _proto._resetRandomSeed = function _resetRandomSeed(seed) {
         this._velocityRand.reset(seed, ParticleRandomSubSeeds.VelocityOverLifetime);
     };
+    /**
+   * @internal
+   */ _proto._needTransformFeedback = function _needTransformFeedback() {
+        if (!this._enabled || !this._generator._renderer.engine._hardwareRenderer.isWebGL2) {
+            return false;
+        }
+        return this._isOrbitalActive() || this._isRadialActive();
+    };
+    /**
+   * @internal
+   */ _proto._isOrbitalActive = function _isOrbitalActive() {
+        return !(this._orbitalX._isZero() && this._orbitalY._isZero() && this._orbitalZ._isZero());
+    };
+    /**
+   * @internal
+   */ _proto._isRadialActive = function _isRadialActive() {
+        return !this._radial._isZero();
+    };
+    /**
+   * @internal
+   */ _proto._isRandomMode = function _isRandomMode() {
+        var velocityX = this.velocityX;
+        var velocityY = this.velocityY;
+        var velocityZ = this.velocityZ;
+        var isLinearRandomMode = velocityX.mode === ParticleCurveMode.TwoConstants && velocityY.mode === ParticleCurveMode.TwoConstants && velocityZ.mode === ParticleCurveMode.TwoConstants || velocityX.mode === ParticleCurveMode.TwoCurves && velocityY.mode === ParticleCurveMode.TwoCurves && velocityZ.mode === ParticleCurveMode.TwoCurves;
+        if (!this._needTransformFeedback()) {
+            return isLinearRandomMode;
+        }
+        var orbitalX = this._orbitalX;
+        var orbitalY = this._orbitalY;
+        var orbitalZ = this._orbitalZ;
+        var isOrbitalRandomMode = orbitalX.mode === ParticleCurveMode.TwoConstants && orbitalY.mode === ParticleCurveMode.TwoConstants && orbitalZ.mode === ParticleCurveMode.TwoConstants || orbitalX.mode === ParticleCurveMode.TwoCurves && orbitalY.mode === ParticleCurveMode.TwoCurves && orbitalZ.mode === ParticleCurveMode.TwoCurves;
+        return isLinearRandomMode || isOrbitalRandomMode || this._radial._isRandomMode();
+    };
+    _proto._onOrbitalRadialChange = function _onOrbitalRadialChange(lastValue, value) {
+        this._onCompositeCurveChange(lastValue, value);
+        lastValue == null ? void 0 : lastValue._unRegisterOnValueChanged(this._onTransformFeedbackDirty);
+        value == null ? void 0 : value._registerOnValueChanged(this._onTransformFeedbackDirty);
+        this._generator._setTransformFeedback();
+    };
     _create_class(VelocityOverLifetimeModule, [
         {
             key: "velocityX",
@@ -37740,6 +37953,84 @@ __decorate([
                 }
             }
         },
+        {
+            key: "orbitalX",
+            get: /**
+   * Orbital velocity (radians/second) around the x axis of the system.
+   * @remarks Requires WebGL2.
+   */ function get() {
+                return this._orbitalX;
+            },
+            set: function set(value) {
+                var lastValue = this._orbitalX;
+                if (value !== lastValue) {
+                    this._orbitalX = value;
+                    this._onOrbitalRadialChange(lastValue, value);
+                }
+            }
+        },
+        {
+            key: "orbitalY",
+            get: /**
+   * Orbital velocity (radians/second) around the y axis of the system.
+   * @remarks Requires WebGL2.
+   */ function get() {
+                return this._orbitalY;
+            },
+            set: function set(value) {
+                var lastValue = this._orbitalY;
+                if (value !== lastValue) {
+                    this._orbitalY = value;
+                    this._onOrbitalRadialChange(lastValue, value);
+                }
+            }
+        },
+        {
+            key: "orbitalZ",
+            get: /**
+   * Orbital velocity (radians/second) around the z axis of the system.
+   * @remarks Requires WebGL2.
+   */ function get() {
+                return this._orbitalZ;
+            },
+            set: function set(value) {
+                var lastValue = this._orbitalZ;
+                if (value !== lastValue) {
+                    this._orbitalZ = value;
+                    this._onOrbitalRadialChange(lastValue, value);
+                }
+            }
+        },
+        {
+            key: "radial",
+            get: /**
+   * Radial velocity moving particles away from (or towards) the center.
+   * @remarks Requires WebGL2.
+   */ function get() {
+                return this._radial;
+            },
+            set: function set(value) {
+                var lastValue = this._radial;
+                if (value !== lastValue) {
+                    this._radial = value;
+                    this._onOrbitalRadialChange(lastValue, value);
+                }
+            }
+        },
+        {
+            key: "centerOffset",
+            get: /**
+   * The center offset of orbital/radial motion from the particle system origin.
+   */ function get() {
+                return this._offset;
+            },
+            set: function set(value) {
+                var offset = this._offset;
+                if (value !== offset) {
+                    offset.copyFrom(value);
+                }
+            }
+        },
         {
             key: "space",
             get: /**
@@ -37762,6 +38053,7 @@ __decorate([
             set: function set(value) {
                 if (value !== this._enabled) {
                     this._enabled = value;
+                    this._generator._setTransformFeedback();
                     this._generator._renderer._onGeneratorParamsChanged();
                 }
             }
@@ -37781,6 +38073,25 @@ VelocityOverLifetimeModule._maxGradientXProperty = ShaderProperty.getByName("ren
 VelocityOverLifetimeModule._maxGradientYProperty = ShaderProperty.getByName("renderer_VOLMaxGradientY");
 VelocityOverLifetimeModule._maxGradientZProperty = ShaderProperty.getByName("renderer_VOLMaxGradientZ");
 VelocityOverLifetimeModule._spaceProperty = ShaderProperty.getByName("renderer_VOLSpace");
+VelocityOverLifetimeModule._orbitalConstantModeMacro = ShaderMacro.getByName("RENDERER_VOL_ORBITAL_CONSTANT_MODE");
+VelocityOverLifetimeModule._orbitalCurveModeMacro = ShaderMacro.getByName("RENDERER_VOL_ORBITAL_CURVE_MODE");
+VelocityOverLifetimeModule._orbitalRandomModeMacro = ShaderMacro.getByName("RENDERER_VOL_ORBITAL_IS_RANDOM_TWO");
+VelocityOverLifetimeModule._radialConstantModeMacro = ShaderMacro.getByName("RENDERER_VOL_RADIAL_CONSTANT_MODE");
+VelocityOverLifetimeModule._radialCurveModeMacro = ShaderMacro.getByName("RENDERER_VOL_RADIAL_CURVE_MODE");
+VelocityOverLifetimeModule._radialRandomModeMacro = ShaderMacro.getByName("RENDERER_VOL_RADIAL_IS_RANDOM_TWO");
+VelocityOverLifetimeModule._orbitalMinConstantProperty = ShaderProperty.getByName("renderer_VOLOrbitalMinConst");
+VelocityOverLifetimeModule._orbitalMaxConstantProperty = ShaderProperty.getByName("renderer_VOLOrbitalMaxConst");
+VelocityOverLifetimeModule._orbitalMinCurveXProperty = ShaderProperty.getByName("renderer_VOLOrbitalMinCurveX");
+VelocityOverLifetimeModule._orbitalMinCurveYProperty = ShaderProperty.getByName("renderer_VOLOrbitalMinCurveY");
+VelocityOverLifetimeModule._orbitalMinCurveZProperty = ShaderProperty.getByName("renderer_VOLOrbitalMinCurveZ");
+VelocityOverLifetimeModule._orbitalMaxCurveXProperty = ShaderProperty.getByName("renderer_VOLOrbitalMaxCurveX");
+VelocityOverLifetimeModule._orbitalMaxCurveYProperty = ShaderProperty.getByName("renderer_VOLOrbitalMaxCurveY");
+VelocityOverLifetimeModule._orbitalMaxCurveZProperty = ShaderProperty.getByName("renderer_VOLOrbitalMaxCurveZ");
+VelocityOverLifetimeModule._radialMinConstantProperty = ShaderProperty.getByName("renderer_VOLRadialMinConst");
+VelocityOverLifetimeModule._radialMaxConstantProperty = ShaderProperty.getByName("renderer_VOLRadialMaxConst");
+VelocityOverLifetimeModule._radialMinCurveProperty = ShaderProperty.getByName("renderer_VOLRadialMinCurve");
+VelocityOverLifetimeModule._radialMaxCurveProperty = ShaderProperty.getByName("renderer_VOLRadialMaxCurve");
+VelocityOverLifetimeModule._offsetProperty = ShaderProperty.getByName("renderer_VOLOffset");
 __decorate([
     ignoreClone
 ], VelocityOverLifetimeModule.prototype, "_velocityRand", void 0);
@@ -37796,6 +38107,24 @@ __decorate([
 __decorate([
     ignoreClone
 ], VelocityOverLifetimeModule.prototype, "_randomModeMacro", void 0);
+__decorate([
+    ignoreClone
+], VelocityOverLifetimeModule.prototype, "_orbitalMinConstant", void 0);
+__decorate([
+    ignoreClone
+], VelocityOverLifetimeModule.prototype, "_orbitalConstant", void 0);
+__decorate([
+    ignoreClone
+], VelocityOverLifetimeModule.prototype, "_orbitalMacro", void 0);
+__decorate([
+    ignoreClone
+], VelocityOverLifetimeModule.prototype, "_orbitalRandomModeMacro", void 0);
+__decorate([
+    ignoreClone
+], VelocityOverLifetimeModule.prototype, "_radialMacro", void 0);
+__decorate([
+    ignoreClone
+], VelocityOverLifetimeModule.prototype, "_radialRandomModeMacro", void 0);
 __decorate([
     deepClone
 ], VelocityOverLifetimeModule.prototype, "_velocityX", void 0);
@@ -37805,6 +38134,24 @@ __decorate([
 __decorate([
     deepClone
 ], VelocityOverLifetimeModule.prototype, "_velocityZ", void 0);
+__decorate([
+    deepClone
+], VelocityOverLifetimeModule.prototype, "_orbitalX", void 0);
+__decorate([
+    deepClone
+], VelocityOverLifetimeModule.prototype, "_orbitalY", void 0);
+__decorate([
+    deepClone
+], VelocityOverLifetimeModule.prototype, "_orbitalZ", void 0);
+__decorate([
+    deepClone
+], VelocityOverLifetimeModule.prototype, "_radial", void 0);
+__decorate([
+    deepClone
+], VelocityOverLifetimeModule.prototype, "_offset", void 0);
+__decorate([
+    ignoreClone
+], VelocityOverLifetimeModule.prototype, "_onTransformFeedbackDirty", void 0);
 
 /**
  * Optional parent properties a sub-emitter inherits
@@ -38405,12 +38752,10 @@ __decorate([
     /**
    * @internal
    */ _proto._setTransformFeedback = function _setTransformFeedback() {
-        var needed = this._renderer.engine._hardwareRenderer.isWebGL2 && (this.limitVelocityOverLifetime.enabled || this.noise.enabled || this.subEmitters._hasSubEmitterOfType(ParticleSubEmitterType.Death));
+        var _this_limitVelocityOverLifetime, _this_noise, _this_velocityOverLifetime, _this_subEmitters;
+        var needed = !!(this._renderer.engine._hardwareRenderer.isWebGL2 && (((_this_limitVelocityOverLifetime = this.limitVelocityOverLifetime) == null ? void 0 : _this_limitVelocityOverLifetime.enabled) || ((_this_noise = this.noise) == null ? void 0 : _this_noise.enabled) || ((_this_velocityOverLifetime = this.velocityOverLifetime) == null ? void 0 : _this_velocityOverLifetime._needTransformFeedback()) || ((_this_subEmitters = this.subEmitters) == null ? void 0 : _this_subEmitters._hasSubEmitterOfType(ParticleSubEmitterType.Death))));
         if (needed === this._useTransformFeedback) return;
         this._useTransformFeedback = needed;
-        // Switching TF mode invalidates all active particle state: feedback buffers and instance
-        // buffer layout are incompatible between the two paths. Clear rather than show a one-frame
-        // jump; new particles will fill in naturally from the next emit cycle.
         this._clearActiveParticles();
         if (needed) {
             if (!this._feedbackSimulator) {
@@ -38488,7 +38833,12 @@ __decorate([
             this._calculateTransformedBounds(maxLifetime, generatorBounds, transformedBounds);
             renderer._setDirtyFlagFalse(ParticleUpdateFlags.TransformVolume);
         }
-        this._addGravityToBounds(maxLifetime, transformedBounds, bounds);
+        if (this._useOrbitalBounds()) {
+            bounds.min.copyFrom(transformedBounds.min);
+            bounds.max.copyFrom(transformedBounds.max);
+        } else {
+            this._addGravityToBounds(maxLifetime, transformedBounds, bounds);
+        }
     };
     /**
    * @internal
@@ -38514,7 +38864,9 @@ __decorate([
             }
         }
         var maxLifetime = this.main.startLifetime._getMax();
-        this._addGravityToBounds(maxLifetime, bounds, bounds);
+        if (!this._useOrbitalBounds()) {
+            this._addGravityToBounds(maxLifetime, bounds, bounds);
+        }
     };
     /**
    * @internal
@@ -38663,7 +39015,7 @@ __decorate([
         }
         // Velocity random
         var velocityOverLifetime = this.velocityOverLifetime;
-        if (velocityOverLifetime.enabled && velocityOverLifetime.velocityX.mode === ParticleCurveMode.TwoConstants && velocityOverLifetime.velocityY.mode === ParticleCurveMode.TwoConstants && velocityOverLifetime.velocityZ.mode === ParticleCurveMode.TwoConstants) {
+        if (velocityOverLifetime.enabled && velocityOverLifetime._isRandomMode()) {
             var rand = velocityOverLifetime._velocityRand;
             instanceVertices[offset + 24] = rand.random();
             instanceVertices[offset + 25] = rand.random();
@@ -39075,7 +39427,7 @@ __decorate([
         max.set(Math.max(max.x, boundsArray[offset + 3]), Math.max(max.y, boundsArray[offset + 4]), Math.max(max.z, boundsArray[offset + 5]));
     };
     _proto._calculateTransformedBounds = function _calculateTransformedBounds(maxLifetime, origin, out) {
-        var velMinMaxX = ParticleGenerator._tempVector20, velMinMaxY = ParticleGenerator._tempVector21, velMinMaxZ = ParticleGenerator._tempVector22, worldOffsetMin = ParticleGenerator._tempVector30, worldOffsetMax = ParticleGenerator._tempVector31, rotateMat = ParticleGenerator._tempMat;
+        var velMinMaxX = ParticleGenerator._tempVector20, velMinMaxY = ParticleGenerator._tempVector21, velMinMaxZ = ParticleGenerator._tempVector22, worldOffsetMin = ParticleGenerator._tempVector30, worldOffsetMax = ParticleGenerator._tempVector31, noiseBoundsExtents = ParticleGenerator._tempVector32, rotateMat = ParticleGenerator._tempMat;
         worldOffsetMin.set(0, 0, 0);
         worldOffsetMax.set(0, 0, 0);
         var transform = this._renderer.entity.transform;
@@ -39118,27 +39470,89 @@ __decorate([
                 worldOffsetMax.set(worldOffsetMax.x + forceMinMaxX.y, worldOffsetMax.y + forceMinMaxY.y, worldOffsetMax.z + forceMinMaxZ.y);
             }
         }
-        out.transform(rotateMat);
-        min.add(worldOffsetMin);
-        max.add(worldOffsetMax);
-        // Noise module impact: noise output is normalized to [-1, 1],
-        // max displacement = |strength_max|
         var noise = this.noise;
-        if (noise.enabled) {
-            var noiseMaxX, noiseMaxY, noiseMaxZ;
-            if (noise.separateAxes) {
-                noiseMaxX = Math.abs(noise.strengthX._getMax());
-                noiseMaxY = Math.abs(noise.strengthY._getMax());
-                noiseMaxZ = Math.abs(noise.strengthZ._getMax());
-            } else {
-                noiseMaxX = noiseMaxY = noiseMaxZ = Math.abs(noise.strengthX._getMax());
+        this._getNoiseBoundsExtents(maxLifetime, noiseBoundsExtents);
+        var needTransformFeedback = velocityOverLifetime._needTransformFeedback();
+        var orbitalActive = needTransformFeedback && velocityOverLifetime._isOrbitalActive();
+        if (needTransformFeedback) {
+            var centerOffset = velocityOverLifetime.centerOffset;
+            var radialReach = 0;
+            if (velocityOverLifetime._isRadialActive()) {
+                this._getExtremeValueFromZero(velocityOverLifetime.radial, velMinMaxX);
+                radialReach = Math.max(Math.abs(velMinMaxX.x), Math.abs(velMinMaxX.y)) * maxLifetime;
+            }
+            if (orbitalActive) {
+                var dx = Math.max(Math.abs(min.x - centerOffset.x), Math.abs(max.x - centerOffset.x));
+                var dy = Math.max(Math.abs(min.y - centerOffset.y), Math.abs(max.y - centerOffset.y));
+                var dz = Math.max(Math.abs(min.z - centerOffset.z), Math.abs(max.z - centerOffset.z));
+                var worldReach = this._getRangeReach(worldOffsetMin, worldOffsetMax);
+                var noiseReach = this._getVectorReach(noiseBoundsExtents);
+                var gravityReach = this._getGravityBoundsReach(maxLifetime);
+                var reach = Math.sqrt(dx * dx + dy * dy + dz * dz) + worldReach + noiseReach + gravityReach + radialReach;
+                min.set(Math.min(min.x, centerOffset.x - reach), Math.min(min.y, centerOffset.y - reach), Math.min(min.z, centerOffset.z - reach));
+                max.set(Math.max(max.x, centerOffset.x + reach), Math.max(max.y, centerOffset.y + reach), Math.max(max.z, centerOffset.z + reach));
+            } else if (radialReach > 0) {
+                min.set(min.x - radialReach, min.y - radialReach, min.z - radialReach);
+                max.set(max.x + radialReach, max.y + radialReach, max.z + radialReach);
+            }
+        }
+        out.transform(rotateMat);
+        if (!orbitalActive) {
+            min.add(worldOffsetMin);
+            max.add(worldOffsetMax);
+            if (noise.enabled) {
+                min.set(min.x - noiseBoundsExtents.x, min.y - noiseBoundsExtents.y, min.z - noiseBoundsExtents.z);
+                max.set(max.x + noiseBoundsExtents.x, max.y + noiseBoundsExtents.y, max.z + noiseBoundsExtents.z);
             }
-            min.set(min.x - noiseMaxX, min.y - noiseMaxY, min.z - noiseMaxZ);
-            max.set(max.x + noiseMaxX, max.y + noiseMaxY, max.z + noiseMaxZ);
         }
         min.add(worldPosition);
         max.add(worldPosition);
     };
+    _proto._useOrbitalBounds = function _useOrbitalBounds() {
+        var velocityOverLifetime = this.velocityOverLifetime;
+        return velocityOverLifetime._needTransformFeedback() && velocityOverLifetime._isOrbitalActive();
+    };
+    _proto._getNoiseBoundsExtents = function _getNoiseBoundsExtents(maxLifetime, out) {
+        var noise = this.noise;
+        if (!noise.enabled) {
+            out.set(0, 0, 0);
+            return;
+        }
+        var noiseMaxX, noiseMaxY, noiseMaxZ;
+        if (noise.separateAxes) {
+            noiseMaxX = this._getCurveMagnitudeFromZero(noise.strengthX);
+            noiseMaxY = this._getCurveMagnitudeFromZero(noise.strengthY);
+            noiseMaxZ = this._getCurveMagnitudeFromZero(noise.strengthZ);
+        } else {
+            noiseMaxX = noiseMaxY = noiseMaxZ = this._getCurveMagnitudeFromZero(noise.strengthX);
+        }
+        out.set(noiseMaxX * maxLifetime, noiseMaxY * maxLifetime, noiseMaxZ * maxLifetime);
+    };
+    _proto._getGravityBoundsReach = function _getGravityBoundsReach(maxLifetime) {
+        var modifierMinMax = ParticleGenerator._tempVector20;
+        this._getExtremeValueFromZero(this.main.gravityModifier, modifierMinMax);
+        var coefficient = 0.5 * maxLifetime * maxLifetime;
+        var minGravityEffect = modifierMinMax.x * coefficient;
+        var maxGravityEffect = modifierMinMax.y * coefficient;
+        var _this__renderer_scene_physics_gravity = this._renderer.scene.physics.gravity, x = _this__renderer_scene_physics_gravity.x, y = _this__renderer_scene_physics_gravity.y, z = _this__renderer_scene_physics_gravity.z;
+        var gravityBoundsExtents = ParticleGenerator._tempVector33;
+        gravityBoundsExtents.set(Math.max(Math.abs(x * minGravityEffect), Math.abs(x * maxGravityEffect)), Math.max(Math.abs(y * minGravityEffect), Math.abs(y * maxGravityEffect)), Math.max(Math.abs(z * minGravityEffect), Math.abs(z * maxGravityEffect)));
+        return this._getVectorReach(gravityBoundsExtents);
+    };
+    _proto._getRangeReach = function _getRangeReach(min, max) {
+        var x = Math.max(Math.abs(min.x), Math.abs(max.x));
+        var y = Math.max(Math.abs(min.y), Math.abs(max.y));
+        var z = Math.max(Math.abs(min.z), Math.abs(max.z));
+        return Math.sqrt(x * x + y * y + z * z);
+    };
+    _proto._getVectorReach = function _getVectorReach(value) {
+        return Math.sqrt(value.x * value.x + value.y * value.y + value.z * value.z);
+    };
+    _proto._getCurveMagnitudeFromZero = function _getCurveMagnitudeFromZero(curve) {
+        var minMax = ParticleGenerator._tempVector20;
+        this._getExtremeValueFromZero(curve, minMax);
+        return Math.max(Math.abs(minMax.x), Math.abs(minMax.y));
+    };
     _proto._addGravityToBounds = function _addGravityToBounds(maxLifetime, origin, out) {
         var originMin = origin.min, originMax = origin.max;
         var modifierMinMax = ParticleGenerator._tempVector20;
@@ -39200,6 +39614,7 @@ ParticleGenerator._tempVector22 = new engineMath.Vector2();
 ParticleGenerator._tempVector30 = new engineMath.Vector3();
 ParticleGenerator._tempVector31 = new engineMath.Vector3();
 ParticleGenerator._tempVector32 = new engineMath.Vector3();
+ParticleGenerator._tempVector33 = new engineMath.Vector3();
 ParticleGenerator._tempMat = new engineMath.Matrix();
 ParticleGenerator._tempColor = new engineMath.Color();
 ParticleGenerator._tempQuat0 = new engineMath.Quaternion();
@@ -41037,7 +41452,14 @@ var cacheDir = new engineMath.Vector3();
    * Suspend the audio context.
    * @returns A promise that resolves when the audio context is suspended
    */ AudioManager.suspend = function suspend() {
-        return AudioManager.getContext().suspend();
+        // No context means nothing is playing: suspending is a no-op and must NOT flag a caller-suspend
+        // (a ghost flag would later block foreground recovery), and don't create a cold context just to suspend
+        var context = AudioManager._context;
+        if (!context) {
+            return Promise.resolve();
+        }
+        AudioManager._suspendedByCaller = true;
+        return context.suspend();
     };
     /**
    * Resume the audio context.
@@ -41045,6 +41467,7 @@ var cacheDir = new engineMath.Vector3();
    * @returns A promise that resolves when the audio context is resumed
    */ AudioManager.resume = function resume() {
         var _AudioManager;
+        AudioManager._suspendedByCaller = false;
         var __resumePromise;
         return (__resumePromise = (_AudioManager = AudioManager)._resumePromise) != null ? __resumePromise : _AudioManager._resumePromise = AudioManager.getContext().resume().then(function() {
             AudioManager._needsUserGestureResume = false;
@@ -41059,7 +41482,9 @@ var cacheDir = new engineMath.Vector3();
         if (!context) {
             AudioManager._context = context = new window.AudioContext();
             document.addEventListener("visibilitychange", AudioManager._onVisibilityChange);
-            // iOS Safari requires user gesture to resume AudioContext
+            // iOS Safari bfcache restore fires pageshow (persisted) but NOT visibilitychange, so recover here too
+            window.addEventListener("pageshow", AudioManager._onPageShow);
+            // iOS Safari requires a user gesture to resume the AudioContext
             document.addEventListener("touchstart", AudioManager._resumeAfterInterruption, {
                 passive: true
             });
@@ -41087,27 +41512,62 @@ var cacheDir = new engineMath.Vector3();
         return AudioManager.getContext().state === "running";
     };
     AudioManager._onVisibilityChange = function _onVisibilityChange() {
-        if (!document.hidden && AudioManager._playingCount > 0 && !AudioManager.isAudioContextRunning()) {
-            // iOS WKWebView WebKit bug(Triggered in LingGuang App): AudioContext may be in a "zombie" state where
-            // state reports "suspended" but resume() alone won't restart audio rendering.
-            // Calling suspend() first forces a clean internal state reset before user gesture triggers resume.
-            // Related: https://bugs.webkit.org/show_bug.cgi?id=263627
-            AudioManager.suspend();
-            AudioManager._needsUserGestureResume = true;
+        if (document.hidden) {
+            var // Desktop/Android don't auto-suspend a running WebAudio context when backgrounded (only iOS does),
+            // so suspend here to stop audio in the background; only if a context already exists (don't create one)
+            _AudioManager__context;
+            (_AudioManager__context = AudioManager._context) == null ? void 0 : _AudioManager__context.suspend().catch(function() {});
+        } else {
+            AudioManager._recoverPlaybackContext();
+        }
+    };
+    AudioManager._recoverPlaybackContext = function _recoverPlaybackContext() {
+        // Returning to foreground with a non-running context (and not a deliberate pause): iOS leaves it
+        // "interrupted", which cannot be resumed directly; suspend() first transitions it to "suspended",
+        // then resume() restarts the pipeline https://bugs.webkit.org/show_bug.cgi?id=263627
+        // _recovering guards re-entry: a bfcache restore fires both visibilitychange and pageshow
+        if (AudioManager._recovering || document.hidden || AudioManager._suspendedByCaller || AudioManager._playingCount <= 0 || AudioManager.isAudioContextRunning()) {
+            return;
+        }
+        AudioManager._recovering = true;
+        AudioManager._needsUserGestureResume = true; // fallback if the auto-resume below is rejected
+        var context = AudioManager.getContext();
+        context.suspend().catch(function() {});
+        // 100ms empirical delay (resume too soon after suspend is unreliable on iOS); _recovering is cleared
+        // on the timer rather than off a promise because iOS may never settle suspend/resume in interrupted
+        setTimeout(function() {
+            AudioManager._recovering = false;
+            if (document.hidden || AudioManager._suspendedByCaller) {
+                return;
+            }
+            // Go through AudioManager.resume() so _resumePromise coalesces any gesture-resume racing us during
+            // the slow iOS interrupted->running transition; a bare context.resume() here wouldn't dedupe
+            AudioManager.resume().catch(function() {});
+        }, 100);
+    };
+    AudioManager._onPageShow = function _onPageShow(event) {
+        // iOS Safari bfcache restore (persisted) needs recovery; a normal load has no suspended context
+        if (event.persisted) {
+            AudioManager._recoverPlaybackContext();
         }
     };
     AudioManager._resumeAfterInterruption = function _resumeAfterInterruption() {
-        if (AudioManager._needsUserGestureResume) {
-            AudioManager.resume().catch(function(e) {
-                console.warn("Failed to resume AudioContext:", e);
-            });
+        // iOS Safari gesture fallback for when auto-resume is blocked.
+        // _recovering: don't bypass the 100ms delay (would resume on a still-interrupted context)
+        if (AudioManager._recovering || AudioManager._suspendedByCaller || !AudioManager._needsUserGestureResume) {
+            return;
         }
+        AudioManager.resume().catch(function(e) {
+            console.warn("Failed to resume AudioContext:", e);
+        });
     };
     return AudioManager;
 }();
 /** @internal */ AudioManager._playingCount = 0;
 AudioManager._resumePromise = null;
 AudioManager._needsUserGestureResume = false;
+AudioManager._suspendedByCaller = false;
+AudioManager._recovering = false;
 
 /**
  * Audio Source Component.
@@ -41117,8 +41577,6 @@ AudioManager._needsUserGestureResume = false;
         var _this;
         _this = Component.call(this, entity) || this, /** If set to true, the audio component automatically begins to play on startup. */ _this.playOnEnabled = true, _this._isPlaying = false, _this._pendingPlay = false, _this._sourceNode = null, _this._pausedTime = -1, _this._playTime = -1, _this._volume = 1, _this._lastVolume = 1, _this._playbackRate = 1, _this._loop = false;
         _this._onPlayEnd = _this._onPlayEnd.bind(_this);
-        _this._gainNode = AudioManager.getContext().createGain();
-        _this._gainNode.connect(AudioManager.getGainNode());
         return _this;
     }
     var _proto = AudioSource.prototype;
@@ -41130,6 +41588,10 @@ AudioManager._needsUserGestureResume = false;
         if (!((_this__clip = this._clip) == null ? void 0 : _this__clip._getAudioSource()) || this._isPlaying || this._pendingPlay) {
             return;
         }
+        // Hidden page: don't start (would leak a sound) and don't pend (would replay out of sync) -> drop
+        if (document.hidden) {
+            return;
+        }
         if (AudioManager.isAudioContextRunning()) {
             this._startPlayback();
         } else {
@@ -41142,8 +41604,8 @@ AudioManager._needsUserGestureResume = false;
                     return;
                 }
                 _this._pendingPlay = false;
-                // Check if still valid to play after async resume
-                if (_this._destroyed || !_this.enabled || !_this._clip) {
+                // Check if still valid to play after async resume (page may have been hidden meanwhile)
+                if (_this._destroyed || !_this.enabled || !_this._clip || document.hidden) {
                     return;
                 }
                 _this._startPlayback();
@@ -41160,10 +41622,11 @@ AudioManager._needsUserGestureResume = false;
         if (this._isPlaying) {
             this._clearSourceNode();
             this._isPlaying = false;
-            this._pausedTime = -1;
-            this._playTime = -1;
             AudioManager._playingCount--;
         }
+        // stop() always resets to the start, including from a paused state (where _isPlaying is already false)
+        this._pausedTime = -1;
+        this._playTime = -1;
     };
     /**
    * Pauses playing the clip.
@@ -41181,7 +41644,7 @@ AudioManager._needsUserGestureResume = false;
    */ _proto._cloneTo = function _cloneTo(target) {
         var _target__clip;
         (_target__clip = target._clip) == null ? void 0 : _target__clip._addReferCount(1);
-        target._gainNode.gain.setValueAtTime(target._volume, AudioManager.getContext().currentTime);
+    // _volume is field-cloned; its gain node is applied lazily on first play
     };
     /**
    * @internal
@@ -41203,6 +41666,15 @@ AudioManager._needsUserGestureResume = false;
     _proto._onPlayEnd = function _onPlayEnd() {
         this.stop();
     };
+    _proto._ensureGainNode = function _ensureGainNode() {
+        var gainNode = this._gainNode;
+        if (!gainNode) {
+            this._gainNode = gainNode = AudioManager.getContext().createGain();
+            gainNode.connect(AudioManager.getGainNode());
+            gainNode.gain.setValueAtTime(this._volume, AudioManager.getContext().currentTime);
+        }
+        return gainNode;
+    };
     _proto._startPlayback = function _startPlayback() {
         var startTime = this._pausedTime > 0 ? this._pausedTime - this._playTime : 0;
         this._initSourceNode(startTime);
@@ -41214,13 +41686,17 @@ AudioManager._needsUserGestureResume = false;
     _proto._initSourceNode = function _initSourceNode(startTime) {
         var context = AudioManager.getContext();
         var sourceNode = context.createBufferSource();
-        sourceNode.buffer = this._clip._getAudioSource();
+        var buffer = this._clip._getAudioSource();
+        sourceNode.buffer = buffer;
         sourceNode.playbackRate.value = this._playbackRate;
         sourceNode.loop = this._loop;
         sourceNode.onended = this._onPlayEnd;
         this._sourceNode = sourceNode;
-        sourceNode.connect(this._gainNode);
-        sourceNode.start(0, startTime);
+        sourceNode.connect(this._ensureGainNode());
+        // startTime is total elapsed time; for a looping clip wrap it into the buffer to keep the loop phase
+        // (start()'s offset clamps past the end, it does not wrap)
+        var offset = this._loop && buffer.duration > 0 ? startTime % buffer.duration : startTime;
+        sourceNode.start(0, offset);
     };
     _proto._clearSourceNode = function _clearSourceNode() {
         this._sourceNode.stop();
@@ -41263,9 +41739,11 @@ AudioManager._needsUserGestureResume = false;
                 return this._volume;
             },
             set: function set(value) {
+                var // No node yet -> _ensureGainNode() applies _volume on first play
+                _this__gainNode;
                 value = Math.min(Math.max(0, value), 1.0);
                 this._volume = value;
-                this._gainNode.gain.setValueAtTime(value, AudioManager.getContext().currentTime);
+                (_this__gainNode = this._gainNode) == null ? void 0 : _this__gainNode.gain.setValueAtTime(value, AudioManager.getContext().currentTime);
             }
         },
         {
@@ -41377,6 +41855,7 @@ __decorate([
     Polyfill.registerPolyfill = function registerPolyfill() {
         Polyfill._registerMatchAll();
         Polyfill._registerAudioContext();
+        Polyfill._registerOfflineAudioContext();
         Polyfill._registerTextMetrics();
         Polyfill._registerPromiseFinally();
     };
@@ -41441,20 +41920,32 @@ __decorate([
         if (!window.AudioContext && window.webkitAudioContext) {
             Logger.info("Polyfill window.AudioContext");
             window.AudioContext = window.webkitAudioContext;
-            var originalDecodeAudioData = AudioContext.prototype.decodeAudioData;
-            AudioContext.prototype.decodeAudioData = function(arrayBuffer, successCallback, errorCallback) {
-                var _this = this;
-                return new Promise(function(resolve, reject) {
-                    originalDecodeAudioData.call(_this, arrayBuffer, function(buffer) {
-                        successCallback == null ? void 0 : successCallback(buffer);
-                        resolve(buffer);
-                    }, function(error) {
-                        errorCallback == null ? void 0 : errorCallback(error);
-                        reject(error);
-                    });
+            Polyfill._promisifyDecodeAudioData(AudioContext.prototype);
+        }
+    };
+    Polyfill._registerOfflineAudioContext = function _registerOfflineAudioContext() {
+        // iOS 14.0 and earlier expose only webkitOfflineAudioContext, with callback-form decodeAudioData
+        if (!window.OfflineAudioContext && window.webkitOfflineAudioContext) {
+            Logger.info("Polyfill window.OfflineAudioContext");
+            window.OfflineAudioContext = window.webkitOfflineAudioContext;
+            Polyfill._promisifyDecodeAudioData(OfflineAudioContext.prototype);
+        }
+    };
+    // Wrap the old callback-form decodeAudioData (on prefixed iOS contexts) into the modern Promise form
+    Polyfill._promisifyDecodeAudioData = function _promisifyDecodeAudioData(proto) {
+        var originalDecodeAudioData = proto.decodeAudioData;
+        proto.decodeAudioData = function(arrayBuffer, successCallback, errorCallback) {
+            var _this = this;
+            return new Promise(function(resolve, reject) {
+                originalDecodeAudioData.call(_this, arrayBuffer, function(buffer) {
+                    successCallback == null ? void 0 : successCallback(buffer);
+                    resolve(buffer);
+                }, function(error) {
+                    errorCallback == null ? void 0 : errorCallback(error);
+                    reject(error);
                 });
-            };
-        }
+            });
+        };
     };
     Polyfill._registerTextMetrics = function _registerTextMetrics() {
         // Based on the specific version of the engine implementation, when actualBoundingBoxLeft is not supported, width is used to represent the rendering width, and `textAlign` uses the default value `start` and direction is left to right.