@galacean/engine-core 1.4.12 → 1.4.14

package/dist/main.js

@@ -5809,6 +5809,7 @@ exports.Camera = /*#__PURE__*/ function(Component) {
         }
         this._renderPipeline.render(context, cubeFace, mipLevel, ignoreClearFlags);
         engine._renderCount++;
+        context.camera = null;
     };
     _proto.setReplacementShader = function setReplacementShader(shader, replacementTag, failureStrategy) {
         if (failureStrategy === void 0) failureStrategy = ReplacementFailureStrategy.KeepOriginalShader;
@@ -8419,6 +8420,28 @@ ShaderPass._shaderPassCounter = 0;
    */ Shader.find = function find(name) {
         return Shader._shaderMap[name];
     };
+    /**
+   * @internal
+   */ Shader._clear = function _clear(engine) {
+        var shaderMap = Shader._shaderMap;
+        for(var key in shaderMap){
+            var shader = shaderMap[key];
+            var subShaders = shader._subShaders;
+            for(var i = 0, n = subShaders.length; i < n; i++){
+                var passes = subShaders[i].passes;
+                for(var j = 0, m = passes.length; j < m; j++){
+                    var pass = passes[j];
+                    var passShaderProgramPools = pass._shaderProgramPools;
+                    for(var k = passShaderProgramPools.length - 1; k >= 0; k--){
+                        var shaderProgramPool = passShaderProgramPools[k];
+                        if (shaderProgramPool.engine !== engine) continue;
+                        shaderProgramPool._destroy();
+                        passShaderProgramPools.splice(k, 1);
+                    }
+                }
+            }
+        }
+    };
     Shader._applyConstRenderStates = function _applyConstRenderStates(renderState, key, value) {
         switch(key){
             case RenderStateElementKey.BlendStateEnabled0:
@@ -8869,6 +8892,7 @@ BatchUtils._disableBatchTag = ShaderTagKey.getByName("spriteDisableBatching");
         program.uploadUnGroupTextures();
         (pass._renderState || blitMaterial.renderState)._applyStates(engine, false, pass._renderStateDataMap, blitMaterial.shaderData);
         rhi.drawPrimitive(blitMesh._primitive, blitMesh.subMesh, program);
+        rendererShaderData.setTexture(Blitter._blitTextureProperty, null);
     };
     return Blitter;
 }();
@@ -10878,7 +10902,6 @@ __decorate([
    * @internal
    */ _proto._cloneTo = function _cloneTo(target, srcRoot, targetRoot) {
         Renderer.prototype._cloneTo.call(this, target, srcRoot, targetRoot);
-        target._assembler.resetData(target);
         target.sprite = this._sprite;
         target.drawMode = this._drawMode;
     };
@@ -11232,7 +11255,7 @@ __decorate([
     ignoreClone
 ], SpriteRenderer.prototype, "_drawMode", void 0);
 __decorate([
-    assignmentClone
+    ignoreClone
 ], SpriteRenderer.prototype, "_assembler", void 0);
 __decorate([
     assignmentClone
@@ -17651,7 +17674,7 @@ var ComponentCloner = /*#__PURE__*/ function() {
         if (oldParent != null) {
             Entity._removeFromChildren(oldParent._children, this);
             this._parent = null;
-            this._dispatchModify(EntityModifyFlags.Child, oldParent);
+            oldParent._dispatchModify(EntityModifyFlags.Child, oldParent);
         }
     };
     /**
@@ -17705,6 +17728,7 @@ var ComponentCloner = /*#__PURE__*/ function() {
             this._removeFromParent();
             this._parent = parent;
             if (parent) {
+                this._isRoot = false;
                 parent._addToChildrenList(siblingIndex, this);
                 var oldScene = this._scene;
                 var parentScene = parent._scene;
@@ -17816,7 +17840,6 @@ var ComponentCloner = /*#__PURE__*/ function() {
                 }
             }
         }
-        this._dispatchModify(EntityModifyFlags.Child, this);
     };
     /**
    * @deprecated
@@ -18001,7 +18024,13 @@ var ComponentCloner = /*#__PURE__*/ function() {
                 if (this._siblingIndex === -1) {
                     throw "The entity " + this.name + " is not in the hierarchy";
                 }
-                this._setSiblingIndex(this._isRoot ? this._scene._rootEntities : this._parent._children, value);
+                if (this._isRoot) {
+                    this._setSiblingIndex(this._scene._rootEntities, value);
+                } else {
+                    var parent = this._parent;
+                    this._setSiblingIndex(parent._children, value);
+                    parent._dispatchModify(EntityModifyFlags.Child, parent);
+                }
             }
         }
     ]);
@@ -18481,6 +18510,11 @@ __decorate([
     var _proto = BasicResources.prototype;
     /**
    * @internal
+   */ _proto._getBlinnPhongMaterial = function _getBlinnPhongMaterial() {
+        return this._blinnPhongMaterial || (this._blinnPhongMaterial = new BlinnPhongMaterial(this.engine));
+    };
+    /**
+   * @internal
    */ _proto._initialize = function _initialize() {
         var _this = this;
         return new Promise(function(resolve, reject) {
@@ -19793,7 +19827,6 @@ var MultiExecutor = /*#__PURE__*/ function() {
     };
     _proto._loadSingleItem = function _loadSingleItem(itemOrURL) {
         var _this = this;
-        var _this__virtualPathResourceMap_assetBaseURL;
         var item = this._assignDefaultOptions(typeof itemOrURL === "string" ? {
             url: itemOrURL
         } : itemOrURL);
@@ -19803,9 +19836,10 @@ var MultiExecutor = /*#__PURE__*/ function() {
         // Parse url
         var _this__parseURL = this._parseURL(url), assetBaseURL = _this__parseURL.assetBaseURL, queryPath = _this__parseURL.queryPath;
         var paths = queryPath ? this._parseQueryPath(queryPath) : [];
-        var _this__virtualPathResourceMap_assetBaseURL_path;
         // Get remote asset base url
-        var remoteAssetBaseURL = (_this__virtualPathResourceMap_assetBaseURL_path = (_this__virtualPathResourceMap_assetBaseURL = this._virtualPathResourceMap[assetBaseURL]) == null ? void 0 : _this__virtualPathResourceMap_assetBaseURL.path) != null ? _this__virtualPathResourceMap_assetBaseURL_path : assetBaseURL;
+        var remoteConfig = this._virtualPathResourceMap[assetBaseURL];
+        var _remoteConfig_path;
+        var remoteAssetBaseURL = (_remoteConfig_path = remoteConfig == null ? void 0 : remoteConfig.path) != null ? _remoteConfig_path : assetBaseURL;
         // Check cache
         var cacheObject = this._assetUrlPool[remoteAssetBaseURL];
         if (cacheObject) {
@@ -19839,15 +19873,20 @@ var MultiExecutor = /*#__PURE__*/ function() {
         if (!loader) {
             throw "loader not found: " + item.type;
         }
+        var subpackageName = remoteConfig == null ? void 0 : remoteConfig.subpackageName;
         // Check sub asset
         if (queryPath) {
             // Check whether load main asset
-            var mainPromise = loadingPromises[remoteAssetBaseURL] || this._loadMainAsset(loader, item, remoteAssetBaseURL, assetBaseURL);
+            var mainPromise = loadingPromises[remoteAssetBaseURL] || this._loadSubpackageAndMainAsset(loader, item, remoteAssetBaseURL, assetBaseURL, subpackageName);
             mainPromise.catch(function(e) {
                 _this._onSubAssetFail(remoteAssetBaseURL, queryPath, e);
             });
             return this._createSubAssetPromiseCallback(remoteAssetBaseURL, remoteAssetURL, queryPath);
         }
+        return this._loadSubpackageAndMainAsset(loader, item, remoteAssetBaseURL, assetBaseURL, subpackageName);
+    };
+    // For adapter mini-game platform
+    _proto._loadSubpackageAndMainAsset = function _loadSubpackageAndMainAsset(loader, item, remoteAssetBaseURL, assetBaseURL, subpackageName) {
         return this._loadMainAsset(loader, item, remoteAssetBaseURL, assetBaseURL);
     };
     _proto._loadMainAsset = function _loadMainAsset(loader, item, remoteAssetBaseURL, assetBaseURL) {
@@ -20981,16 +21020,24 @@ exports.Collider = __decorate([
             }
             return shape.collider.entity.layer & layerMask && shape.isSceneQuery;
         };
+        var outIDX;
+        var outDistance;
+        var outPosition;
+        var outNormal;
         if (hitResult != undefined) {
             var result = this._nativePhysicsScene.raycast(ray, distance, onRaycast, function(idx, distance, position, normal) {
-                var hitShape = Engine._physicalObjectsMap[idx];
-                hitResult.entity = hitShape._collider.entity;
-                hitResult.shape = hitShape;
-                hitResult.distance = distance;
-                hitResult.normal.copyFrom(normal);
-                hitResult.point.copyFrom(position);
+                outIDX = idx;
+                outDistance = distance;
+                outPosition = position;
+                outNormal = normal;
             });
             if (result) {
+                var hitShape = Engine._physicalObjectsMap[outIDX];
+                hitResult.entity = hitShape._collider.entity;
+                hitResult.shape = hitShape;
+                hitResult.distance = outDistance;
+                hitResult.point.copyFrom(outPosition);
+                hitResult.normal.copyFrom(outNormal);
                 return true;
             } else {
                 hitResult.entity = null;
@@ -23304,7 +23351,7 @@ PointerEventEmitter._tempRay = new engineMath.Ray();
                     }
                     pointer = pointerPool[j];
                     if (!pointer) {
-                        pointer = new Pointer(j);
+                        pointer = pointerPool[j] = new Pointer(j);
                         engine._physicsInitialized && pointer._addEmitters(PhysicsPointerEventEmitter, eventPool);
                         PointerManager._pointerEventEmitters.forEach(function(emitter) {
                             pointer._addEmitters(emitter, eventPool);
@@ -24339,7 +24386,7 @@ var PostProcessUberPass = /*#__PURE__*/ function(PostProcessPass) {
         var thresholdKnee = thresholdLinear * 0.5; // Hardcoded soft knee
         var bloomParams = bloomShaderData.getVector4(BloomEffect._bloomParams);
         var scatterLerp = engineMath.MathUtil.lerp(0.05, 0.95, scatter.value);
-        bloomParams.x = threshold.value;
+        bloomParams.x = thresholdLinear;
         bloomParams.y = thresholdKnee;
         bloomParams.z = scatterLerp;
         var bloomIntensityParams = uberShaderData.getVector4(BloomEffect._bloomIntensityParams);
@@ -24672,15 +24719,16 @@ var UIUtils = /*#__PURE__*/ function() {
                 engineMath.Matrix.multiply(virtualCamera.projectionMatrix, virtualCamera.viewMatrix, virtualCamera.viewProjectionMatrix);
                 renderContext.applyVirtualCamera(virtualCamera, false);
                 renderContext.rendererUpdateFlag |= ContextRendererUpdateFlag.ProjectionMatrix;
-                uiRenderQueue.clear();
                 uiCanvas._prepareRender(renderContext);
                 uiRenderQueue.pushRenderElement(uiCanvas._renderElement);
                 uiRenderQueue.batch(batcherManager);
                 batcherManager.uploadBuffer();
                 uiRenderQueue.render(renderContext, "Forward");
+                uiRenderQueue.clear();
                 engine._renderCount++;
             }
         }
+        renderContext.camera = null;
     };
     return UIUtils;
 }();
@@ -24961,21 +25009,15 @@ ShaderPool.init();
         var _this_xrManager;
         this._sceneManager._destroyAllScene();
         this._resourceManager._destroy();
-        this._textDefaultFont = null;
-        this._fontMap = null;
         this.inputManager._destroy();
         this._batcherManager.destroy();
         (_this_xrManager = this.xrManager) == null ? void 0 : _this_xrManager._destroy();
         this.dispatch("shutdown", this);
         // Cancel animation
         this.pause();
+        Shader._clear(this);
         this._hardwareRenderer.destroy();
         this.removeAllEventListeners();
-        this._animate = null;
-        this._sceneManager = null;
-        this._resourceManager = null;
-        this._canvas = null;
-        this._time = null;
         this._waitingDestroy = false;
         this._destroyed = true;
     };
@@ -25099,6 +25141,7 @@ ShaderPool.init();
         this._hardwareRenderer.resetState();
         this._lastRenderState = new RenderState();
         // Clear shader pools
+        Shader._clear(this);
         this._shaderProgramPools.length = 0;
         var resourceManager = this.resourceManager;
         // Restore graphic resources
@@ -25797,24 +25840,23 @@ Sky._projectionMatrix = new engineMath.Matrix(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, Sky.
     };
     _proto.drawMask = function drawMask(context, pipelineStageTagValue, maskLayer) {
         var incrementMaskQueue = MaskManager.getMaskIncrementRenderQueue();
-        incrementMaskQueue.clear();
         var decrementMaskQueue = MaskManager.getMaskDecrementRenderQueue();
-        decrementMaskQueue.clear();
         this._buildMaskRenderElement(maskLayer, incrementMaskQueue, decrementMaskQueue);
         var batcherManager = context.camera.engine._batcherManager;
         incrementMaskQueue.batch(batcherManager);
         batcherManager.uploadBuffer();
         incrementMaskQueue.render(context, pipelineStageTagValue, RenderQueueMaskType.Increment);
+        incrementMaskQueue.clear();
         decrementMaskQueue.batch(batcherManager);
         batcherManager.uploadBuffer();
         decrementMaskQueue.render(context, pipelineStageTagValue, RenderQueueMaskType.Decrement);
+        decrementMaskQueue.clear();
     };
     _proto.clearMask = function clearMask(context, pipelineStageTagValue) {
         var preMaskLayer = this._preMaskLayer;
         if (preMaskLayer !== SpriteMaskLayer.Nothing) {
             if (this.hasStencilWritten) {
                 var decrementMaskQueue = MaskManager.getMaskDecrementRenderQueue();
-                decrementMaskQueue.clear();
                 var masks = this._allSpriteMasks;
                 for(var i = 0, n = masks.length; i < n; i++){
                     var mask = masks.get(i);
@@ -25824,6 +25866,7 @@ Sky._projectionMatrix = new engineMath.Matrix(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, Sky.
                 decrementMaskQueue.batch(batcherManager);
                 batcherManager.uploadBuffer();
                 decrementMaskQueue.render(context, pipelineStageTagValue, RenderQueueMaskType.Decrement);
+                decrementMaskQueue.clear();
             } else {
                 var engine = context.camera.engine;
                 engine._hardwareRenderer.clearRenderTarget(engine, CameraClearFlags.Stencil, null);
@@ -28059,11 +28102,13 @@ AnimationCurveOwner.registerAssembler(SkinnedMeshRenderer, "blendShapeWeights",
    * @param time - The time to sample an animation
    */ _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--){
             var curve = curveBindings[i];
             var targetEntity = entity.findByPath(curve.relativePath);
             if (targetEntity) {
-                var component = curve.typeIndex > 0 ? targetEntity.getComponents(curve.type, AnimationCurveOwner._components)[curve.typeIndex] : targetEntity.getComponent(curve.type);
+                var component = curve.typeIndex > 0 ? targetEntity.getComponents(curve.type, components)[curve.typeIndex] : targetEntity.getComponent(curve.type);
+                components.length = 0;
                 if (!component) {
                     continue;
                 }
@@ -29696,13 +29741,15 @@ function _type_of(obj) {
         var curveLayerOwner = animatorStateData.curveLayerOwner;
         var _animatorState_clip = animatorState.clip, curves = _animatorState_clip._curveBindings;
         var layerCurveOwnerPool = animatorLayerData.curveOwnerPool;
+        var components = AnimationCurveOwner._components;
         for(var i = curves.length - 1; i >= 0; i--){
             var curve = curves[i];
             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 component = curve.typeIndex > 0 ? targetEntity.getComponents(curve.type, AnimationCurveOwner._components)[curve.typeIndex] : targetEntity.getComponent(curve.type);
+                var component = curve.typeIndex > 0 ? targetEntity.getComponents(curve.type, components)[curve.typeIndex] : targetEntity.getComponent(curve.type);
+                components.length = 0;
                 if (!component) {
                     continue;
                 }