From b547dc33393c4396e75c646b6926a9c44dfc5252 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 21 May 2023 11:03:43 +0100
Subject: [PATCH] Rename

---
 src/pipelines/render/render-pipeline.ts | 8 ++++----
 src/pipelines/render/render-settings.ts | 4 ++--
 src/pipelines/render/render.wgsl        | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/pipelines/render/render-pipeline.ts b/src/pipelines/render/render-pipeline.ts
index d3bed53..113d9fe 100644
--- a/src/pipelines/render/render-pipeline.ts
+++ b/src/pipelines/render/render-pipeline.ts
@@ -53,8 +53,8 @@ export class RenderPipeline {
 
   public setParameters({
     brushColor,
-    speciesColorA,
-    speciesColorB,
+    speciesAColor,
+    speciesBColor,
     clarity,
   }: RenderSettings) {
     this.device.queue.writeBuffer(
@@ -63,9 +63,9 @@ export class RenderPipeline {
       new Float32Array([
         ...brushColor,
         0, //padding
-        ...speciesColorA,
+        ...speciesAColor,
         0, //padding
-        ...speciesColorB,
+        ...speciesBColor,
         clarity,
       ])
     );
diff --git a/src/pipelines/render/render-settings.ts b/src/pipelines/render/render-settings.ts
index 8774148..e0f638f 100644
--- a/src/pipelines/render/render-settings.ts
+++ b/src/pipelines/render/render-settings.ts
@@ -2,7 +2,7 @@ import { vec3 } from 'gl-matrix';
 
 export interface RenderSettings {
   brushColor: vec3;
-  speciesColorA: vec3;
-  speciesColorB: vec3;
+  speciesAColor: vec3;
+  speciesBColor: vec3;
   clarity: number;
 }
diff --git a/src/pipelines/render/render.wgsl b/src/pipelines/render/render.wgsl
index aef8c28..563b39c 100644
--- a/src/pipelines/render/render.wgsl
+++ b/src/pipelines/render/render.wgsl
@@ -1,7 +1,7 @@
 struct Settings {
   brushColor: vec3<f32>,
-  speciesColorA: vec3<f32>,
-  speciesColorB: vec3<f32>,
+  speciesAColor: vec3<f32>,
+  speciesBColor: vec3<f32>,
   clarity: f32,
 };
 
@@ -20,7 +20,7 @@ fn fragment(@location(0) uv: vec2<f32>) -> @location(0) vec4<f32> {
   let speciesBStrength = clamp(pow(traces.g, settings.clarity), 0, 1);
   let brushStrength = traces.a;
 
-  let agentColor =  settings.speciesColorA * speciesAStrength + settings.speciesColorB * speciesBStrength;
+  let agentColor = step(speciesAStrength, speciesBStrength) * settings.speciesBColor * speciesBStrength + step(speciesBStrength, speciesAStrength) * settings.speciesAColor * speciesAStrength;
   let agentStrength = speciesAStrength + speciesBStrength;
 
   let rgbColor = sqrt(