@galacean/engine 1.4.9 → 1.4.10

package/dist/browser.js

@@ -15227,7 +15227,7 @@
         };
         _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;
@@ -17191,6 +17191,7 @@
             _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;
@@ -17198,7 +17199,7 @@
        * 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;
         };
         /**
@@ -17215,6 +17216,10 @@
             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() {
@@ -17369,7 +17374,7 @@
        * 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;
         };
         /**
@@ -17550,7 +17555,7 @@
         var _proto = BlinnPhongMaterial.prototype;
         _proto.clone = function clone() {
             var dest = new BlinnPhongMaterial(this._engine);
-            this.cloneTo(dest);
+            this._cloneToAndModifyName(dest);
             return dest;
         };
         _create_class$2(BlinnPhongMaterial, [
@@ -18006,7 +18011,7 @@
        * @inheritdoc
        */ _proto.clone = function clone() {
             var dest = new PBRMaterial(this._engine);
-            this.cloneTo(dest);
+            this._cloneToAndModifyName(dest);
             return dest;
         };
         _proto._onIridescenceRangeChanged = function _onIridescenceRangeChanged() {
@@ -18471,7 +18476,7 @@
        * @inheritdoc
        */ _proto.clone = function clone() {
             var dest = new PBRSpecularMaterial(this._engine);
-            this.cloneTo(dest);
+            this._cloneToAndModifyName(dest);
             return dest;
         };
         _create_class$2(PBRSpecularMaterial, [
@@ -18543,7 +18548,7 @@
        * @inheritdoc
        */ _proto.clone = function clone() {
             var dest = new UnlitMaterial(this._engine);
-            this.cloneTo(dest);
+            this._cloneToAndModifyName(dest);
             return dest;
         };
         _create_class$2(UnlitMaterial, [
@@ -22175,7 +22180,7 @@
             }
             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, _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]);
             }
@@ -22256,11 +22261,11 @@
                 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) {
@@ -22465,14 +22470,8 @@
        */ _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);
             }
         };
@@ -22518,21 +22517,7 @@
             (_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) {
@@ -22711,6 +22696,39 @@
             }
             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$2(Entity, [
             {
                 key: "transform",
@@ -31671,11 +31689,11 @@
             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;
@@ -31702,7 +31720,7 @@
        * @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);
@@ -31801,17 +31819,6 @@
         };
         /**
        * @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
@@ -31828,23 +31835,6 @@
             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;
@@ -35841,7 +35831,7 @@
         var _proto = SkyBoxMaterial.prototype;
         _proto.clone = function clone() {
             var dest = new SkyBoxMaterial(this._engine);
-            this.cloneTo(dest);
+            this._cloneToAndModifyName(dest);
             return dest;
         };
         _create_class$2(SkyBoxMaterial, [
@@ -35946,7 +35936,7 @@
        * @inheritDoc
        */ _proto.clone = function clone() {
             var dest = new SkyProceduralMaterial(this._engine);
-            this.cloneTo(dest);
+            this._cloneToAndModifyName(dest);
             return dest;
         };
         _create_class$2(SkyProceduralMaterial, [
@@ -36835,6 +36825,13 @@
                     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;
             }
         };
         /**
@@ -37668,9 +37665,10 @@
        * 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();
         };
@@ -37686,6 +37684,29 @@
         };
         /**
        * @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) {
@@ -38293,7 +38314,7 @@
         };
         /**
        * @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();
@@ -38306,7 +38327,7 @@
                 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);
@@ -38314,7 +38335,7 @@
                         position.set(0, 0, 0);
                         direction.set(0, 0, -1);
                     }
-                    this._addNewParticle(position, direction, transform, time);
+                    this._addNewParticle(position, direction, transform, playTime);
                 }
             }
         };
@@ -38629,7 +38650,7 @@
                 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) {
@@ -38659,35 +38680,30 @@
             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;
@@ -38740,14 +38756,9 @@
             }
             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) {
@@ -39116,7 +39127,7 @@
        * @inheritdoc
        */ _proto.clone = function clone() {
             var dest = new ParticleMaterial(this._engine);
-            this.cloneTo(dest);
+            this._cloneToAndModifyName(dest);
             return dest;
         };
         _create_class$2(ParticleMaterial, [
@@ -47130,7 +47141,7 @@
        */ GLTFMaterialParser._checkOtherTextureTransform = function _checkOtherTextureTransform(texture, textureName) {
             var _texture_extensions;
             if ((_texture_extensions = texture.extensions) == null ? void 0 : _texture_extensions.KHR_texture_transform) {
-                Logger.warn("" + textureName + " texture always use the KHR_texture_transform of the base texture.");
+                Logger.warn("" + textureName + " texture ignore KHR_texture_transform extension.");
             }
         };
         /**
@@ -50042,7 +50053,7 @@
     ], EXT_texture_webp);
 
     //@ts-ignore
-    var version = "1.4.9";
+    var version = "1.4.10";
     console.log("Galacean Engine Version: " + version);
     for(var key in CoreObjects){
         Loader.registerClass(key, CoreObjects[key]);