@galacean/engine 1.4.12 → 1.4.14

package/dist/browser.js

@@ -10812,6 +10812,7 @@
             }
             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;
@@ -13312,6 +13313,28 @@
        */ 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:
@@ -13756,6 +13779,7 @@
             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;
     }();
@@ -15748,7 +15772,6 @@
        * @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;
         };
@@ -16102,7 +16125,7 @@
         ignoreClone
     ], SpriteRenderer.prototype, "_drawMode", void 0);
     __decorate$1([
-        assignmentClone
+        ignoreClone
     ], SpriteRenderer.prototype, "_assembler", void 0);
     __decorate$1([
         assignmentClone
@@ -22472,7 +22495,7 @@
             if (oldParent != null) {
                 Entity._removeFromChildren(oldParent._children, this);
                 this._parent = null;
-                this._dispatchModify(EntityModifyFlags.Child, oldParent);
+                oldParent._dispatchModify(EntityModifyFlags.Child, oldParent);
             }
         };
         /**
@@ -22526,6 +22549,7 @@
                 this._removeFromParent();
                 this._parent = parent;
                 if (parent) {
+                    this._isRoot = false;
                     parent._addToChildrenList(siblingIndex, this);
                     var oldScene = this._scene;
                     var parentScene = parent._scene;
@@ -22637,7 +22661,6 @@
                     }
                 }
             }
-            this._dispatchModify(EntityModifyFlags.Child, this);
         };
         /**
        * @deprecated
@@ -22822,7 +22845,13 @@
                     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);
+                    }
                 }
             }
         ]);
@@ -23299,6 +23328,11 @@
         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) {
@@ -24595,7 +24629,6 @@
         };
         _proto._loadSingleItem = function _loadSingleItem(itemOrURL) {
             var _this = this;
-            var _this__virtualPathResourceMap_assetBaseURL;
             var item = this._assignDefaultOptions(typeof itemOrURL === "string" ? {
                 url: itemOrURL
             } : itemOrURL);
@@ -24605,9 +24638,10 @@
             // 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) {
@@ -24641,15 +24675,20 @@
             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) {
@@ -25770,16 +25809,24 @@
                 }
                 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;
@@ -28069,7 +28116,7 @@
                         }
                         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);
@@ -29078,7 +29125,7 @@
             var thresholdKnee = thresholdLinear * 0.5; // Hardcoded soft knee
             var bloomParams = bloomShaderData.getVector4(BloomEffect._bloomParams);
             var scatterLerp = 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);
@@ -29382,15 +29429,16 @@
                     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;
     }();
@@ -29669,21 +29717,15 @@
             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;
         };
@@ -29807,6 +29849,7 @@
             this._hardwareRenderer.resetState();
             this._lastRenderState = new RenderState();
             // Clear shader pools
+            Shader._clear(this);
             this._shaderProgramPools.length = 0;
             var resourceManager = this.resourceManager;
             // Restore graphic resources
@@ -30500,24 +30543,23 @@
         };
         _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);
@@ -30527,6 +30569,7 @@
                     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);
@@ -32738,11 +32781,13 @@
        * @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;
                     }
@@ -34345,13 +34390,15 @@
             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;
                     }
@@ -47125,17 +47172,14 @@
                 GLTFMaterialParser._parseStandardProperty(context, material, materialInfo);
             }
             return Promise.resolve(material).then(function(material) {
-                material || (material = GLTFMaterialParser._getDefaultMaterial(engine));
+                // @ts-ignore
+                material || (material = engine._basicResources._getBlinnPhongMaterial());
                 GLTFParser.executeExtensionsAdditiveAndParse(materialInfo.extensions, context, material, materialInfo);
                 // @ts-ignore
                 material._associationSuperResource(glTFResource);
                 return material;
             });
         };
-        /** @internal */ GLTFMaterialParser._getDefaultMaterial = function _getDefaultMaterial(engine) {
-            var _GLTFMaterialParser;
-            return (_GLTFMaterialParser = GLTFMaterialParser)._defaultMaterial || (_GLTFMaterialParser._defaultMaterial = new BlinnPhongMaterial(engine));
-        };
         /**
        * @internal
        */ GLTFMaterialParser._checkOtherTextureTransform = function _checkOtherTextureTransform(texture, textureName) {
@@ -47547,7 +47591,7 @@
                 Promise.all(materialPromises)
             ]).then(function(param) {
                 var _loop = function _loop(i) {
-                    var material = materials[i] || exports.GLTFMaterialParser._getDefaultMaterial(context.glTFResource.engine);
+                    var material = materials[i] || basicResources._getBlinnPhongMaterial();
                     var glTFPrimitive = glTFMeshPrimitives[i];
                     var mesh = meshes[i];
                     var renderer = void 0;
@@ -47576,6 +47620,8 @@
                     GLTFParser.executeExtensionsAdditiveAndParse(glTFPrimitive.extensions, context, renderer, glTFPrimitive);
                 };
                 var meshes = param[0], skin = param[1], materials = param[2];
+                // @ts-ignore
+                var basicResources = context.glTFResource.engine._basicResources;
                 for(var i = 0; i < rendererCount; i++)_loop(i);
             });
         };
@@ -50053,7 +50099,7 @@
     ], EXT_texture_webp);
 
     //@ts-ignore
-    var version = "1.4.12";
+    var version = "1.4.14";
     console.log("Galacean Engine Version: " + version);
     for(var key in CoreObjects){
         Loader.registerClass(key, CoreObjects[key]);