@onerjs/core 8.31.0 → 8.31.2

package/Particles/Node/nodeParticleSystemSet.helper.js

@@ -10,6 +10,8 @@ import { ParticleMathBlock, ParticleMathBlockOperations } from "./Blocks/particl
 import { ParticleRandomBlock, ParticleRandomBlockLocks } from "./Blocks/particleRandomBlock.js";
 import { ParticleTextureSourceBlock } from "./Blocks/particleSourceTextureBlock.js";
 import { SystemBlock } from "./Blocks/systemBlock.js";
+import { ParticleVectorLengthBlock } from "./Blocks/particleVectorLengthBlock.js";
+import { ParticleConditionBlock, ParticleConditionBlockTests } from "./Blocks/Conditions/particleConditionBlock.js";
 import { CreateParticleBlock } from "./Blocks/Emitters/createParticleBlock.js";
 import { BoxShapeBlock } from "./Blocks/Emitters/boxShapeBlock.js";
 import { ConeShapeBlock } from "./Blocks/Emitters/coneShapeBlock.js";
@@ -42,19 +44,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 +88,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, Color, 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 +121,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 +150,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 +176,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,38 +364,184 @@ 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);
+    let updateBlockGroupOutput = inputParticle;
+    updateBlockGroupOutput = _UpdateParticleColorBlockGroup(updateBlockGroupOutput, oldSystem._colorGradients, context);
+    updateBlockGroupOutput = _UpdateParticleAngleBlockGroup(updateBlockGroupOutput, oldSystem, context);
+    if (oldSystem._velocityGradients && oldSystem._velocityGradients.length > 0) {
+        context.scaledDirection = _UpdateParticleVelocityGradientBlockGroup(oldSystem._velocityGradients, context);
+    }
+    if (oldSystem._dragGradients && oldSystem._dragGradients.length > 0) {
+        context.scaledDirection = _UpdateParticleDragGradientBlockGroup(oldSystem._dragGradients, context);
+    }
+    updateBlockGroupOutput = _UpdateParticlePositionBlockGroup(updateBlockGroupOutput, oldSystem.isLocal, context);
+    if (oldSystem._limitVelocityGradients && oldSystem._limitVelocityGradients.length > 0 && oldSystem.limitVelocityDamping !== 0) {
+        updateBlockGroupOutput = _UpdateParticleVelocityLimitGradientBlockGroup(updateBlockGroupOutput, oldSystem._limitVelocityGradients, oldSystem.limitVelocityDamping, context);
     }
-    outputUpdate = _UpdateParticlePositionBlockGroup(outputUpdate, 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 outputUpdate;
+    return updateBlockGroupOutput;
 }
-function _UpdateParticleAngularSpeedBlockGroup(inputParticle, minAngularSpeed, maxAngularSpeed) {
-    // Random value between for the angular speed of the particle
-    const randomAngularSpeedBlock = new ParticleRandomBlock("Random Angular Speed");
-    _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;
-}
-function _UpdateParticlePositionBlockGroup(inputParticle, isLocal) {
+/**
+ * Creates the group of blocks that represent the particle color update
+ * @param inputParticle The input particle to update
+ * @param colorGradients The color gradients (if any)
+ * @param context The context of the current conversion
+ * @returns The output of the group of blocks that represent the particle color update
+ */
+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 = _BasicColorUpdateBlockGroup();
+    }
+    // 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;
+}
+/**
+ * Creates the group of blocks that represent the particle angle update
+ * @param inputParticle The input particle to update
+ * @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 update
+ */
+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;
+    }
+}
+/**
+ * Creates the group of blocks that represent the particle velocity update
+ * @param velocityGradients The velocity gradients
+ * @param context The context of the current conversion
+ * @returns The output of the group of blocks that represent the particle velocity update
+ */
+function _UpdateParticleVelocityGradientBlockGroup(velocityGradients, context) {
+    context.ageToLifeTimeRatioBlockGroupOutput = _CreateAgeToLifeTimeRatioBlockGroup(context);
+    // Generate the gradient
+    const velocityValueOutput = _CreateGradientBlockGroup(context.ageToLifeTimeRatioBlockGroupOutput, velocityGradients, ParticleRandomBlockLocks.OncePerParticle, "Velocity");
+    // Update the direction scale based on the velocity
+    const multiplyScaleByVelocity = new ParticleMathBlock("Multiply Direction Scale by Velocity");
+    multiplyScaleByVelocity.operation = ParticleMathBlockOperations.Multiply;
+    velocityValueOutput.connectTo(multiplyScaleByVelocity.left);
+    _CreateAndConnectContextualSource("Direction Scale", NodeParticleContextualSources.DirectionScale, multiplyScaleByVelocity.right);
+    // Update the particle direction scale
+    const multiplyDirection = new ParticleMathBlock("Scaled Direction");
+    multiplyDirection.operation = ParticleMathBlockOperations.Multiply;
+    multiplyScaleByVelocity.output.connectTo(multiplyDirection.left);
+    _CreateAndConnectContextualSource("Direction", NodeParticleContextualSources.Direction, multiplyDirection.right);
+    // Store the new calculation of the scaled direction in the context
+    context.scaledDirection = multiplyDirection.output;
+    return multiplyDirection.output;
+}
+/**
+ * Creates the group of blocks that represent the particle velocity limit update
+ * @param inputParticle The input particle to update
+ * @param velocityLimitGradients The velocity limit gradients
+ * @param limitVelocityDamping The limit velocity damping factor
+ * @param context The context of the current conversion
+ * @returns The output of the group of blocks that represent the particle velocity limit update
+ */
+function _UpdateParticleVelocityLimitGradientBlockGroup(inputParticle, velocityLimitGradients, limitVelocityDamping, context) {
+    context.ageToLifeTimeRatioBlockGroupOutput = _CreateAgeToLifeTimeRatioBlockGroup(context);
+    // Calculate the current speed
+    const currentSpeedBlock = new ParticleVectorLengthBlock("Current Speed");
+    _CreateAndConnectContextualSource("Direction", NodeParticleContextualSources.Direction, currentSpeedBlock.input);
+    // Calculate the velocity limit from the gradient
+    const velocityLimitValueOutput = _CreateGradientBlockGroup(context.ageToLifeTimeRatioBlockGroupOutput, velocityLimitGradients, ParticleRandomBlockLocks.OncePerParticle, "Velocity Limit");
+    // Blocks that will calculate the new velocity if over the limit
+    const damped = new ParticleMathBlock("Damped Speed");
+    damped.operation = ParticleMathBlockOperations.Multiply;
+    _CreateAndConnectContextualSource("Direction", NodeParticleContextualSources.Direction, damped.left);
+    _CreateAndConnectInput("Limit Velocity Damping", limitVelocityDamping, damped.right);
+    // Compare current speed and limit
+    const compareSpeed = new ParticleConditionBlock("Compare Speed to Limit");
+    compareSpeed.test = ParticleConditionBlockTests.GreaterThan;
+    currentSpeedBlock.output.connectTo(compareSpeed.left);
+    velocityLimitValueOutput.connectTo(compareSpeed.right);
+    damped.output.connectTo(compareSpeed.ifTrue);
+    _CreateAndConnectContextualSource("Direction", NodeParticleContextualSources.Direction, compareSpeed.ifFalse);
+    // Update the direction based on the calculted value
+    const updateDirection = new UpdateDirectionBlock("Direction Update");
+    inputParticle.connectTo(updateDirection.particle);
+    compareSpeed.output.connectTo(updateDirection.direction);
+    return updateDirection.output;
+}
+/**
+ * Creates the group of blocks that represent the particle drag update
+ * @param dragGradients The drag gradients
+ * @param context The context of the current conversion
+ * @returns The output of the group of blocks that represent the particle drag update
+ */
+function _UpdateParticleDragGradientBlockGroup(dragGradients, context) {
+    context.ageToLifeTimeRatioBlockGroupOutput = _CreateAgeToLifeTimeRatioBlockGroup(context);
+    // Generate the gradient
+    const dragValueOutput = _CreateGradientBlockGroup(context.ageToLifeTimeRatioBlockGroupOutput, dragGradients, ParticleRandomBlockLocks.OncePerParticle, "Drag");
+    // Calculate drag factor
+    const oneMinusDragBlock = new ParticleMathBlock("1 - Drag");
+    oneMinusDragBlock.operation = ParticleMathBlockOperations.Subtract;
+    _CreateAndConnectInput("One", 1, oneMinusDragBlock.left);
+    dragValueOutput.connectTo(oneMinusDragBlock.right);
+    // Multiply the scaled direction by drag factor
+    const multiplyDirection = new ParticleMathBlock("Scaled Direction with Drag");
+    multiplyDirection.operation = ParticleMathBlockOperations.Multiply;
+    oneMinusDragBlock.output.connectTo(multiplyDirection.left);
+    if (context.scaledDirection === undefined) {
+        _CreateAndConnectContextualSource("Scaled Direction", NodeParticleContextualSources.ScaledDirection, multiplyDirection.right);
+    }
+    else {
+        context.scaledDirection.connectTo(multiplyDirection.right);
+    }
+    // Store the new calculation of the scaled direction in the context
+    context.scaledDirection = multiplyDirection.output;
+    return multiplyDirection.output;
+}
+/**
+ * Creates the group of blocks that represent the particle position update
+ * @param inputParticle The input particle to update
+ * @param isLocal Whether the particle coordinate system is local or not
+ * @param context The context of the current conversion
+ * @returns The output of the group of blocks that represent the particle position update
+ */
+function _UpdateParticlePositionBlockGroup(inputParticle, isLocal, context) {
     // Update the particle position
     const updatePosition = new UpdatePositionBlock("Position Update");
     inputParticle.connectTo(updatePosition.particle);
@@ -375,11 +553,23 @@ function _UpdateParticlePositionBlockGroup(inputParticle, isLocal) {
         const addPositionBlock = new ParticleMathBlock("Add Position");
         addPositionBlock.operation = ParticleMathBlockOperations.Add;
         _CreateAndConnectContextualSource("Position", NodeParticleContextualSources.Position, addPositionBlock.left);
-        _CreateAndConnectContextualSource("Scaled Direction", NodeParticleContextualSources.ScaledDirection, addPositionBlock.right);
+        if (context.scaledDirection === undefined) {
+            _CreateAndConnectContextualSource("Scaled Direction", NodeParticleContextualSources.ScaledDirection, addPositionBlock.right);
+        }
+        else {
+            context.scaledDirection.connectTo(addPositionBlock.right);
+        }
         addPositionBlock.output.connectTo(updatePosition.position);
     }
     return updatePosition.output;
 }
+/**
+ * Creates the group of blocks that represent the particle size update
+ * @param inputParticle The input particle to update
+ * @param sizeGradients The size gradients (if any)
+ * @param context The context of the current conversion
+ * @returns The output of the group of blocks that represent the particle size update
+ */
 function _UpdateParticleSizeGradientBlockGroup(inputParticle, sizeGradients, context) {
     if (context.sizeGradientValue0Output === undefined) {
         throw new Error("Initial size gradient values not found in context.");
@@ -395,6 +585,12 @@ function _UpdateParticleSizeGradientBlockGroup(inputParticle, sizeGradients, con
     sizeValueOutput.connectTo(updateSizeBlock.size);
     return updateSizeBlock.output;
 }
+/**
+ * Creates the group of blocks that represent the particle gravity update
+ * @param inputParticle The input particle to update
+ * @param gravity The gravity vector to apply
+ * @returns The output of the group of blocks that represent the particle gravity update
+ */
 function _UpdateParticleGravityBlockGroup(inputParticle, gravity) {
     // Create the gravity delta
     const gravityDeltaOutput = _CreateDeltaModifiedInput("Gravity", gravity);
@@ -409,90 +605,31 @@ 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 _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);
+    return randomAngularSpeedBlock.output;
 }
-function _CreateBasicColorUpdate(oldSystem, createParticleBlock) {
+function _BasicColorUpdateBlockGroup() {
     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 +639,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 +776,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;
 }