clean up

src/pipelines/render/render.wgsl

@@ -58,19 +58,24 @@ fn renderColor(traces: vec4<f32>, sources: vec4<f32>, pixel: vec2<i32>) -> vec4<
       strengths.r * settings.colorA
     + strengths.g * settings.colorB
     + strengths.b * settings.colorC;
-  let normalizedTraceColor =
-    traceColor / max(settings.traceNormalizationFloor, strengths.r + strengths.g + strengths.b);
+  let normalizedTraceColor = normalizeColorIntensity(traceColor);
   let brushColor =
       sourceStrengths.r * settings.colorA
     + sourceStrengths.g * settings.colorB
     + sourceStrengths.b * settings.colorC;
+  let normalizedBrushColor = normalizeColorIntensity(brushColor);
   let brushStrength = max(max(sourceStrengths.r, sourceStrengths.g), sourceStrengths.b);
-  let color = max(
-    normalizedTraceColor,
-    brushColor * (settings.brushColorBase + brushStrength * settings.brushColorStrengthMultiplier)
+  let brushVisibility = clamp(
+    brushStrength * (
+      settings.brushColorBase +
+      brushStrength * settings.brushColorStrengthMultiplier
+    ),
+    0,
+    1
   );
+  let color = max(normalizedTraceColor, normalizedBrushColor);
 
-  let strength = max(max(strengths.r, strengths.g), strengths.b);
+  let strength = max(max(max(strengths.r, strengths.g), strengths.b), brushVisibility);
   return vec4(mix(background, clamp(color, vec3(0), vec3(1)), strength), 1);
 }
 
@@ -78,6 +83,11 @@ fn clarity(strength: f32) -> f32 {
   return pow(clamp(strength, 0, 1), settings.clarity);
 }
 
+fn normalizeColorIntensity(color: vec3<f32>) -> vec3<f32> {
+  let brightestChannel = max(max(color.r, color.g), color.b);
+  return color / max(settings.traceNormalizationFloor, brightestChannel);
+}
+
 fn getTexturedBackground(pixel: vec2<i32>) -> vec3<f32> {
   let noiseSize = vec2<i32>(textureDimensions(noise, 0));
   let noiseCoord = pixel % noiseSize;