Fix color being overwritten by Createparticle (#17027)

Co-authored-by: David Catuhe <[email protected]>

Author: deltakosh

.build/config.json

@@ -1,5 +1,5 @@
 {
-  "versionDefinition": "minor",
-  "preid": "rc",
-  "nonce": 404
-}
+    "versionDefinition": "patch",
+    "preid": "rc",
+    "nonce": 405
+}

packages/dev/core/src/Particles/Node/Blocks/Emitters/createParticleBlock.ts

@@ -100,6 +100,7 @@ export class CreateParticleBlock extends NodeParticleBlock {
         system._colorCreation.process = (particle: Particle) => {
             state.particleContext = particle;
             particle.color.copyFrom(this.color.getConnectedValue(state));
+            particle.colorStep.copyFrom(particle.color);
         };
 
         system._sizeCreation.process = (particle: Particle) => {

packages/dev/core/src/Particles/Node/Blocks/Emitters/meshShapeBlock.ts

@@ -42,6 +42,12 @@ export class MeshShapeBlock extends NodeParticleBlock implements IShapeBlock {
     @editableInPropertyPage("Use vertex color for color", PropertyTypeForEdition.Boolean, "ADVANCED", { embedded: true, notifiers: { rebuild: true } })
     public useMeshColorForColor = false;
 
+    /**
+     * Gets or sets a boolean indicating if the coordinates should be in world space (local space by default)
+     */
+    @editableInPropertyPage("World space", PropertyTypeForEdition.Boolean, "ADVANCED", { embedded: true, notifiers: { rebuild: true } })
+    public worldSpace = false;
+
     /**
      * Gets or sets the mesh to use to get vertex data
      */
@@ -143,6 +149,10 @@ export class MeshShapeBlock extends NodeParticleBlock implements IShapeBlock {
         this._normals = this._cachedVertexData.normals;
         this._colors = this._cachedVertexData.colors;
 
+        if (this.useMeshColorForColor && this._colors) {
+            system._colorCreation.process = () => {};
+        }
+
         system._directionCreation.process = (particle: Particle) => {
             state.particleContext = particle;
             state.systemContext = system;
@@ -196,6 +206,10 @@ export class MeshShapeBlock extends NodeParticleBlock implements IShapeBlock {
             randomVertex.y = bu * vertexA.y + bv * vertexB.y + bw * vertexC.y;
             randomVertex.z = bu * vertexA.z + bv * vertexB.z + bw * vertexC.z;
 
+            if (this.worldSpace && this.mesh) {
+                Vector3.TransformCoordinatesFromFloatsToRef(randomVertex.x, randomVertex.y, randomVertex.z, this.mesh.getWorldMatrix(), randomVertex);
+            }
+
             if (state.isEmitterTransformNode) {
                 Vector3.TransformCoordinatesFromFloatsToRef(randomVertex.x, randomVertex.y, randomVertex.z, state.emitterWorldMatrix!, particle.position);
             } else {
@@ -223,6 +237,8 @@ export class MeshShapeBlock extends NodeParticleBlock implements IShapeBlock {
                     bu * TmpVectors.Vector4[0].z + bv * TmpVectors.Vector4[1].z + bw * TmpVectors.Vector4[2].z,
                     bu * TmpVectors.Vector4[0].w + bv * TmpVectors.Vector4[1].w + bw * TmpVectors.Vector4[2].w
                 );
+
+                particle.colorStep.copyFrom(particle.color);
             }
         };
 
@@ -247,6 +263,7 @@ export class MeshShapeBlock extends NodeParticleBlock implements IShapeBlock {
 
         serializationObject.useMeshNormalsForDirection = this.useMeshNormalsForDirection;
         serializationObject.useMeshColorForColor = this.useMeshColorForColor;
+        serializationObject.worldSpace = this.worldSpace;
 
         return serializationObject;
     }
@@ -261,6 +278,7 @@ export class MeshShapeBlock extends NodeParticleBlock implements IShapeBlock {
         this.serializedCachedData = !!serializationObject.serializedCachedData;
         this.useMeshNormalsForDirection = !!serializationObject.useMeshNormalsForDirection;
         this.useMeshColorForColor = !!serializationObject.useMeshColorForColor;
+        this.worldSpace = !!serializationObject.worldSpace;
     }
 }
 

packages/dev/core/src/Particles/Node/Blocks/particleInputBlock.ts

@@ -136,6 +136,7 @@ export class ParticleInputBlock extends NodeParticleBlock {
                     this._type = NodeParticleBlockConnectionPointTypes.Vector3;
                     break;
                 case NodeParticleContextualSources.Color:
+                case NodeParticleContextualSources.InitialColor:
                     this._type = NodeParticleBlockConnectionPointTypes.Color4;
                     break;
                 case NodeParticleContextualSources.Age:

packages/dev/core/src/Particles/Node/Enums/nodeParticleContextualSources.ts

@@ -29,4 +29,6 @@ export enum NodeParticleContextualSources {
     SpriteCellStart = 0x0011,
     /** SpriteCellEnd */
     SpriteCellEnd = 0x0012,
+    /** Initial Color */
+    InitialColor = 0x0013,
 }

packages/dev/core/src/Particles/Node/nodeParticleBuildState.ts

@@ -119,6 +119,8 @@ export class NodeParticleBuildState {
                 return this.systemContext._scaledDirection;
             case NodeParticleContextualSources.Color:
                 return this.particleContext.color;
+            case NodeParticleContextualSources.InitialColor:
+                return this.particleContext.colorStep;
             case NodeParticleContextualSources.Age:
                 return this.particleContext.age;
             case NodeParticleContextualSources.Lifetime:

packages/tools/nodeParticleEditor/src/blockTools.ts

@@ -176,6 +176,11 @@ export class BlockTools {
                 block.contextualValue = NodeParticleContextualSources.Color;
                 return block;
             }
+            case "InitialColorBlock": {
+                const block = new ParticleInputBlock("Initial Color");
+                block.contextualValue = NodeParticleContextualSources.InitialColor;
+                return block;
+            }
             case "AgeBlock": {
                 const block = new ParticleInputBlock("Age");
                 block.contextualValue = NodeParticleContextualSources.Age;

packages/tools/nodeParticleEditor/src/components/nodeList/nodeListComponent.tsx

@@ -51,6 +51,7 @@ export class NodeListComponent extends React.Component<INodeListComponentProps,
         DirectionBlock: "Contextual block to get the direction of a particle",
         ScaledDirectionBlock: "Contextual block to get the scaled direction of a particle",
         ColorBlock: "Contextual block to get the color of a particle",
+        InitialColorBlock: "Contextual block to get the initial color of a particle",
         AgeBlock: "Contextual block to get the age of a particle",
         AngleBlock: "Contextual block to get the angle of a particle",
         LifetimeBlock: "Contextual block to get the lifetime of a particle",
@@ -260,6 +261,7 @@ export class NodeListComponent extends React.Component<INodeListComponentProps,
                 "ScaleBlock",
                 "AgeGradientBlock",
                 "AngleBlock",
+                "InitialColorBlock",
                 "SpriteCellEndBlock",
                 "SpriteCellStartBlock",
                 "SpriteCellIndexBlock",

packages/tools/nodeParticleEditor/src/graphSystem/display/inputDisplayManager.ts

@@ -98,6 +98,9 @@ export class InputDisplayManager implements IDisplayManager {
                 case NodeParticleContextualSources.Color:
                     value = "Color";
                     break;
+                case NodeParticleContextualSources.InitialColor:
+                    value = "Initial Color";
+                    break;
                 case NodeParticleContextualSources.SpriteCellEnd:
                     value = "Sprite Cell End";
                     break;

packages/tools/nodeParticleEditor/src/graphSystem/properties/inputNodePropertyComponent.tsx

@@ -147,7 +147,10 @@ export class InputPropertyTabComponent extends React.Component<IPropertyComponen
                 systemSourcesOptions = [{ label: "Emitter", value: NodeParticleSystemSources.Emitter }];
                 break;
             case NodeParticleBlockConnectionPointTypes.Color4:
-                contextualSourcesOptions = [{ label: "Color", value: NodeParticleContextualSources.Color }];
+                contextualSourcesOptions = [
+                    { label: "Color", value: NodeParticleContextualSources.Color },
+                    { label: "Initial Color", value: NodeParticleContextualSources.InitialColor },
+                ];
                 break;
         }