@galacean/engine-core 1.3.25 → 1.3.27

package/dist/miniprogram.js

@@ -4074,6 +4074,28 @@ __decorate([
    */ 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 exports.RenderStateDataKey.BlendStateEnabled0:
@@ -8317,6 +8339,7 @@ var /**
         program.uploadUnGroupTextures();
         (pass._renderState || blitMaterial.renderState)._applyStates(engine, false, pass._renderStateDataMap, blitMaterial.shaderData);
         rhi.drawPrimitive(blitMesh._primitive, blitMesh.subMesh, program);
+        rendererShaderData.setTexture(PipelineUtils._blitTextureProperty, null);
     };
     return PipelineUtils;
 }();
@@ -8664,6 +8687,7 @@ exports.Camera = (_Camera = /*#__PURE__*/ function(Component1) {
         }
         this._renderPipeline.render(context, cubeFace, mipLevel, ignoreClearFlags);
         engine._renderCount++;
+        context.camera = null;
     };
     _proto.setReplacementShader = function setReplacementShader(shader, replacementTag, failureStrategy) {
         if (failureStrategy === void 0) failureStrategy = exports.ReplacementFailureStrategy.KeepOriginalShader;
@@ -9413,17 +9437,20 @@ var ContextRendererUpdateFlag;
     _proto._drawMask = function _drawMask(context, pipelineStageTagValue, master) {
         var incrementMaskQueue = MaskManager.getMaskIncrementRenderQueue();
         incrementMaskQueue.renderQueueType = this.renderQueueType;
-        incrementMaskQueue.clear();
         var decrementMaskQueue = MaskManager.getMaskDecrementRenderQueue();
         decrementMaskQueue.renderQueueType = this.renderQueueType;
-        decrementMaskQueue.clear();
         var camera = context.camera;
         var engine = camera.engine;
         camera.scene._maskManager.buildMaskRenderElement(master, incrementMaskQueue, decrementMaskQueue);
+        var primitiveChunkManagerMask = engine._batcherManager.primitiveChunkManagerMask;
         incrementMaskQueue._batch(engine._batcherManager);
+        primitiveChunkManagerMask.uploadBuffer();
         incrementMaskQueue.render(context, pipelineStageTagValue, 1);
+        incrementMaskQueue.clear();
         decrementMaskQueue._batch(engine._batcherManager);
+        primitiveChunkManagerMask.uploadBuffer();
         decrementMaskQueue.render(context, pipelineStageTagValue, 2);
+        decrementMaskQueue.clear();
     };
     RenderQueue.compareForOpaque = function compareForOpaque(a, b) {
         return a.priority - b.priority || a.distanceForSort - b.distanceForSort;
@@ -18764,6 +18791,7 @@ __decorate([
  * @internal
  */ var BasicResources = /*#__PURE__*/ function() {
     function BasicResources(engine) {
+        this.engine = engine;
         // prettier-ignore
         var vertices = new Float32Array([
             -1,
@@ -18823,6 +18851,11 @@ __decorate([
         }
     }
     var _proto = BasicResources.prototype;
+    /**
+   * @internal
+   */ _proto._getBlinnPhongMaterial = function _getBlinnPhongMaterial() {
+        return this._blinnPhongMaterial || (this._blinnPhongMaterial = new BlinnPhongMaterial(this.engine));
+    };
     _proto._createBlitMesh = function _createBlitMesh(engine, vertices) {
         var mesh = new ModelMesh(engine);
         mesh._addReferCount(1);
@@ -19578,12 +19611,24 @@ var AssetPromise = /*#__PURE__*/ function() {
         this._onCancelHandler && this._onCancelHandler();
         return this;
     };
-    /**
-   * Return a new resource Promise through the provided asset promise collection.
-   * The resolved of the new AssetPromise will be triggered when all the Promises in the provided set are completed.
-   * @param - Promise Collection
-   * @returns AssetPromise
-   */ AssetPromise.all = function all(promises) {
+    AssetPromise.resolve = function resolve(value) {
+        if (value === undefined) {
+            return new AssetPromise(function(resolve) {
+                return resolve();
+            });
+        } else if (_instanceof(value, AssetPromise) || _instanceof(value, Promise)) {
+            return new AssetPromise(function(resolve, reject) {
+                value.then(function(resolved) {
+                    return resolve(resolved);
+                }, reject);
+            });
+        } else {
+            return new AssetPromise(function(resolve) {
+                return resolve(value);
+            });
+        }
+    };
+    AssetPromise.all = function all(values) {
         return new AssetPromise(function(resolve, reject, setTaskCompleteProgress) {
             var onComplete = function onComplete(index, resultValue) {
                 completed++;
@@ -19594,7 +19639,7 @@ var AssetPromise = /*#__PURE__*/ function() {
                 }
             };
             var onProgress = function onProgress(promise, index) {
-                if (_instanceof(promise, Promise) || _instanceof(promise, AssetPromise)) {
+                if (_instanceof(promise, AssetPromise) || _instanceof(promise, Promise)) {
                     promise.then(function(value) {
                         onComplete(index, value);
                     }, reject);
@@ -19604,14 +19649,14 @@ var AssetPromise = /*#__PURE__*/ function() {
                     });
                 }
             };
-            var count = promises.length;
+            var count = Array.from(values).length;
             var results = new Array(count);
             var completed = 0;
             if (count === 0) {
                 return resolve(results);
             }
             for(var i = 0; i < count; i++){
-                onProgress(promises[i], i);
+                onProgress(values[i], i);
             }
         });
     };
@@ -20193,12 +20238,12 @@ var MultiExecutor = /*#__PURE__*/ function() {
         var obj = this._objectPool[refId];
         var promise;
         if (obj) {
-            promise = Promise.resolve(obj);
+            promise = AssetPromise.resolve(obj);
         } else {
             var resourceConfig = this._editorResourceConfig[refId];
             if (!resourceConfig) {
-                Logger.warn("refId:" + refId + " is not find in this._editorResourceConfig.");
-                return Promise.resolve(null);
+                Logger.warn("refId:" + refId + " is not find in this._idResourceMap.");
+                return AssetPromise.resolve(null);
             }
             var url = resourceConfig.virtualPath;
             if (key) {
@@ -21154,16 +21199,24 @@ var Collision = function Collision() {
             }
             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 = _this._scene.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 = this._scene.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;
@@ -23887,21 +23940,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;
     };
@@ -24069,6 +24116,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
@@ -27188,11 +27236,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;
                 }
@@ -28807,13 +28857,15 @@ exports.AnimatorLayerBlendingMode = void 0;
         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;
                 }

package/dist/module.js

@@ -4069,6 +4069,28 @@ __decorate([
    */ 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:
@@ -8312,6 +8334,7 @@ var /**
         program.uploadUnGroupTextures();
         (pass._renderState || blitMaterial.renderState)._applyStates(engine, false, pass._renderStateDataMap, blitMaterial.shaderData);
         rhi.drawPrimitive(blitMesh._primitive, blitMesh.subMesh, program);
+        rendererShaderData.setTexture(PipelineUtils._blitTextureProperty, null);
     };
     return PipelineUtils;
 }();
@@ -8659,6 +8682,7 @@ var Camera = (_Camera = /*#__PURE__*/ function(Component1) {
         }
         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;
@@ -9408,17 +9432,20 @@ var ContextRendererUpdateFlag;
     _proto._drawMask = function _drawMask(context, pipelineStageTagValue, master) {
         var incrementMaskQueue = MaskManager.getMaskIncrementRenderQueue();
         incrementMaskQueue.renderQueueType = this.renderQueueType;
-        incrementMaskQueue.clear();
         var decrementMaskQueue = MaskManager.getMaskDecrementRenderQueue();
         decrementMaskQueue.renderQueueType = this.renderQueueType;
-        decrementMaskQueue.clear();
         var camera = context.camera;
         var engine = camera.engine;
         camera.scene._maskManager.buildMaskRenderElement(master, incrementMaskQueue, decrementMaskQueue);
+        var primitiveChunkManagerMask = engine._batcherManager.primitiveChunkManagerMask;
         incrementMaskQueue._batch(engine._batcherManager);
+        primitiveChunkManagerMask.uploadBuffer();
         incrementMaskQueue.render(context, pipelineStageTagValue, 1);
+        incrementMaskQueue.clear();
         decrementMaskQueue._batch(engine._batcherManager);
+        primitiveChunkManagerMask.uploadBuffer();
         decrementMaskQueue.render(context, pipelineStageTagValue, 2);
+        decrementMaskQueue.clear();
     };
     RenderQueue.compareForOpaque = function compareForOpaque(a, b) {
         return a.priority - b.priority || a.distanceForSort - b.distanceForSort;
@@ -18759,6 +18786,7 @@ __decorate([
  * @internal
  */ var BasicResources = /*#__PURE__*/ function() {
     function BasicResources(engine) {
+        this.engine = engine;
         // prettier-ignore
         var vertices = new Float32Array([
             -1,
@@ -18818,6 +18846,11 @@ __decorate([
         }
     }
     var _proto = BasicResources.prototype;
+    /**
+   * @internal
+   */ _proto._getBlinnPhongMaterial = function _getBlinnPhongMaterial() {
+        return this._blinnPhongMaterial || (this._blinnPhongMaterial = new BlinnPhongMaterial(this.engine));
+    };
     _proto._createBlitMesh = function _createBlitMesh(engine, vertices) {
         var mesh = new ModelMesh(engine);
         mesh._addReferCount(1);
@@ -19573,12 +19606,24 @@ var AssetPromise = /*#__PURE__*/ function() {
         this._onCancelHandler && this._onCancelHandler();
         return this;
     };
-    /**
-   * Return a new resource Promise through the provided asset promise collection.
-   * The resolved of the new AssetPromise will be triggered when all the Promises in the provided set are completed.
-   * @param - Promise Collection
-   * @returns AssetPromise
-   */ AssetPromise.all = function all(promises) {
+    AssetPromise.resolve = function resolve(value) {
+        if (value === undefined) {
+            return new AssetPromise(function(resolve) {
+                return resolve();
+            });
+        } else if (_instanceof(value, AssetPromise) || _instanceof(value, Promise)) {
+            return new AssetPromise(function(resolve, reject) {
+                value.then(function(resolved) {
+                    return resolve(resolved);
+                }, reject);
+            });
+        } else {
+            return new AssetPromise(function(resolve) {
+                return resolve(value);
+            });
+        }
+    };
+    AssetPromise.all = function all(values) {
         return new AssetPromise(function(resolve, reject, setTaskCompleteProgress) {
             var onComplete = function onComplete(index, resultValue) {
                 completed++;
@@ -19589,7 +19634,7 @@ var AssetPromise = /*#__PURE__*/ function() {
                 }
             };
             var onProgress = function onProgress(promise, index) {
-                if (_instanceof(promise, Promise) || _instanceof(promise, AssetPromise)) {
+                if (_instanceof(promise, AssetPromise) || _instanceof(promise, Promise)) {
                     promise.then(function(value) {
                         onComplete(index, value);
                     }, reject);
@@ -19599,14 +19644,14 @@ var AssetPromise = /*#__PURE__*/ function() {
                     });
                 }
             };
-            var count = promises.length;
+            var count = Array.from(values).length;
             var results = new Array(count);
             var completed = 0;
             if (count === 0) {
                 return resolve(results);
             }
             for(var i = 0; i < count; i++){
-                onProgress(promises[i], i);
+                onProgress(values[i], i);
             }
         });
     };
@@ -20188,12 +20233,12 @@ var MultiExecutor = /*#__PURE__*/ function() {
         var obj = this._objectPool[refId];
         var promise;
         if (obj) {
-            promise = Promise.resolve(obj);
+            promise = AssetPromise.resolve(obj);
         } else {
             var resourceConfig = this._editorResourceConfig[refId];
             if (!resourceConfig) {
-                Logger.warn("refId:" + refId + " is not find in this._editorResourceConfig.");
-                return Promise.resolve(null);
+                Logger.warn("refId:" + refId + " is not find in this._idResourceMap.");
+                return AssetPromise.resolve(null);
             }
             var url = resourceConfig.virtualPath;
             if (key) {
@@ -21149,16 +21194,24 @@ var Collision = function Collision() {
             }
             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 = _this._scene.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 = this._scene.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;
@@ -23882,21 +23935,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;
     };
@@ -24064,6 +24111,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
@@ -27183,11 +27231,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;
                 }
@@ -28802,13 +28852,15 @@ var AnimatorLayerBlendingMode;
         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;
                 }