@onerjs/core 8.30.9 → 8.31.1

package/Particles/Node/nodeParticleSystemSet.helper.js

@@ -22,13 +22,12 @@ import { UpdateAngleBlock } from "./Blocks/Update/updateAngleBlock.js";
 import { UpdateColorBlock } from "./Blocks/Update/updateColorBlock.js";
 import { UpdateDirectionBlock } from "./Blocks/Update/updateDirectionBlock.js";
 import { UpdatePositionBlock } from "./Blocks/Update/updatePositionBlock.js";
+import { UpdateSizeBlock } from "./Blocks/Update/updateSizeBlock.js";
 /**
  * Converts a ParticleSystem to a NodeParticleSystemSet.
  * @param name The name of the node particle system set.
  * @param particleSystemsList The particle systems to convert.
  * @returns The converted node particle system set or null if conversion failed.
- * #0K3AQ2#3672
- * #7J0NXA#4
  */
 export async function ConvertToNodeParticleSystemSetAsync(name, particleSystemsList) {
     if (!particleSystemsList || !particleSystemsList.length) {
@@ -43,28 +42,25 @@ export async function ConvertToNodeParticleSystemSetAsync(name, particleSystemsL
     return nodeParticleSystemSet;
 }
 async function _ExtractDatafromParticleSystemAsync(newSet, oldSystem, context) {
-    // CreateParticle block
-    const createParticleBlock = _CreateCreateParticleBlockGroup(oldSystem, context);
+    // CreateParticle block group
+    const createParticleOutput = _CreateParticleBlockGroup(oldSystem, context);
     // Emitter Shape block
-    const shapeBlock = _CreateEmitterShapeBlock(oldSystem);
-    createParticleBlock.particle.connectTo(shapeBlock.particle);
-    // Update the particle position
-    const positionUpdatedParticle = _CreateUpdateSystem(shapeBlock.output, oldSystem);
-    // 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 = _CreateSystemBlock(oldSystem, context);
-    colorUpdateBlock.output.connectTo(newSystem.particle);
+    const newSystem = _SystemBlockGroup(oldSystem, context);
+    updateParticleOutput.connectTo(newSystem.particle);
     // Register
     newSet.systemBlocks.push(newSystem);
 }
-function _CreateSystemBlock(oldSystem, context) {
+// ------------- SYSTEM FUNCTIONS -------------
+function _SystemBlockGroup(oldSystem, context) {
     const newSystem = new SystemBlock(oldSystem.name);
     _CreateAndConnectInput("Translation pivot", oldSystem.translationPivot, newSystem.translationPivot);
     _CreateAndConnectInput("Texture mask", oldSystem.textureMask, newSystem.textureMask);
-    const targetStopDurationOutput = _CreateTargetStopDurationInputBlock(oldSystem, context);
-    targetStopDurationOutput.connectTo(newSystem.targetStopDuration);
+    _CreateTargetStopDurationInputBlock(oldSystem, context).connectTo(newSystem.targetStopDuration);
     newSystem.emitRate = oldSystem.emitRate;
     newSystem.manualEmitCount = oldSystem.manualEmitCount;
     newSystem.blendMode = oldSystem.blendMode;
@@ -88,47 +84,32 @@ function _CreateSystemBlock(oldSystem, context) {
     textureBlock.texture.connectTo(newSystem.texture);
     return newSystem;
 }
-// Create Particle Block Group functions
-function _CreateCreateParticleBlockGroup(oldSystem, context) {
-    // Create particle
+// ------------- CREATE PARTICLE FUNCTIONS -------------
+// The creation of the different properties follows the order they are added to the CreationQueue in ThinParticleSystem:
+// Lifetime, Emit Power, Size, Scale/StartSize, Angle, Velocity, VelocityLimit, Color, Drag, Noise, ColorDead, Ramp, Sheet
+function _CreateParticleBlockGroup(oldSystem, context) {
+    // Create particle block
     const createParticleBlock = new CreateParticleBlock("Create Particle");
-    // Lifetime
     _CreateParticleLifetimeBlockGroup(oldSystem, context).connectTo(createParticleBlock.lifeTime);
-    // Size
-    const randomSizeBlock = new ParticleRandomBlock("Random size");
-    _CreateAndConnectInput("Min size", oldSystem.minSize, randomSizeBlock.min);
-    _CreateAndConnectInput("Max size", oldSystem.maxSize, randomSizeBlock.max);
-    randomSizeBlock.output.connectTo(createParticleBlock.size);
-    // Scale
-    const randomScaleBlock = new ParticleRandomBlock("Random Scale");
-    _CreateAndConnectInput("Min Scale", new Vector2(oldSystem.minScaleX, oldSystem.minScaleY), randomScaleBlock.min);
-    _CreateAndConnectInput("Max Scale", new Vector2(oldSystem.maxScaleX, oldSystem.maxScaleY), randomScaleBlock.max);
-    randomScaleBlock.output.connectTo(createParticleBlock.scale);
-    // Color is handled when we do the color update block to manage gradients
+    _CreateParticleEmitPowerBlockGroup(oldSystem).connectTo(createParticleBlock.emitPower);
+    _CreateParticleSizeBlockGroup(oldSystem, context).connectTo(createParticleBlock.size);
+    _CreateParticleScaleBlockGroup(oldSystem, context).connectTo(createParticleBlock.scale);
+    _CreateParticleAngleBlockGroup(oldSystem).connectTo(createParticleBlock.angle);
+    _CreateParticleColorBlockGroup(oldSystem, context).connectTo(createParticleBlock.color);
     // Dead color
     _CreateAndConnectInput("Dead Color", oldSystem.colorDead, createParticleBlock.colorDead);
-    // 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);
-    // 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);
     return createParticleBlock;
 }
 /**
  * Creates the group of blocks that represent the particle lifetime
- * @param oldSystem The old particle system to migrate
- * @param context The system migration context
+ * @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
  */
 function _CreateParticleLifetimeBlockGroup(oldSystem, context) {
     if (oldSystem.targetStopDuration && oldSystem._lifeTimeGradients && oldSystem._lifeTimeGradients.length > 0) {
         context.timeToStopTimeRatioBlockGroupOutput = _CreateTimeToStopTimeRatioBlockGroup(oldSystem, context);
-        const gradientBlockGroupOutput = _CreateGradientBlockGroup(context.timeToStopTimeRatioBlockGroupOutput, oldSystem._lifeTimeGradients);
+        const gradientBlockGroupOutput = _CreateGradientBlockGroup(context.timeToStopTimeRatioBlockGroupOutput, oldSystem._lifeTimeGradients, ParticleRandomBlockLocks.PerParticle, "Lifetime");
         return gradientBlockGroupOutput;
     }
     else {
@@ -138,7 +119,114 @@ function _CreateParticleLifetimeBlockGroup(oldSystem, context) {
         return randomLifetimeBlock.output;
     }
 }
-function _CreateEmitterShapeBlock(oldSystem) {
+/**
+ * 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 size
+ */
+function _CreateParticleSizeBlockGroup(oldSystem, context) {
+    if (oldSystem._sizeGradients && oldSystem._sizeGradients.length > 0) {
+        context.sizeGradientValue0Output = _CreateParticleInitialValueFromGradient(oldSystem._sizeGradients);
+        return context.sizeGradientValue0Output;
+    }
+    else {
+        const randomSizeBlock = new ParticleRandomBlock("Random size");
+        _CreateAndConnectInput("Min size", oldSystem.minSize, randomSizeBlock.min);
+        _CreateAndConnectInput("Max size", oldSystem.maxSize, randomSizeBlock.max);
+        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");
+    _CreateAndConnectInput("Min Scale", new Vector2(oldSystem.minScaleX, oldSystem.minScaleY), randomScaleBlock.min);
+    _CreateAndConnectInput("Max Scale", new Vector2(oldSystem.maxScaleX, oldSystem.maxScaleY), randomScaleBlock.max);
+    if (oldSystem.targetStopDuration && oldSystem._startSizeGradients && oldSystem._startSizeGradients.length > 0) {
+        // Create the start size gradient
+        context.timeToStopTimeRatioBlockGroupOutput = _CreateTimeToStopTimeRatioBlockGroup(oldSystem, context);
+        const gradientBlockGroupOutput = _CreateGradientBlockGroup(context.timeToStopTimeRatioBlockGroupOutput, oldSystem._startSizeGradients, ParticleRandomBlockLocks.PerParticle, "Start Size");
+        // Multiply the initial random scale by the start size gradient
+        const multiplyScaleBlock = new ParticleMathBlock("Multiply Scale by Start Size Gradient");
+        multiplyScaleBlock.operation = ParticleMathBlockOperations.Multiply;
+        randomScaleBlock.output.connectTo(multiplyScaleBlock.left);
+        gradientBlockGroupOutput.connectTo(multiplyScaleBlock.right);
+        return multiplyScaleBlock.output;
+    }
+    else {
+        return randomScaleBlock.output;
+    }
+}
+/**
+ * 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;
+    }
+}
+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 0");
+        randomBlock.lockMode = ParticleRandomBlockLocks.OncePerParticle;
+        _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 = value1;
+        return sizeBlock.output;
+    }
+}
+// ------------- EMITTER SHAPE FUNCTIONS -------------
+function _EmitterShapeBlock(oldSystem) {
     const emitter = oldSystem.particleEmitterType;
     if (!emitter) {
         throw new Error("Particle system has no emitter type.");
@@ -263,36 +351,93 @@ function _CreateEmitterShapeBlock(oldSystem) {
     }
     return shapeBlock;
 }
-function _CreateUpdateSystem(inputParticle, oldSystem) {
-    let outputUpdate = inputParticle;
-    if (oldSystem.minAngularSpeed !== 0 || oldSystem.maxAngularSpeed !== 0) {
-        outputUpdate = _CreateAngularSpeedUpdate(outputUpdate, oldSystem.minAngularSpeed, oldSystem.maxAngularSpeed);
+// ------------- UPDATE PARTICLE FUNCTIONS -------------
+/**
+ * Creates the group of blocks that represent the particle system update
+ * The creation of the different properties follows the order they are added to the ProcessQueue in ThinParticleSystem:
+ * Color, AngularSpeedGradients, AngularSpeed, VelocityGradients, Direction, LimitVelocityGradients, DragGradients, Position, Noise, SizeGradients, Gravity, RemapGradients
+ * @param inputParticle The particle input connection point
+ * @param oldSystem The old particle system to convert
+ * @param context The runtime conversion context
+ * @returns The output connection point after all updates have been applied
+ */
+function _UpdateParticleBlockGroup(inputParticle, oldSystem, context) {
+    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) {
+        updateBlockGroupOutput = _UpdateParticleSizeGradientBlockGroup(updateBlockGroupOutput, oldSystem._sizeGradients, context);
     }
-    outputUpdate = _CreatePositionUpdate(outputUpdate, oldSystem.isLocal);
     if (oldSystem.gravity.equalsToFloats(0, 0, 0) === false) {
-        outputUpdate = _CreateGravityUpdate(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);
     }
-    return outputUpdate;
+    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;
+    }
+}
+function _UpdateParticleAngularSpeedGradientBlockGroup(angularSpeedGradients, context) {
+    context.ageToLifeTimeRatioBlockGroupOutput = _CreateAgeToLifeTimeRatioBlockGroup(context);
+    // Generate the gradient
+    const angularSpeedValueOutput = _CreateGradientBlockGroup(context.ageToLifeTimeRatioBlockGroupOutput, angularSpeedGradients, ParticleRandomBlockLocks.OncePerParticle, "Angular Speed");
+    return angularSpeedValueOutput;
 }
-function _CreateAngularSpeedUpdate(inputParticle, minAngularSpeed, maxAngularSpeed) {
+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 _CreatePositionUpdate(inputParticle, isLocal) {
+function _UpdateParticlePositionBlockGroup(inputParticle, isLocal) {
     // Update the particle position
     const updatePosition = new UpdatePositionBlock("Position Update");
     inputParticle.connectTo(updatePosition.particle);
@@ -309,7 +454,22 @@ function _CreatePositionUpdate(inputParticle, isLocal) {
     }
     return updatePosition.output;
 }
-function _CreateGravityUpdate(inputParticle, gravity) {
+function _UpdateParticleSizeGradientBlockGroup(inputParticle, sizeGradients, context) {
+    if (context.sizeGradientValue0Output === undefined) {
+        throw new Error("Initial size gradient values not found in context.");
+    }
+    context.ageToLifeTimeRatioBlockGroupOutput = _CreateAgeToLifeTimeRatioBlockGroup(context);
+    // Generate the gradient
+    const sizeValueOutput = _CreateGradientBlockGroup(context.ageToLifeTimeRatioBlockGroupOutput, sizeGradients, ParticleRandomBlockLocks.OncePerParticle, "Size", [
+        context.sizeGradientValue0Output,
+    ]);
+    // Create the update size
+    const updateSizeBlock = new UpdateSizeBlock("Size Update");
+    inputParticle.connectTo(updateSizeBlock.particle);
+    sizeValueOutput.connectTo(updateSizeBlock.size);
+    return updateSizeBlock.output;
+}
+function _UpdateParticleGravityBlockGroup(inputParticle, gravity) {
     // Create the gravity delta
     const gravityDeltaOutput = _CreateDeltaModifiedInput("Gravity", gravity);
     // Add it to the direction
@@ -323,90 +483,17 @@ function _CreateGravityUpdate(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;
@@ -416,8 +503,9 @@ 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) {
     const multiplyBlock = new ParticleMathBlock("Multiply by Delta");
     multiplyBlock.operation = ParticleMathBlockOperations.Multiply;
@@ -448,8 +536,8 @@ function _CreateAndConnectSystemSource(systemBlockName, systemSource, targetToCo
 /**
  * Creates the target stop duration input block, as it can be shared in multiple places
  * This block is stored in the context so the same block is shared in the graph
- * @param oldSystem The old particle system to migrate
- * @param context The system migration context
+ * @param oldSystem The old particle system to convert
+ * @param context The context of the current conversion
  * @returns
  */
 function _CreateTargetStopDurationInputBlock(oldSystem, context) {
@@ -468,8 +556,8 @@ function _CreateTargetStopDurationInputBlock(oldSystem, context) {
  * Create a group of blocks that calculates the ratio between the actual frame and the target stop duration, clamped between 0 and 1.
  * This is used to simulate the behavior of the old particle system where several particle gradient values are affected by the target stop duration.
  * This block group is stored in the context so the same group is shared in the graph
- * @param oldSystem The old particle system to migrate
- * @param context The system migration context
+ * @param oldSystem The old particle system to convert
+ * @param context The context of the current conversion
  * @returns The ratio block output connection point
  */
 function _CreateTimeToStopTimeRatioBlockGroup(oldSystem, context) {
@@ -497,19 +585,45 @@ function _CreateTimeToStopTimeRatioBlockGroup(oldSystem, context) {
     context.timeToStopTimeRatioBlockGroupOutput = clampMax.output;
     return context.timeToStopTimeRatioBlockGroupOutput;
 }
+function _CreateAgeToLifeTimeRatioBlockGroup(context) {
+    // If we have already generated this group, return it
+    if (context.ageToLifeTimeRatioBlockGroupOutput) {
+        return context.ageToLifeTimeRatioBlockGroupOutput;
+    }
+    // Find the ratio between the age and the lifetime
+    const ratio = new ParticleMathBlock("Age/LifeTime Ratio");
+    ratio.operation = ParticleMathBlockOperations.Divide;
+    _CreateAndConnectContextualSource("Age", NodeParticleContextualSources.Age, ratio.left);
+    _CreateAndConnectContextualSource("LifeTime", NodeParticleContextualSources.Lifetime, ratio.right);
+    // Save the group output in our context to avoid regenerating it again
+    context.ageToLifeTimeRatioBlockGroupOutput = ratio.output;
+    return ratio.output;
+}
 /**
  * Creates the blocks that represent a gradient
  * @param gradientSelector The value that determines which gradient to use
  * @param gradientValues The list of gradient values
+ * @param randomLockMode The type of random to use for the gradient values
+ * @param prefix The prefix to use for naming the blocks
+ * @param initialValues Optional initial values to connect to the gradient inputs that were calculated during other steps of the conversion
  * @returns The output connection point of the gradient block
  */
-function _CreateGradientBlockGroup(gradientSelector, gradientValues) {
+function _CreateGradientBlockGroup(gradientSelector, gradientValues, randomLockMode, prefix, initialValues = []) {
     // Create the gradient block and connect the value that controls the gradient selection
-    const gradientBlock = new ParticleGradientBlock("Gradient Block");
+    const gradientBlock = new ParticleGradientBlock(prefix + " Gradient Block");
     gradientSelector.connectTo(gradientBlock.gradient);
+    // If initial values are provided, we use them instead of the values in the gradientValues array
+    // These means this values were already transformed into blocks on a previous step of the conversion and we must reuse them
+    for (let i = 0; i < initialValues.length; i++) {
+        const reference = i < gradientValues.length ? gradientValues[i].gradient : 1;
+        const gradientValueBlock = new ParticleGradientValueBlock(prefix + " Gradient Value " + i);
+        gradientValueBlock.reference = reference;
+        initialValues[i].connectTo(gradientValueBlock.value);
+        gradientValueBlock.output.connectTo(gradientBlock.inputs[i + 1]);
+    }
     // Create the gradient values
-    for (let i = 0; i < gradientValues.length; i++) {
-        const gradientValueBlockGroupOutput = _CreateGradientValueBlockGroup(gradientValues[i], i);
+    for (let i = 0 + initialValues.length; i < gradientValues.length; i++) {
+        const gradientValueBlockGroupOutput = _CreateGradientValueBlockGroup(gradientValues[i], randomLockMode, prefix, i);
         gradientValueBlockGroupOutput.connectTo(gradientBlock.inputs[i + 1]);
     }
     return gradientBlock.output;
@@ -518,23 +632,27 @@ function _CreateGradientBlockGroup(gradientSelector, gradientValues) {
  * Creates the blocks that represent a gradient value
  * This can be either a single value or a random between two values
  * @param gradientStep The gradient step data
+ * @param randomLockMode The lock mode to use for random values
+ * @param prefix The prefix to use for naming the blocks
  * @param index The index of the gradient step
  * @returns The output connection point of the gradient value block
  */
-function _CreateGradientValueBlockGroup(gradientStep, index) {
-    const gradientValueBlock = new ParticleGradientValueBlock("Gradient Value " + index);
+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 Gradient Value " + index);
-        randomBlock.lockMode = ParticleRandomBlockLocks.PerParticle;
-        _CreateAndConnectInput("Value 1", gradientStep.factor1, randomBlock.min);
-        _CreateAndConnectInput("Value 2", gradientStep.factor2, randomBlock.max);
+        const randomBlock = new ParticleRandomBlock("Random Value " + index);
+        randomBlock.lockMode = randomLockMode;
+        _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;
 }