From ca4484727f2031c1e6d8789f3adb7f2b9d4c512a Mon Sep 17 00:00:00 2001
From: Simon Schneegans <code@simonschneegans.de>
Date: Mon, 13 Jun 2022 06:27:10 +0200
Subject: [PATCH] :wrench: Use RGB for wisps color

---
 kwin/wisps/onSettingsChanged.js | 2 +-
 resources/shaders/wisps.frag    | 4 ++--
 src/Wisps.js                    | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/kwin/wisps/onSettingsChanged.js b/kwin/wisps/onSettingsChanged.js
index a7845fc..6d55e65 100644
--- a/kwin/wisps/onSettingsChanged.js
+++ b/kwin/wisps/onSettingsChanged.js
@@ -4,4 +4,4 @@
 
 effect.setUniform(this.shader, 'uDuration', this.duration * 0.001);
 effect.setUniform(this.shader, 'uScale', effect.readConfig('Scale', 1.0));
-effect.setUniform(this.shader, 'uColor', this.readRGBAConfig('Color'));
+effect.setUniform(this.shader, 'uColor', this.readRGBConfig('Color'));
diff --git a/resources/shaders/wisps.frag b/resources/shaders/wisps.frag
index 11daf9a..4550715 100644
--- a/resources/shaders/wisps.frag
+++ b/resources/shaders/wisps.frag
@@ -14,7 +14,7 @@
 // The content from common.glsl is automatically prepended to each shader effect.
 
 uniform vec2 uSeed;
-uniform vec4 uColor;
+uniform vec3 uColor;
 uniform float uScale;
 
 const float WISPS_RADIUS    = 20.0;
@@ -99,7 +99,7 @@ void main() {
   oColor.a *= windowMask * mask;
 
   // Add the wisps.
-  vec4 wispColor = wisps * vec4(uColor.rgb, min(wispsIn, 1.0 - wispsOut) * mask);
+  vec4 wispColor = wisps * vec4(uColor, min(wispsIn, 1.0 - wispsOut) * mask);
   oColor         = alphaOver(oColor, wispColor);
 
   // These are pretty useful for understanding how this works.
diff --git a/src/Wisps.js b/src/Wisps.js
index 69f09e6..bb6919e 100644
--- a/src/Wisps.js
+++ b/src/Wisps.js
@@ -58,7 +58,7 @@ var Wisps = class {
 
         // clang-format off
         shader.set_uniform_float(shader._uSeed,  2, [testMode ? 0 : Math.random(), testMode ? 0 : Math.random()]);
-        shader.set_uniform_float(shader._uColor, 4, [c.red / 255, c.green / 255, c.blue / 255, 1.0]);
+        shader.set_uniform_float(shader._uColor, 3, [c.red / 255, c.green / 255, c.blue / 255]);
         shader.set_uniform_float(shader._uScale, 1, [settings.get_double('wisps-scale')]);
         // clang-format on
       });