@galacean/engine-core 1.4.8 → 1.4.10

package/dist/module.js

@@ -8842,6 +8842,7 @@ BatchUtils._disableBatchTag = ShaderTagKey.getByName("spriteDisableBatching");
         var blitMaterial = material || basicResources.blitMaterial;
         var rhi = engine._hardwareRenderer;
         var context = engine._renderContext;
+        var camera = context.camera;
         // We not use projection matrix when blit, but we must modify flipProjection to make front face correct
         context.flipProjection = !!destination;
         rhi.activeRenderTarget(destination, viewport, context.flipProjection, 0);
@@ -8853,10 +8854,12 @@ BatchUtils._disableBatchTag = ShaderTagKey.getByName("spriteDisableBatching");
         rendererShaderData.setVector4(Blitter._sourceScaleOffsetProperty, sourceScaleOffset != null ? sourceScaleOffset : Blitter._defaultScaleOffset);
         var pass = blitMaterial.shader.subShaders[0].passes[passIndex];
         var compileMacros = Shader._compileMacros;
-        ShaderMacroCollection.unionCollection(context.camera._globalShaderMacro, blitMaterial.shaderData._macroCollection, compileMacros);
+        ShaderMacroCollection.unionCollection(camera._globalShaderMacro, blitMaterial.shaderData._macroCollection, compileMacros);
         var program = pass._getShaderProgram(engine, compileMacros);
         program.bind();
         program.groupingOtherUniformBlock();
+        program.uploadAll(program.sceneUniformBlock, camera.scene.shaderData);
+        program.uploadAll(program.cameraUniformBlock, camera.shaderData);
         program.uploadAll(program.rendererUniformBlock, rendererShaderData);
         program.uploadAll(program.materialUniformBlock, blitMaterial.shaderData);
         program.uploadUnGroupTextures();
@@ -10348,7 +10351,7 @@ var Renderer = /*#__PURE__*/ function(Component) {
     };
     _proto._createInstanceMaterial = function _createInstanceMaterial(material, index) {
         var insMaterial = material.clone();
-        insMaterial.name = insMaterial.name + "(Instance)";
+        insMaterial.name = material.name + "(Instance)";
         this._addResourceReferCount(material, -1);
         this._addResourceReferCount(insMaterial, 1);
         this._materialsInstanced[index] = true;
@@ -12327,6 +12330,7 @@ var BufferUtil = /*#__PURE__*/ function() {
         _this = ReferResource.call(this, engine) || this, /** @internal */ _this._renderStates = [] // todo: later will as a part of shaderData when shader effect frame is OK, that is more powerful and flexible.
         , _this._shaderData = new ShaderData(ShaderDataGroup.Material);
         _this.shader = shader;
+        _this.name = shader.name;
         return _this;
     }
     var _proto = Material.prototype;
@@ -12334,7 +12338,7 @@ var BufferUtil = /*#__PURE__*/ function() {
    * Clone and return the instance.
    */ _proto.clone = function clone() {
         var dest = new Material(this._engine, this.shader);
-        this.cloneTo(dest);
+        this._cloneToAndModifyName(dest);
         return dest;
     };
     /**
@@ -12351,6 +12355,10 @@ var BufferUtil = /*#__PURE__*/ function() {
         this.shaderData._addReferCount(value);
         this._shader._addReferCount(value);
     };
+    _proto._cloneToAndModifyName = function _cloneToAndModifyName(target) {
+        this.cloneTo(target);
+        target.name = this.name + "(Clone)";
+    };
     /**
    * @override
    */ _proto._onDestroy = function _onDestroy() {
@@ -12506,7 +12514,7 @@ var BaseMaterial = /*#__PURE__*/ function(Material) {
    * Clone and return the instance.
    */ _proto.clone = function clone() {
         var dest = new BaseMaterial(this._engine, this.shader);
-        this.cloneTo(dest);
+        this._cloneToAndModifyName(dest);
         return dest;
     };
     /**
@@ -12688,7 +12696,7 @@ BaseMaterial._alphaCutoffMacro = ShaderMacro.getByName("MATERIAL_IS_ALPHA_CUTOFF
     var _proto = BlinnPhongMaterial.prototype;
     _proto.clone = function clone() {
         var dest = new BlinnPhongMaterial(this._engine);
-        this.cloneTo(dest);
+        this._cloneToAndModifyName(dest);
         return dest;
     };
     _create_class(BlinnPhongMaterial, [
@@ -13148,7 +13156,7 @@ PBRBaseMaterial._clearCoatNormalTextureProp = ShaderProperty.getByName("material
    * @inheritdoc
    */ _proto.clone = function clone() {
         var dest = new PBRMaterial(this._engine);
-        this.cloneTo(dest);
+        this._cloneToAndModifyName(dest);
         return dest;
     };
     _proto._onIridescenceRangeChanged = function _onIridescenceRangeChanged() {
@@ -13614,7 +13622,7 @@ PBRMaterial._thicknessTextureProp = ShaderProperty.getByName("material_Thickness
    * @inheritdoc
    */ _proto.clone = function clone() {
         var dest = new PBRSpecularMaterial(this._engine);
-        this.cloneTo(dest);
+        this._cloneToAndModifyName(dest);
         return dest;
     };
     _create_class(PBRSpecularMaterial, [
@@ -13687,7 +13695,7 @@ PBRSpecularMaterial._specularGlossinessTextureMacro = ShaderMacro.getByName("MAT
    * @inheritdoc
    */ _proto.clone = function clone() {
         var dest = new UnlitMaterial(this._engine);
-        this.cloneTo(dest);
+        this._cloneToAndModifyName(dest);
         return dest;
     };
     _create_class(UnlitMaterial, [
@@ -17347,7 +17355,7 @@ var ComponentCloner = /*#__PURE__*/ function() {
         var _this;
         _this = EngineObject.call(this, engine) || this, /** The layer the entity belongs to. */ _this.layer = Layer.Layer0, /** @internal */ _this._isActiveInHierarchy = false, /** @internal */ _this._isActiveInScene = false, /** @internal */ _this._components = [], /** @internal */ _this._scripts = new DisorderedArray(), /** @internal */ _this._children = [], /** @internal */ _this._isRoot = false, /** @internal */ _this._isActive = true, /** @internal */ _this._siblingIndex = -1, /** @internal */ _this._isTemplate = false, /** @internal */ _this._updateFlagManager = new UpdateFlagManager(), _this._parent = null, //--------------------------------------------------------------deprecated----------------------------------------------------------------
         _this._invModelMatrix = new Matrix();
-        _this.name = name;
+        _this.name = name != null ? name : "Entity";
         for(var i = 0, n = components.length; i < n; i++){
             _this.addComponent(components[i]);
         }
@@ -17428,11 +17436,11 @@ var ComponentCloner = /*#__PURE__*/ function() {
             child = indexOrChild;
         }
         if (child._isRoot) {
-            child._scene._removeFromEntityList(child);
+            var oldScene = child._scene;
+            Entity._removeFromChildren(oldScene._rootEntities, child);
             child._isRoot = false;
             this._addToChildrenList(index, child);
             child._parent = this;
-            var oldScene = child._scene;
             var newScene = this._scene;
             var inActiveChangeFlag = ActiveChangeFlag.None;
             if (!this._isActiveInHierarchy) {
@@ -17637,14 +17645,8 @@ var ComponentCloner = /*#__PURE__*/ function() {
    */ _proto._removeFromParent = function _removeFromParent() {
         var oldParent = this._parent;
         if (oldParent != null) {
-            var oldSibling = oldParent._children;
-            var index = this._siblingIndex;
-            oldSibling.splice(index, 1);
-            for(var n = oldSibling.length; index < n; index++){
-                oldSibling[index]._siblingIndex--;
-            }
+            Entity._removeFromChildren(oldParent._children, this);
             this._parent = null;
-            this._siblingIndex = -1;
             this._dispatchModify(EntityModifyFlags.Child, oldParent);
         }
     };
@@ -17690,21 +17692,7 @@ var ComponentCloner = /*#__PURE__*/ function() {
         (_this__modifyFlagManager = this._modifyFlagManager) == null ? void 0 : _this__modifyFlagManager.dispatch(flag, param);
     };
     _proto._addToChildrenList = function _addToChildrenList(index, child) {
-        var children = this._children;
-        var childCount = children.length;
-        if (index === undefined) {
-            child._siblingIndex = childCount;
-            children.push(child);
-        } else {
-            if (index < 0 || index > childCount) {
-                throw "The index " + index + " is out of child list bounds " + childCount;
-            }
-            child._siblingIndex = index;
-            children.splice(index, 0, child);
-            for(var i = index + 1, n = childCount + 1; i < n; i++){
-                children[i]._siblingIndex++;
-            }
-        }
+        Entity._addToChildren(this._children, child, index);
         this._dispatchModify(EntityModifyFlags.Child, this);
     };
     _proto._setParent = function _setParent(parent, siblingIndex) {
@@ -17883,6 +17871,39 @@ var ComponentCloner = /*#__PURE__*/ function() {
         }
         return entity;
     };
+    /**
+   * @internal
+   */ Entity._removeFromChildren = function _removeFromChildren(children, entity) {
+        var count = children.length - 1;
+        for(var i = entity._siblingIndex; i < count; i++){
+            var child = children[i + 1];
+            children[i] = child;
+            child._siblingIndex = i;
+        }
+        children.length = count;
+        entity._siblingIndex = -1;
+    };
+    /**
+   * @internal
+   */ Entity._addToChildren = function _addToChildren(children, entity, index) {
+        var childCount = children.length;
+        children.length = childCount + 1;
+        if (index === undefined) {
+            children[childCount] = entity;
+            entity._siblingIndex = childCount;
+        } else {
+            if (index < 0 || index > childCount) {
+                throw "The index " + index + " is out of child list bounds " + childCount;
+            }
+            for(var i = childCount; i > index; i--){
+                var swapChild = children[i - 1];
+                swapChild._siblingIndex = i;
+                children[i] = swapChild;
+            }
+            entity._siblingIndex = index;
+            children[index] = entity;
+        }
+    };
     _create_class(Entity, [
         {
             key: "transform",
@@ -24438,7 +24459,7 @@ var blinnPhongVs = "#define GLSLIFY 1\n#include <common>\n#include <common_vert>
 
 var depthOnlyFs = "#define GLSLIFY 1\nvoid main() {\n}"; // eslint-disable-line
 
-var depthOnlyVs = "#define GLSLIFY 1\n#include <common>\n#include <common_vert>\n#include <blendShape_input>\nuniform mat4 camera_VPMat;\n\nvoid main() {\n\n    #include <begin_position_vert>\n    #include <blendShape_vert>\n    #include <skinning_vert>\n    #include <position_vert>\n\n}\n"; // eslint-disable-line
+var depthOnlyVs = "#define GLSLIFY 1\n#define MATERIAL_OMIT_NORMAL\n#include <common>\n#include <common_vert>\n#include <blendShape_input>\nuniform mat4 camera_VPMat;\n\nvoid main() {\n\n    #include <begin_position_vert>\n    #include <blendShape_vert>\n    #include <skinning_vert>\n    #include <position_vert>\n\n}\n"; // eslint-disable-line
 
 var particleFs = "#define GLSLIFY 1\n#include <common>\n\nvarying vec4 v_Color;\nvarying vec2 v_TextureCoordinate;\nuniform sampler2D material_BaseTexture;\nuniform vec4 material_BaseColor;\n\n#ifdef RENDERER_MODE_MESH\n\tvarying vec4 v_MeshColor;\n#endif\n\nvoid main() {\n\tvec4 color = material_BaseColor * v_Color;\n\n\t#ifdef RENDERER_MODE_MESH\n\t\tcolor *= v_MeshColor;\n\t#endif\n\n\t#ifdef MATERIAL_HAS_BASETEXTURE\n\t\tvec4 textureColor = texture2D(material_BaseTexture,v_TextureCoordinate);\n\t\t#ifndef ENGINE_IS_COLORSPACE_GAMMA\n            textureColor = gammaToLinear(textureColor);\n        #endif\n\t\tcolor *= textureColor;\n\t#endif\n\tgl_FragColor = color; \n\n\t #ifndef ENGINE_IS_COLORSPACE_GAMMA\n        gl_FragColor = linearToGamma(gl_FragColor);\n    #endif\n}"; // eslint-disable-line
 
@@ -26972,11 +26993,11 @@ PostProcessManager._tempVector3 = new Vector3();
         var oldScene = entity._scene;
         if (oldScene !== this) {
             if (oldScene && isRoot) {
-                oldScene._removeFromEntityList(entity);
+                Entity._removeFromChildren(oldScene._rootEntities, entity);
             }
-            this._addToRootEntityList(index, entity);
+            Entity._addToChildren(this._rootEntities, entity, index);
         } else if (!isRoot) {
-            this._addToRootEntityList(index, entity);
+            Entity._addToChildren(this._rootEntities, entity, index);
         }
         // Process entity active/inActive
         var inActiveChangeFlag = ActiveChangeFlag.None;
@@ -27003,7 +27024,7 @@ PostProcessManager._tempVector3 = new Vector3();
    * @param entity - The root entity to remove
    */ _proto.removeRootEntity = function removeRootEntity(entity) {
         if (entity._isRoot && entity._scene == this) {
-            this._removeFromEntityList(entity);
+            Entity._removeFromChildren(this._rootEntities, entity);
             entity._isRoot = false;
             var inActiveChangeFlag = ActiveChangeFlag.None;
             this._isActiveInEngine && entity._isActiveInHierarchy && (inActiveChangeFlag |= ActiveChangeFlag.Hierarchy);
@@ -27102,17 +27123,6 @@ PostProcessManager._tempVector3 = new Vector3();
     };
     /**
    * @internal
-   */ _proto._removeFromEntityList = function _removeFromEntityList(entity) {
-        var rootEntities = this._rootEntities;
-        var index = entity._siblingIndex;
-        rootEntities.splice(index, 1);
-        for(var n = rootEntities.length; index < n; index++){
-            rootEntities[index]._siblingIndex--;
-        }
-        entity._siblingIndex = -1;
-    };
-    /**
-   * @internal
    */ _proto._onDestroy = function _onDestroy() {
         EngineObject.prototype._onDestroy.call(this);
         // Remove from sceneManager
@@ -27129,23 +27139,6 @@ PostProcessManager._tempVector3 = new Vector3();
         var allCreatedScenes = sceneManager._allCreatedScenes;
         allCreatedScenes.splice(allCreatedScenes.indexOf(this), 1);
     };
-    _proto._addToRootEntityList = function _addToRootEntityList(index, rootEntity) {
-        var rootEntities = this._rootEntities;
-        var rootEntityCount = rootEntities.length;
-        if (index === undefined) {
-            rootEntity._siblingIndex = rootEntityCount;
-            rootEntities.push(rootEntity);
-        } else {
-            if (index < 0 || index > rootEntityCount) {
-                throw "The index " + index + " is out of child list bounds " + rootEntityCount;
-            }
-            rootEntity._siblingIndex = index;
-            rootEntities.splice(index, 0, rootEntity);
-            for(var i = index + 1, n = rootEntityCount + 1; i < n; i++){
-                rootEntities[i]._siblingIndex++;
-            }
-        }
-    };
     _proto._computeLinearFogParams = function _computeLinearFogParams(fogStart, fogEnd) {
         var fogRange = fogEnd - fogStart;
         var fogParams = this._fogParams;
@@ -31204,7 +31197,7 @@ function _assert_this_initialized(self) {
     var _proto = SkyBoxMaterial.prototype;
     _proto.clone = function clone() {
         var dest = new SkyBoxMaterial(this._engine);
-        this.cloneTo(dest);
+        this._cloneToAndModifyName(dest);
         return dest;
     };
     _create_class(SkyBoxMaterial, [
@@ -31310,7 +31303,7 @@ SkyBoxMaterial._decodeSkyRGBMMacro = ShaderMacro.getByName("MATERIAL_IS_DECODE_S
    * @inheritDoc
    */ _proto.clone = function clone() {
         var dest = new SkyProceduralMaterial(this._engine);
-        this.cloneTo(dest);
+        this._cloneToAndModifyName(dest);
         return dest;
     };
     _create_class(SkyProceduralMaterial, [
@@ -32211,6 +32204,13 @@ __decorate([
                 return this.constant;
             case ParticleCurveMode.TwoConstants:
                 return this.constantMin + (this.constantMax - this.constantMin) * lerpFactor;
+            case ParticleCurveMode.Curve:
+                var _this_curve;
+                return (_this_curve = this.curve) == null ? void 0 : _this_curve._evaluate(time);
+            case ParticleCurveMode.TwoCurves:
+                var _this_curveMin, _this_curveMax;
+                var min = (_this_curveMin = this.curveMin) == null ? void 0 : _this_curveMin._evaluate(time);
+                return min + (((_this_curveMax = this.curveMax) == null ? void 0 : _this_curveMax._evaluate(time)) - min) * lerpFactor;
         }
     };
     /**
@@ -33049,9 +33049,10 @@ __decorate([
    * Remove a key from the curve.
    * @param index - The remove key index
    */ _proto.removeKey = function removeKey(index) {
-        this._keys.splice(index, 1);
+        var keys = this._keys;
+        var removeKey = keys[index];
+        keys.splice(index, 1);
         this._typeArrayDirty = true;
-        var removeKey = this._keys[index];
         removeKey._unRegisterOnValueChanged(this._updateDispatch);
         this._updateDispatch();
     };
@@ -33067,6 +33068,29 @@ __decorate([
     };
     /**
    * @internal
+   */ _proto._evaluate = function _evaluate(normalizedAge) {
+        var keys = this.keys;
+        var length = keys.length;
+        for(var i = 0; i < length; i++){
+            var key = keys[i];
+            var time = key.time;
+            if (normalizedAge <= time) {
+                if (i === 0) {
+                    // Small than first key
+                    return key.value;
+                } else {
+                    // Between two keys
+                    var _keys_ = keys[i - 1], lastTime = _keys_.time, lastValue = _keys_.value;
+                    var age = (normalizedAge - lastTime) / (time - lastTime);
+                    return lastValue + (key.value - lastValue) * age;
+                }
+            }
+        }
+        // Large than last key
+        return keys[length - 1].value;
+    };
+    /**
+   * @internal
    */ _proto._getTypeArray = function _getTypeArray() {
         var typeArray = this._typeArray || (this._typeArray = new Float32Array(4 * 2));
         if (this._typeArrayDirty) {
@@ -33678,7 +33702,7 @@ __decorate([
     };
     /**
    * @internal
-   */ _proto._emit = function _emit(time, count) {
+   */ _proto._emit = function _emit(playTime, count) {
         if (this.emission.enabled) {
             // Wait the existing particles to be retired
             var notRetireParticleCount = this._getNotRetiredParticleCount();
@@ -33691,7 +33715,7 @@ __decorate([
             var shape = this.emission.shape;
             for(var i = 0; i < count; i++){
                 if (shape == null ? void 0 : shape.enabled) {
-                    shape._generatePositionAndDirection(this.emission._shapeRand, time, position, direction);
+                    shape._generatePositionAndDirection(this.emission._shapeRand, playTime, position, direction);
                     var positionScale = this.main._getPositionScale();
                     position.multiply(positionScale);
                     direction.normalize().multiply(positionScale);
@@ -33699,7 +33723,7 @@ __decorate([
                     position.set(0, 0, 0);
                     direction.set(0, 0, -1);
                 }
-                this._addNewParticle(position, direction, transform, time);
+                this._addNewParticle(position, direction, transform, playTime);
             }
         }
     };
@@ -34014,7 +34038,7 @@ __decorate([
             this._transformedBoundsArray[previousFreeElement * ParticleBufferUtils.boundsFloatStride + boundsTimeOffset] = this._playTime;
         }
     };
-    _proto._addNewParticle = function _addNewParticle(position, direction, transform, time) {
+    _proto._addNewParticle = function _addNewParticle(position, direction, transform, playTime) {
         var firstFreeElement = this._firstFreeElement;
         var nextFreeElement = firstFreeElement + 1;
         if (nextFreeElement >= this._currentParticleCount) {
@@ -34044,35 +34068,30 @@ __decorate([
         var instanceVertices = this._instanceVertices;
         var offset = firstFreeElement * ParticleBufferUtils.instanceVertexFloatStride;
         // Position
-        instanceVertices[offset] = position.x;
-        instanceVertices[offset + 1] = position.y;
-        instanceVertices[offset + 2] = position.z;
+        position.copyToArray(instanceVertices, offset);
         // Start life time
         instanceVertices[offset + ParticleBufferUtils.startLifeTimeOffset] = main.startLifetime.evaluate(undefined, main._startLifeTimeRand.random());
         // Direction
-        instanceVertices[offset + 4] = direction.x;
-        instanceVertices[offset + 5] = direction.y;
-        instanceVertices[offset + 6] = direction.z;
+        direction.copyToArray(instanceVertices, offset + 4);
         // Time
-        instanceVertices[offset + ParticleBufferUtils.timeOffset] = time;
+        instanceVertices[offset + ParticleBufferUtils.timeOffset] = playTime;
         // Color
         var startColor = ParticleGenerator._tempColor0;
         main.startColor.evaluate(undefined, main._startColorRand.random(), startColor);
         if (this._renderer.engine.settings.colorSpace === ColorSpace.Linear) {
             startColor.toLinear(startColor);
         }
-        instanceVertices[offset + 8] = startColor.r;
-        instanceVertices[offset + 9] = startColor.g;
-        instanceVertices[offset + 10] = startColor.b;
-        instanceVertices[offset + 11] = startColor.a;
+        startColor.copyToArray(instanceVertices, offset + 8);
+        var duration = this.main.duration;
+        var normalizedEmitAge = playTime % duration / duration;
         // Start size
         var startSizeRand = main._startSizeRand;
         if (main.startSize3D) {
-            instanceVertices[offset + 12] = main.startSizeX.evaluate(undefined, startSizeRand.random());
-            instanceVertices[offset + 13] = main.startSizeY.evaluate(undefined, startSizeRand.random());
-            instanceVertices[offset + 14] = main.startSizeZ.evaluate(undefined, startSizeRand.random());
+            instanceVertices[offset + 12] = main.startSizeX.evaluate(normalizedEmitAge, startSizeRand.random());
+            instanceVertices[offset + 13] = main.startSizeY.evaluate(normalizedEmitAge, startSizeRand.random());
+            instanceVertices[offset + 14] = main.startSizeZ.evaluate(normalizedEmitAge, startSizeRand.random());
         } else {
-            var size = main.startSize.evaluate(undefined, startSizeRand.random());
+            var size = main.startSize.evaluate(normalizedEmitAge, startSizeRand.random());
             instanceVertices[offset + 12] = size;
             instanceVertices[offset + 13] = size;
             instanceVertices[offset + 14] = size;
@@ -34125,14 +34144,9 @@ __decorate([
         }
         if (this.main.simulationSpace === ParticleSimulationSpace.World) {
             // Simulation world position
-            instanceVertices[offset + 27] = pos.x;
-            instanceVertices[offset + 28] = pos.y;
-            instanceVertices[offset + 29] = pos.z;
+            pos.copyToArray(instanceVertices, offset + 27);
             // Simulation world position
-            instanceVertices[offset + 30] = rot.x;
-            instanceVertices[offset + 31] = rot.y;
-            instanceVertices[offset + 32] = rot.z;
-            instanceVertices[offset + 33] = rot.w;
+            rot.copyToArray(instanceVertices, offset + 30);
         }
         // Simulation UV
         if (textureSheetAnimation.enabled) {
@@ -34502,7 +34516,7 @@ __decorate([
    * @inheritdoc
    */ _proto.clone = function clone() {
         var dest = new ParticleMaterial(this._engine);
-        this.cloneTo(dest);
+        this._cloneToAndModifyName(dest);
         return dest;
     };
     _create_class(ParticleMaterial, [