@onerjs/core 8.31.0 → 8.31.1

package/Particles/Node/nodeParticleBuildState.js.map

@@ -1 +1 @@
-{"version":3,"file":"nodeParticleBuildState.js","sourceRoot":"","sources":["../../../../../dev/core/src/Particles/Node/nodeParticleBuildState.ts"],"names":[],"mappings":"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","sourcesContent":["import type { Scene } from \"core/scene\";\r\nimport type { NodeParticleConnectionPoint } from \"./nodeParticleBlockConnectionPoint\";\r\nimport { NodeParticleContextualSources } from \"./Enums/nodeParticleContextualSources\";\r\nimport type { Particle } from \"../particle\";\r\nimport type { Nullable } from \"core/types\";\r\nimport { NodeParticleBlockConnectionPointTypes } from \"./Enums/nodeParticleBlockConnectionPointTypes\";\r\nimport { Vector2, Vector3 } from \"core/Maths/math.vector\";\r\nimport type { ThinParticleSystem } from \"../thinParticleSystem\";\r\nimport { Color4 } from \"core/Maths/math.color\";\r\nimport { NodeParticleSystemSources } from \"./Enums/nodeParticleSystemSources\";\r\nimport type { AbstractMesh } from \"core/Meshes/abstractMesh\";\r\n\r\n/**\r\n * Class used to store node based geometry build state\r\n */\r\nexport class NodeParticleBuildState {\r\n    /**\r\n     * Gets the capactity of the particle system to build\r\n     */\r\n    public capacity: number;\r\n\r\n    /**\r\n     * Gets the scene where the particle system is built\r\n     */\r\n    public scene: Scene;\r\n\r\n    /** Gets or sets the build identifier */\r\n    public buildId: number;\r\n\r\n    /** Gets or sets the list of non connected mandatory inputs */\r\n    public notConnectedNonOptionalInputs: NodeParticleConnectionPoint[] = [];\r\n\r\n    /** Gets or sets a boolean indicating that verbose mode is on */\r\n    public verbose: boolean;\r\n\r\n    /**\r\n     * Gets or sets the particle context for contextual data\r\n     */\r\n    public particleContext: Nullable<Particle> = null;\r\n\r\n    /**\r\n     * Gets or sets the system context for contextual data\r\n     */\r\n    public systemContext: Nullable<ThinParticleSystem> = null;\r\n\r\n    /**\r\n     * Gets or sets the index of the gradient to use\r\n     */\r\n    public gradientIndex: number = 0;\r\n    /**\r\n     * Gets or sets next gradient in line\r\n     */\r\n    public nextGradientIndex: number = 0;\r\n    /**\r\n     * Gets or sets the next gradient value\r\n     */\r\n    public nextGradientValue: any;\r\n\r\n    /**\r\n     * Emits errors if any\r\n     */\r\n    public emitErrors() {\r\n        let errorMessage = \"\";\r\n\r\n        for (const notConnectedInput of this.notConnectedNonOptionalInputs) {\r\n            errorMessage += `input ${notConnectedInput.name} from block ${\r\n                notConnectedInput.ownerBlock.name\r\n            }[${notConnectedInput.ownerBlock.getClassName()}] is not connected and is not optional.\\n`;\r\n        }\r\n\r\n        if (errorMessage) {\r\n            // eslint-disable-next-line no-throw-literal\r\n            throw \"Build of Node Particle System Set failed:\\n\" + errorMessage;\r\n        }\r\n    }\r\n\r\n    /**\r\n     * Adapt a value to a target type\r\n     * @param source defines the value to adapt\r\n     * @param targetType defines the target type\r\n     * @returns the adapted value\r\n     */\r\n    adapt(source: NodeParticleConnectionPoint, targetType: NodeParticleBlockConnectionPointTypes) {\r\n        const value = source.getConnectedValue(this) || 0;\r\n\r\n        if (source.type === targetType) {\r\n            return value;\r\n        }\r\n\r\n        switch (targetType) {\r\n            case NodeParticleBlockConnectionPointTypes.Vector2:\r\n                return new Vector2(value, value);\r\n            case NodeParticleBlockConnectionPointTypes.Vector3:\r\n                return new Vector3(value, value, value);\r\n            case NodeParticleBlockConnectionPointTypes.Color4:\r\n                return new Color4(value, value, value, value);\r\n        }\r\n\r\n        return null;\r\n    }\r\n\r\n    /**\r\n     * Gets the value associated with a contextual source\r\n     * @param source Source of the contextual value\r\n     * @returns the value associated with the source\r\n     */\r\n    public getContextualValue(source: NodeParticleContextualSources) {\r\n        if (!this.particleContext || !this.systemContext) {\r\n            return null;\r\n        }\r\n\r\n        switch (source) {\r\n            case NodeParticleContextualSources.Position:\r\n                return this.particleContext.position;\r\n            case NodeParticleContextualSources.Direction:\r\n                return this.particleContext.direction;\r\n            case NodeParticleContextualSources.ScaledDirection:\r\n                this.particleContext.direction.scaleToRef(this.systemContext._directionScale, this.systemContext._scaledDirection);\r\n                return this.systemContext._scaledDirection;\r\n            case NodeParticleContextualSources.Color:\r\n                return this.particleContext.color;\r\n            case NodeParticleContextualSources.InitialColor:\r\n                return this.particleContext.initialColor;\r\n            case NodeParticleContextualSources.ColorDead:\r\n                return this.particleContext.colorDead;\r\n            case NodeParticleContextualSources.Age:\r\n                return this.particleContext.age;\r\n            case NodeParticleContextualSources.Lifetime:\r\n                return this.particleContext.lifeTime;\r\n            case NodeParticleContextualSources.Angle:\r\n                return this.particleContext.angle;\r\n            case NodeParticleContextualSources.Scale:\r\n                return this.particleContext.scale;\r\n            case NodeParticleContextualSources.Size:\r\n                return this.particleContext.size;\r\n            case NodeParticleContextualSources.AgeGradient:\r\n                return this.particleContext.age / this.particleContext.lifeTime;\r\n            case NodeParticleContextualSources.SpriteCellEnd:\r\n                return this.systemContext.endSpriteCellID;\r\n            case NodeParticleContextualSources.SpriteCellIndex:\r\n                return this.particleContext.cellIndex;\r\n            case NodeParticleContextualSources.SpriteCellStart:\r\n                return this.systemContext.startSpriteCellID;\r\n            case NodeParticleContextualSources.InitialDirection:\r\n                return this.particleContext._initialDirection;\r\n            case NodeParticleContextualSources.ColorStep:\r\n                return this.particleContext.colorStep;\r\n            case NodeParticleContextualSources.ScaledColorStep:\r\n                this.particleContext.colorStep.scaleToRef(this.systemContext._scaledUpdateSpeed, this.systemContext._scaledColorStep);\r\n                return this.systemContext._scaledColorStep;\r\n            case NodeParticleContextualSources.LocalPositionUpdated:\r\n                this.particleContext.direction.scaleToRef(this.systemContext._directionScale, this.systemContext._scaledDirection);\r\n                this.particleContext._localPosition!.addInPlace(this.systemContext._scaledDirection);\r\n                Vector3.TransformCoordinatesToRef(this.particleContext._localPosition!, this.systemContext._emitterWorldMatrix, this.particleContext.position);\r\n                return this.particleContext.position;\r\n        }\r\n\r\n        return null;\r\n    }\r\n\r\n    /**\r\n     * Gets the emitter world matrix\r\n     */\r\n    public get emitterWorldMatrix() {\r\n        if (!this.systemContext) {\r\n            return null;\r\n        }\r\n        return this.systemContext._emitterWorldMatrix;\r\n    }\r\n\r\n    /**\r\n     * Gets the emitter inverse world matrix\r\n     */\r\n    public get emitterInverseWorldMatrix() {\r\n        if (!this.systemContext) {\r\n            return null;\r\n        }\r\n        return this.systemContext._emitterInverseWorldMatrix;\r\n    }\r\n\r\n    /**\r\n     * Gets the emitter position\r\n     */\r\n    public get emitterPosition(): Nullable<Vector3> {\r\n        if (!this.systemContext) {\r\n            return null;\r\n        }\r\n\r\n        if (!this.systemContext.emitter) {\r\n            return null;\r\n        }\r\n\r\n        if (this.systemContext.emitter instanceof Vector3) {\r\n            return this.systemContext.emitter;\r\n        }\r\n\r\n        return (<AbstractMesh>this.systemContext.emitter).absolutePosition;\r\n    }\r\n\r\n    /**\r\n     * Gets the value associated with a system source\r\n     * @param source Source of the system value\r\n     * @returns the value associated with the source\r\n     */\r\n    public getSystemValue(source: NodeParticleSystemSources) {\r\n        if (!this.particleContext || !this.systemContext) {\r\n            return null;\r\n        }\r\n\r\n        switch (source) {\r\n            case NodeParticleSystemSources.Time:\r\n                return this.systemContext._actualFrame;\r\n            case NodeParticleSystemSources.Delta:\r\n                return this.systemContext._scaledUpdateSpeed;\r\n            case NodeParticleSystemSources.Emitter:\r\n                return this.emitterPosition;\r\n            case NodeParticleSystemSources.CameraPosition:\r\n                return this.scene.activeCamera?.globalPosition || Vector3.Zero();\r\n        }\r\n\r\n        return null;\r\n    }\r\n}\r\n"]}
+{"version":3,"file":"nodeParticleBuildState.js","sourceRoot":"","sources":["../../../../../dev/core/src/Particles/Node/nodeParticleBuildState.ts"],"names":[],"mappings":"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","sourcesContent":["import type { Scene } from \"core/scene\";\r\nimport type { NodeParticleConnectionPoint } from \"./nodeParticleBlockConnectionPoint\";\r\nimport { NodeParticleContextualSources } from \"./Enums/nodeParticleContextualSources\";\r\nimport type { Particle } from \"../particle\";\r\nimport type { Nullable } from \"core/types\";\r\nimport { NodeParticleBlockConnectionPointTypes } from \"./Enums/nodeParticleBlockConnectionPointTypes\";\r\nimport { Vector2, Vector3 } from \"core/Maths/math.vector\";\r\nimport type { ThinParticleSystem } from \"../thinParticleSystem\";\r\nimport { Color4 } from \"core/Maths/math.color\";\r\nimport { NodeParticleSystemSources } from \"./Enums/nodeParticleSystemSources\";\r\nimport type { AbstractMesh } from \"core/Meshes/abstractMesh\";\r\n\r\n/**\r\n * Class used to store node based geometry build state\r\n */\r\nexport class NodeParticleBuildState {\r\n    /**\r\n     * Gets the capactity of the particle system to build\r\n     */\r\n    public capacity: number;\r\n\r\n    /**\r\n     * Gets the scene where the particle system is built\r\n     */\r\n    public scene: Scene;\r\n\r\n    /** Gets or sets the build identifier */\r\n    public buildId: number;\r\n\r\n    /** Gets or sets the list of non connected mandatory inputs */\r\n    public notConnectedNonOptionalInputs: NodeParticleConnectionPoint[] = [];\r\n\r\n    /** Gets or sets a boolean indicating that verbose mode is on */\r\n    public verbose: boolean;\r\n\r\n    /**\r\n     * Gets or sets the particle context for contextual data\r\n     */\r\n    public particleContext: Nullable<Particle> = null;\r\n\r\n    /**\r\n     * Gets or sets the system context for contextual data\r\n     */\r\n    public systemContext: Nullable<ThinParticleSystem> = null;\r\n\r\n    /**\r\n     * Gets or sets the index of the gradient to use\r\n     */\r\n    public gradientIndex: number = 0;\r\n    /**\r\n     * Gets or sets next gradient in line\r\n     */\r\n    public nextGradientIndex: number = 0;\r\n    /**\r\n     * Gets or sets the next gradient value\r\n     */\r\n    public nextGradientValue: any;\r\n\r\n    /**\r\n     * Emits errors if any\r\n     */\r\n    public emitErrors() {\r\n        let errorMessage = \"\";\r\n\r\n        for (const notConnectedInput of this.notConnectedNonOptionalInputs) {\r\n            errorMessage += `input ${notConnectedInput.name} from block ${\r\n                notConnectedInput.ownerBlock.name\r\n            }[${notConnectedInput.ownerBlock.getClassName()}] is not connected and is not optional.\\n`;\r\n        }\r\n\r\n        if (errorMessage) {\r\n            // eslint-disable-next-line no-throw-literal\r\n            throw \"Build of Node Particle System Set failed:\\n\" + errorMessage;\r\n        }\r\n    }\r\n\r\n    /**\r\n     * Adapt a value to a target type\r\n     * @param source defines the value to adapt\r\n     * @param targetType defines the target type\r\n     * @returns the adapted value\r\n     */\r\n    adapt(source: NodeParticleConnectionPoint, targetType: NodeParticleBlockConnectionPointTypes) {\r\n        const value = source.getConnectedValue(this) || 0;\r\n\r\n        if (source.type === targetType) {\r\n            return value;\r\n        }\r\n\r\n        switch (targetType) {\r\n            case NodeParticleBlockConnectionPointTypes.Vector2:\r\n                return new Vector2(value, value);\r\n            case NodeParticleBlockConnectionPointTypes.Vector3:\r\n                return new Vector3(value, value, value);\r\n            case NodeParticleBlockConnectionPointTypes.Color4:\r\n                return new Color4(value, value, value, value);\r\n        }\r\n\r\n        return null;\r\n    }\r\n\r\n    /**\r\n     * Gets the value associated with a contextual source\r\n     * @param source Source of the contextual value\r\n     * @returns the value associated with the source\r\n     */\r\n    public getContextualValue(source: NodeParticleContextualSources) {\r\n        if (!this.particleContext || !this.systemContext) {\r\n            return null;\r\n        }\r\n\r\n        switch (source) {\r\n            case NodeParticleContextualSources.Position:\r\n                return this.particleContext.position;\r\n            case NodeParticleContextualSources.Direction:\r\n                return this.particleContext.direction;\r\n            case NodeParticleContextualSources.ScaledDirection:\r\n                this.particleContext.direction.scaleToRef(this.particleContext._directionScale, this.particleContext._scaledDirection);\r\n                return this.particleContext._scaledDirection;\r\n            case NodeParticleContextualSources.Color:\r\n                return this.particleContext.color;\r\n            case NodeParticleContextualSources.InitialColor:\r\n                return this.particleContext.initialColor;\r\n            case NodeParticleContextualSources.ColorDead:\r\n                return this.particleContext.colorDead;\r\n            case NodeParticleContextualSources.Age:\r\n                return this.particleContext.age;\r\n            case NodeParticleContextualSources.Lifetime:\r\n                return this.particleContext.lifeTime;\r\n            case NodeParticleContextualSources.Angle:\r\n                return this.particleContext.angle;\r\n            case NodeParticleContextualSources.Scale:\r\n                return this.particleContext.scale;\r\n            case NodeParticleContextualSources.Size:\r\n                return this.particleContext.size;\r\n            case NodeParticleContextualSources.AgeGradient:\r\n                return this.particleContext.age / this.particleContext.lifeTime;\r\n            case NodeParticleContextualSources.SpriteCellEnd:\r\n                return this.systemContext.endSpriteCellID;\r\n            case NodeParticleContextualSources.SpriteCellIndex:\r\n                return this.particleContext.cellIndex;\r\n            case NodeParticleContextualSources.SpriteCellStart:\r\n                return this.systemContext.startSpriteCellID;\r\n            case NodeParticleContextualSources.InitialDirection:\r\n                return this.particleContext._initialDirection;\r\n            case NodeParticleContextualSources.ColorStep:\r\n                return this.particleContext.colorStep;\r\n            case NodeParticleContextualSources.ScaledColorStep:\r\n                this.particleContext.colorStep.scaleToRef(this.systemContext._scaledUpdateSpeed, this.systemContext._scaledColorStep);\r\n                return this.systemContext._scaledColorStep;\r\n            case NodeParticleContextualSources.LocalPositionUpdated:\r\n                this.particleContext.direction.scaleToRef(this.particleContext._directionScale, this.particleContext._scaledDirection);\r\n                this.particleContext._localPosition!.addInPlace(this.particleContext._scaledDirection);\r\n                Vector3.TransformCoordinatesToRef(this.particleContext._localPosition!, this.systemContext._emitterWorldMatrix, this.particleContext.position);\r\n                return this.particleContext.position;\r\n        }\r\n\r\n        return null;\r\n    }\r\n\r\n    /**\r\n     * Gets the emitter world matrix\r\n     */\r\n    public get emitterWorldMatrix() {\r\n        if (!this.systemContext) {\r\n            return null;\r\n        }\r\n        return this.systemContext._emitterWorldMatrix;\r\n    }\r\n\r\n    /**\r\n     * Gets the emitter inverse world matrix\r\n     */\r\n    public get emitterInverseWorldMatrix() {\r\n        if (!this.systemContext) {\r\n            return null;\r\n        }\r\n        return this.systemContext._emitterInverseWorldMatrix;\r\n    }\r\n\r\n    /**\r\n     * Gets the emitter position\r\n     */\r\n    public get emitterPosition(): Nullable<Vector3> {\r\n        if (!this.systemContext) {\r\n            return null;\r\n        }\r\n\r\n        if (!this.systemContext.emitter) {\r\n            return null;\r\n        }\r\n\r\n        if (this.systemContext.emitter instanceof Vector3) {\r\n            return this.systemContext.emitter;\r\n        }\r\n\r\n        return (<AbstractMesh>this.systemContext.emitter).absolutePosition;\r\n    }\r\n\r\n    /**\r\n     * Gets the value associated with a system source\r\n     * @param source Source of the system value\r\n     * @returns the value associated with the source\r\n     */\r\n    public getSystemValue(source: NodeParticleSystemSources) {\r\n        if (!this.particleContext || !this.systemContext) {\r\n            return null;\r\n        }\r\n\r\n        switch (source) {\r\n            case NodeParticleSystemSources.Time:\r\n                return this.systemContext._actualFrame;\r\n            case NodeParticleSystemSources.Delta:\r\n                return this.systemContext._scaledUpdateSpeed;\r\n            case NodeParticleSystemSources.Emitter:\r\n                return this.emitterPosition;\r\n            case NodeParticleSystemSources.CameraPosition:\r\n                return this.scene.activeCamera?.globalPosition || Vector3.Zero();\r\n        }\r\n\r\n        return null;\r\n    }\r\n}\r\n"]}

package/Particles/Node/nodeParticleSystemSet.helper.js

@@ -42,19 +42,16 @@ export async function ConvertToNodeParticleSystemSetAsync(name, particleSystemsL
     return nodeParticleSystemSet;
 }
 async function _ExtractDatafromParticleSystemAsync(newSet, oldSystem, context) {
-    // CreateParticle block
-    const createParticleBlock = _CreateParticleBlockGroup(oldSystem, context);
+    // CreateParticle block group
+    const createParticleOutput = _CreateParticleBlockGroup(oldSystem, context);
     // Emitter Shape block
-    const shapeBlock = _EmitterShapeBlock(oldSystem);
-    createParticleBlock.particle.connectTo(shapeBlock.particle);
-    // Update the particle position
-    const positionUpdatedParticle = _UpdateParticleBlockGroup(shapeBlock.output, oldSystem, context);
-    // Color update
-    const colorUpdateBlock = _CreateColorUpdateBlock(oldSystem, createParticleBlock);
-    positionUpdatedParticle.connectTo(colorUpdateBlock.particle);
+    const shapeOutput = _EmitterShapeBlock(oldSystem);
+    createParticleOutput.particle.connectTo(shapeOutput.particle);
+    // UpdateParticle block group
+    const updateParticleOutput = _UpdateParticleBlockGroup(shapeOutput.output, oldSystem, context);
     // System block
     const newSystem = _SystemBlockGroup(oldSystem, context);
-    colorUpdateBlock.output.connectTo(newSystem.particle);
+    updateParticleOutput.connectTo(newSystem.particle);
     // Register
     newSet.systemBlocks.push(newSystem);
 }
@@ -89,27 +86,16 @@ function _SystemBlockGroup(oldSystem, context) {
 }
 // ------------- CREATE PARTICLE FUNCTIONS -------------
 // The creation of the different properties follows the order they are added to the CreationQueue in ThinParticleSystem:
-// Lifetime, Position, Direction, Emit, Size, Scale/StartSize, Angle, Velocity, VelocityLimit, Color, Drag, Noise, ColorDead, Ramp, Sheet
+// Lifetime, Emit Power, Size, Scale/StartSize, Angle, Velocity, VelocityLimit, Color, Drag, Noise, ColorDead, Ramp, Sheet
 function _CreateParticleBlockGroup(oldSystem, context) {
-    // Create particle
+    // Create particle block
     const createParticleBlock = new CreateParticleBlock("Create Particle");
-    // Lifetime
     _CreateParticleLifetimeBlockGroup(oldSystem, context).connectTo(createParticleBlock.lifeTime);
-    // Emit power (Speed)
-    const randomEmitPowerBlock = new ParticleRandomBlock("Random Emit Power");
-    _CreateAndConnectInput("Min Emit Power", oldSystem.minEmitPower, randomEmitPowerBlock.min);
-    _CreateAndConnectInput("Max Emit Power", oldSystem.maxEmitPower, randomEmitPowerBlock.max);
-    randomEmitPowerBlock.output.connectTo(createParticleBlock.emitPower);
-    // Size
+    _CreateParticleEmitPowerBlockGroup(oldSystem).connectTo(createParticleBlock.emitPower);
     _CreateParticleSizeBlockGroup(oldSystem, context).connectTo(createParticleBlock.size);
-    // Scale/Start Size
     _CreateParticleScaleBlockGroup(oldSystem, context).connectTo(createParticleBlock.scale);
-    // Angle (rotation)
-    const randomRotationBlock = new ParticleRandomBlock("Random Rotation");
-    _CreateAndConnectInput("Min Rotation", oldSystem.minInitialRotation, randomRotationBlock.min);
-    _CreateAndConnectInput("Max Rotation", oldSystem.maxInitialRotation, randomRotationBlock.max);
-    randomRotationBlock.output.connectTo(createParticleBlock.angle);
-    // Color is handled when we do the color update block to manage gradients
+    _CreateParticleAngleBlockGroup(oldSystem).connectTo(createParticleBlock.angle);
+    _CreateParticleColorBlockGroup(oldSystem, context).connectTo(createParticleBlock.color);
     // Dead color
     _CreateAndConnectInput("Dead Color", oldSystem.colorDead, createParticleBlock.colorDead);
     return createParticleBlock;
@@ -133,16 +119,27 @@ function _CreateParticleLifetimeBlockGroup(oldSystem, context) {
         return randomLifetimeBlock.output;
     }
 }
+/**
+ * Creates the group of blocks that represent the particle emit power
+ * @param oldSystem The old particle system to convert
+ * @returns The output of the group of blocks that represent the particle emit power
+ */
+function _CreateParticleEmitPowerBlockGroup(oldSystem) {
+    const randomEmitPowerBlock = new ParticleRandomBlock("Random Emit Power");
+    _CreateAndConnectInput("Min Emit Power", oldSystem.minEmitPower, randomEmitPowerBlock.min);
+    _CreateAndConnectInput("Max Emit Power", oldSystem.maxEmitPower, randomEmitPowerBlock.max);
+    return randomEmitPowerBlock.output;
+}
 /**
  * Creates the group of blocks that represent the particle size
  * @param oldSystem The old particle system to convert
  * @param context The context of the current conversion
- * @returns The output of the group of blocks that represent the particle lifetime
+ * @returns The output of the group of blocks that represent the particle size
  */
 function _CreateParticleSizeBlockGroup(oldSystem, context) {
     if (oldSystem._sizeGradients && oldSystem._sizeGradients.length > 0) {
-        const sizeGradientBlockGroupOutput = _CreateParticleSizeGradientBlockGroup(oldSystem._sizeGradients, context);
-        return sizeGradientBlockGroupOutput;
+        context.sizeGradientValue0Output = _CreateParticleInitialValueFromGradient(oldSystem._sizeGradients);
+        return context.sizeGradientValue0Output;
     }
     else {
         const randomSizeBlock = new ParticleRandomBlock("Random size");
@@ -151,6 +148,12 @@ function _CreateParticleSizeBlockGroup(oldSystem, context) {
         return randomSizeBlock.output;
     }
 }
+/**
+ * Creates the group of blocks that represent the particle scale
+ * @param oldSystem The old particle system to convert
+ * @param context The context of the current conversion
+ * @returns The output of the group of blocks that represent the particle scale
+ */
 function _CreateParticleScaleBlockGroup(oldSystem, context) {
     // Create the random scale
     const randomScaleBlock = new ParticleRandomBlock("Random Scale");
@@ -171,27 +174,54 @@ function _CreateParticleScaleBlockGroup(oldSystem, context) {
         return randomScaleBlock.output;
     }
 }
-function _CreateParticleSizeGradientBlockGroup(sizeGradients, context) {
-    if (sizeGradients.length === 0) {
-        throw new Error("No size gradients provided.");
+/**
+ * Creates the group of blocks that represent the particle angle (rotation)
+ * @param oldSystem The old particle system to convert
+ * @returns The output of the group of blocks that represent the particle angle (rotation)
+ */
+function _CreateParticleAngleBlockGroup(oldSystem) {
+    const randomRotationBlock = new ParticleRandomBlock("Random Rotation");
+    _CreateAndConnectInput("Min Rotation", oldSystem.minInitialRotation, randomRotationBlock.min);
+    _CreateAndConnectInput("Max Rotation", oldSystem.maxInitialRotation, randomRotationBlock.max);
+    return randomRotationBlock.output;
+}
+/**
+ * Creates the group of blocks that represent the particle color
+ * @param oldSystem The old particle system to convert
+ * @param context The context of the current conversion
+ * @returns The output of the group of blocks that represent the particle color
+ */
+function _CreateParticleColorBlockGroup(oldSystem, context) {
+    if (oldSystem._colorGradients && oldSystem._colorGradients.length > 0) {
+        context.colorGradientValue0Output = _CreateParticleInitialValueFromGradient(oldSystem._colorGradients);
+        return context.colorGradientValue0Output;
+    }
+    else {
+        const randomColorBlock = new ParticleRandomBlock("Random color");
+        _CreateAndConnectInput("Color 1", oldSystem.color1, randomColorBlock.min);
+        _CreateAndConnectInput("Color 2", oldSystem.color2, randomColorBlock.max);
+        return randomColorBlock.output;
     }
-    const initialParticleSize = _CreateSizeFromGradientStep(sizeGradients[0], 0);
-    context.sizeGradientValue0Output = initialParticleSize;
-    return initialParticleSize;
 }
-function _CreateSizeFromGradientStep(gradientStep, index) {
-    if (gradientStep.factor2 !== undefined) {
+function _CreateParticleInitialValueFromGradient(gradients) {
+    if (gradients.length === 0) {
+        throw new Error("No gradients provided.");
+    }
+    const gradientStep = gradients[0];
+    const value1 = gradientStep.factor1 ?? gradientStep.color1;
+    const value2 = gradientStep.factor2 ?? gradientStep.color2;
+    if (value2 !== undefined) {
         // Create a random between value1 and value2
-        const randomBlock = new ParticleRandomBlock("Random Value " + index);
+        const randomBlock = new ParticleRandomBlock("Random Value 0");
         randomBlock.lockMode = ParticleRandomBlockLocks.OncePerParticle;
-        _CreateAndConnectInput("Value 1", gradientStep.factor1, randomBlock.min);
-        _CreateAndConnectInput("Value 2", gradientStep.factor2, randomBlock.max);
+        _CreateAndConnectInput("Value 1", value1, randomBlock.min);
+        _CreateAndConnectInput("Value 2", value2, randomBlock.max);
         return randomBlock.output;
     }
     else {
         // Single value
         const sizeBlock = new ParticleInputBlock("Value");
-        sizeBlock.value = gradientStep.factor1;
+        sizeBlock.value = value1;
         return sizeBlock.output;
     }
 }
@@ -332,36 +362,80 @@ function _EmitterShapeBlock(oldSystem) {
  * @returns The output connection point after all updates have been applied
  */
 function _UpdateParticleBlockGroup(inputParticle, oldSystem, context) {
-    let outputUpdate = inputParticle;
-    if (oldSystem.minAngularSpeed !== 0 || oldSystem.maxAngularSpeed !== 0) {
-        outputUpdate = _UpdateParticleAngularSpeedBlockGroup(outputUpdate, oldSystem.minAngularSpeed, oldSystem.maxAngularSpeed);
-    }
-    outputUpdate = _UpdateParticlePositionBlockGroup(outputUpdate, oldSystem.isLocal);
+    let updateBlockGroupOutput = inputParticle;
+    updateBlockGroupOutput = _UpdateParticleColorBlockGroup(updateBlockGroupOutput, oldSystem._colorGradients, context);
+    updateBlockGroupOutput = _UpdateParticleAngleBlockGroup(updateBlockGroupOutput, oldSystem, context);
+    updateBlockGroupOutput = _UpdateParticlePositionBlockGroup(updateBlockGroupOutput, oldSystem.isLocal);
     if (oldSystem._sizeGradients && oldSystem._sizeGradients.length > 0) {
-        outputUpdate = _UpdateParticleSizeGradientBlockGroup(outputUpdate, oldSystem._sizeGradients, context);
+        updateBlockGroupOutput = _UpdateParticleSizeGradientBlockGroup(updateBlockGroupOutput, oldSystem._sizeGradients, context);
     }
     if (oldSystem.gravity.equalsToFloats(0, 0, 0) === false) {
-        outputUpdate = _UpdateParticleGravityBlockGroup(outputUpdate, oldSystem.gravity);
+        updateBlockGroupOutput = _UpdateParticleGravityBlockGroup(updateBlockGroupOutput, oldSystem.gravity);
+    }
+    return updateBlockGroupOutput;
+}
+function _UpdateParticleColorBlockGroup(inputParticle, colorGradients, context) {
+    let colorCalculation = undefined;
+    if (colorGradients && colorGradients.length > 0) {
+        if (context.colorGradientValue0Output === undefined) {
+            throw new Error("Initial color gradient values not found in context.");
+        }
+        context.ageToLifeTimeRatioBlockGroupOutput = _CreateAgeToLifeTimeRatioBlockGroup(context);
+        colorCalculation = _CreateGradientBlockGroup(context.ageToLifeTimeRatioBlockGroupOutput, colorGradients, ParticleRandomBlockLocks.OncePerParticle, "Color", [
+            context.colorGradientValue0Output,
+        ]);
+    }
+    else {
+        colorCalculation = _CreateBasicColorUpdate();
+    }
+    // Create the color update block clamping alpha >= 0
+    const colorUpdateBlock = new UpdateColorBlock("Color update");
+    inputParticle.connectTo(colorUpdateBlock.particle);
+    _ClampUpdateColorAlpha(colorCalculation).connectTo(colorUpdateBlock.color);
+    return colorUpdateBlock.output;
+}
+function _UpdateParticleAngleBlockGroup(inputParticle, oldSystem, context) {
+    // We will try to use gradients if they exist
+    // If not, we will try to use min/max angular speed
+    let angularSpeedCalculation = null;
+    if (oldSystem._angularSpeedGradients && oldSystem._angularSpeedGradients.length > 0) {
+        angularSpeedCalculation = _UpdateParticleAngularSpeedGradientBlockGroup(oldSystem._angularSpeedGradients, context);
+    }
+    else if (oldSystem.minAngularSpeed !== 0 || oldSystem.maxAngularSpeed !== 0) {
+        angularSpeedCalculation = _UpdateParticleAngularSpeedBlockGroup(oldSystem.minAngularSpeed, oldSystem.maxAngularSpeed);
+    }
+    // If we have an angular speed calculation, then update the angle
+    if (angularSpeedCalculation) {
+        // Create the angular speed delta
+        const angleSpeedDeltaOutput = _CreateDeltaModifiedInput("Angular Speed", angularSpeedCalculation);
+        // Add it to the angle
+        const addAngle = new ParticleMathBlock("Add Angular Speed to Angle");
+        addAngle.operation = ParticleMathBlockOperations.Add;
+        _CreateAndConnectContextualSource("Angle", NodeParticleContextualSources.Angle, addAngle.left);
+        angleSpeedDeltaOutput.connectTo(addAngle.right);
+        // Update the particle angle
+        const updateAngle = new UpdateAngleBlock("Angle Update with Angular Speed");
+        inputParticle.connectTo(updateAngle.particle);
+        addAngle.output.connectTo(updateAngle.angle);
+        return updateAngle.output;
+    }
+    else {
+        return inputParticle;
     }
-    return outputUpdate;
 }
-function _UpdateParticleAngularSpeedBlockGroup(inputParticle, minAngularSpeed, maxAngularSpeed) {
+function _UpdateParticleAngularSpeedGradientBlockGroup(angularSpeedGradients, context) {
+    context.ageToLifeTimeRatioBlockGroupOutput = _CreateAgeToLifeTimeRatioBlockGroup(context);
+    // Generate the gradient
+    const angularSpeedValueOutput = _CreateGradientBlockGroup(context.ageToLifeTimeRatioBlockGroupOutput, angularSpeedGradients, ParticleRandomBlockLocks.OncePerParticle, "Angular Speed");
+    return angularSpeedValueOutput;
+}
+function _UpdateParticleAngularSpeedBlockGroup(minAngularSpeed, maxAngularSpeed) {
     // Random value between for the angular speed of the particle
     const randomAngularSpeedBlock = new ParticleRandomBlock("Random Angular Speed");
+    randomAngularSpeedBlock.lockMode = ParticleRandomBlockLocks.OncePerParticle;
     _CreateAndConnectInput("Min Angular Speed", minAngularSpeed, randomAngularSpeedBlock.min);
     _CreateAndConnectInput("Max Angular Speed", maxAngularSpeed, randomAngularSpeedBlock.max);
-    // Create the angular speed delta
-    const angleSpeedDeltaOutput = _CreateDeltaModifiedInput("Angular Speed", randomAngularSpeedBlock.output);
-    // Add it to the angle
-    const addAngle = new ParticleMathBlock("Add Angular Speed to Angle");
-    addAngle.operation = ParticleMathBlockOperations.Add;
-    _CreateAndConnectContextualSource("Angle", NodeParticleContextualSources.Angle, addAngle.left);
-    angleSpeedDeltaOutput.connectTo(addAngle.right);
-    // Update the particle angle
-    const updateAngle = new UpdateAngleBlock("Angle Update with Angular Speed");
-    inputParticle.connectTo(updateAngle.particle);
-    addAngle.output.connectTo(updateAngle.angle);
-    return updateAngle.output;
+    return randomAngularSpeedBlock.output;
 }
 function _UpdateParticlePositionBlockGroup(inputParticle, isLocal) {
     // Update the particle position
@@ -409,90 +483,17 @@ function _UpdateParticleGravityBlockGroup(inputParticle, gravity) {
     addDirectionBlock.output.connectTo(updateDirection.direction);
     return updateDirection.output;
 }
-function _CreateColorUpdateBlock(oldSystem, createParticleBlock) {
-    if (!oldSystem) {
-        throw new Error("Invalid particle system");
-    }
-    // Calculate the color
-    const colorGradients = oldSystem.getColorGradients();
-    let colorBlock = null;
-    if (colorGradients && colorGradients.length > 0) {
-        colorBlock = _CreateGradientColorUpdate(oldSystem, colorGradients, createParticleBlock);
-    }
-    else {
-        colorBlock = _CreateBasicColorUpdate(oldSystem, createParticleBlock);
-    }
-    // Clamp alpha >= 0
-    const clampedColor = _ClampUpdateColorAlpha(colorBlock);
-    // Create the color update block
-    const colorUpdateBlock = new UpdateColorBlock("Color update");
-    clampedColor.colorOut.connectTo(colorUpdateBlock.color);
-    return colorUpdateBlock;
-}
-function _CreateGradientColorUpdate(oldSystem, gradient, createParticleBlock) {
-    const colorGradientBlock = new ParticleGradientBlock("Color Gradient");
-    _CreateAndConnectContextualSource("gradient", NodeParticleContextualSources.Age, colorGradientBlock.gradient);
-    let tempColor = null;
-    let colorStart = null;
-    let colorEnd = null;
-    for (let i = 0; i < gradient.length; i++) {
-        const gradientStep = gradient[i];
-        const gradientValueBlock = new ParticleGradientValueBlock("Color Gradient Value " + i);
-        gradientValueBlock.reference = gradientStep.gradient;
-        if (gradientStep.color2) {
-            // Create a random between color1 and color2
-            const randomColorBlock = new ParticleRandomBlock("Random Color for Gradient " + i);
-            randomColorBlock.lockMode = ParticleRandomBlockLocks.PerSystem;
-            _CreateAndConnectInput("Color 1", gradientStep.color1, randomColorBlock.min);
-            _CreateAndConnectInput("Color 2", gradientStep.color2, randomColorBlock.max);
-            randomColorBlock.output.connectTo(gradientValueBlock.value);
-            tempColor = randomColorBlock;
-        }
-        else {
-            // Single color
-            const input = new ParticleInputBlock("Color " + i);
-            input.value = gradientStep.color1;
-            input.output.connectTo(gradientValueBlock.value);
-            tempColor = input;
-        }
-        if (gradientStep.gradient === 0) {
-            colorStart = tempColor;
-        }
-        else if (gradientStep.gradient === 1) {
-            colorEnd = tempColor;
-        }
-        gradientValueBlock.output.connectTo(colorGradientBlock.inputs[i + 1]);
-    }
-    _UpdateCreateParticleColor(oldSystem, colorStart, colorEnd, createParticleBlock);
-    return colorGradientBlock;
-}
-function _CreateBasicColorUpdate(oldSystem, createParticleBlock) {
+function _CreateBasicColorUpdate() {
     const addColorBlock = new ParticleMathBlock("Add Color");
     addColorBlock.operation = ParticleMathBlockOperations.Add;
     _CreateAndConnectContextualSource("Color", NodeParticleContextualSources.Color, addColorBlock.left);
     _CreateAndConnectContextualSource("Scaled Color Step", NodeParticleContextualSources.ScaledColorStep, addColorBlock.right);
-    _UpdateCreateParticleColor(oldSystem, null, null, createParticleBlock);
-    return addColorBlock;
-}
-function _UpdateCreateParticleColor(oldSystem, colorStart, colorEnd, createParticleBlock) {
-    if (colorStart === null) {
-        colorStart = new ParticleInputBlock("Color Start");
-        colorStart.value = oldSystem.color1;
-    }
-    if (colorEnd === null) {
-        colorEnd = new ParticleInputBlock("Color End");
-        colorEnd.value = oldSystem.color2;
-    }
-    const randomColorBlock = new ParticleRandomBlock("Random color");
-    randomColorBlock.lockMode = ParticleRandomBlockLocks.PerParticle;
-    colorStart.output.connectTo(randomColorBlock.min);
-    colorEnd.output.connectTo(randomColorBlock.max);
-    randomColorBlock.output.connectTo(createParticleBlock.color);
+    return addColorBlock.output;
 }
-function _ClampUpdateColorAlpha(colorBlock) {
+function _ClampUpdateColorAlpha(colorCalculationOutput) {
     // Decompose color to clamp alpha
     const decomposeColorBlock = new ParticleConverterBlock("Decompose Color");
-    colorBlock.outputs[0].connectTo(decomposeColorBlock.colorIn);
+    colorCalculationOutput.connectTo(decomposeColorBlock.colorIn);
     // Clamp alpha to be >= 0
     const maxAlphaBlock = new ParticleMathBlock("Alpha >= 0");
     maxAlphaBlock.operation = ParticleMathBlockOperations.Max;
@@ -502,7 +503,7 @@ function _ClampUpdateColorAlpha(colorBlock) {
     const composeColorBlock = new ParticleConverterBlock("Compose Color");
     decomposeColorBlock.xyzOut.connectTo(composeColorBlock.xyzIn);
     maxAlphaBlock.output.connectTo(composeColorBlock.wIn);
-    return composeColorBlock;
+    return composeColorBlock.colorOut;
 }
 // ------------- UTILITY FUNCTIONS -------------
 function _CreateDeltaModifiedInput(name, value) {
@@ -639,17 +640,19 @@ function _CreateGradientBlockGroup(gradientSelector, gradientValues, randomLockM
 function _CreateGradientValueBlockGroup(gradientStep, randomLockMode, prefix, index) {
     const gradientValueBlock = new ParticleGradientValueBlock(prefix + " Gradient Value " + index);
     gradientValueBlock.reference = gradientStep.gradient;
-    if (gradientStep.factor2 !== undefined) {
+    const value1 = gradientStep.factor1 ?? gradientStep.color1;
+    const value2 = gradientStep.factor2 ?? gradientStep.color2;
+    if (value2 !== undefined) {
         // Create a random between value1 and value2
         const randomBlock = new ParticleRandomBlock("Random Value " + index);
         randomBlock.lockMode = randomLockMode;
-        _CreateAndConnectInput("Value 1", gradientStep.factor1, randomBlock.min);
-        _CreateAndConnectInput("Value 2", gradientStep.factor2, randomBlock.max);
+        _CreateAndConnectInput("Value 1", value1, randomBlock.min);
+        _CreateAndConnectInput("Value 2", value2, randomBlock.max);
         randomBlock.output.connectTo(gradientValueBlock.value);
     }
     else {
         // Single value
-        _CreateAndConnectInput("Value", gradientStep.factor1, gradientValueBlock.value);
+        _CreateAndConnectInput("Value", value1, gradientValueBlock.value);
     }
     return gradientValueBlock.output;
 }