BlueGit

timfa kwin-marble

Semiwillekeurig: float-safe uProgress packing and default MixColor=12

Pack tint id in the integer part of uProgress and morph in the fraction
(with uCrumpleEnd timing) so hue modes keep smooth float32 progress
without a second ShaderUniform. LUT/classHueCache and UI tooltips kept;
default MixColor is Semiwillekeurig for both close and minimize.

timfa Tim Falken · pushed by timfa

Authored 2026-11-06 · 11 days ago

Hash
39fd4e19fccb46c3722102e96c642b01b39f22dd
Parent
5b4690c6
10 files changed +485 −81
kwin6_effect_marble/contents/code/main.js +32 −10
@@ -85,9 +85,11 @@ class BurnMyWindowsMarbleEffect {
85 85 this.fallDuration = animationTime(Math.round(1000 * Math.sqrt(2 * this.fallDistance / this.gravity)));
86 86 effect.setUniform(this.shader, 'uDuration', (this.duration + this.pause + this.fallDuration) * 0.001);
87 87 // 0..10 named colours, 11 = Willekeurig, 12 = Semiwillekeurig. Older >12 → 12.
88 let mc = Math.floor(Number(effect.readConfig('MixColor', 0)));
88 let mc = Math.floor(Number(effect.readConfig('MixColor', 12)));
89 89 if (!(mc >= 0)) mc = 0; else if (mc > 12) mc = 12;
90 90 this.tintMode = mc;
91 // Drop per-class cache when settings reload (MixColor / speed etc. may change).
92 this.classHueCache = Object.create(null);
91 93 this.applyTint(null, false);
92 94 effect.setUniform(this.shader, 'uMarbleSize', Math.max(4, Number(effect.readConfig('MarbleSize', 42))));
93 95 this.debug = Math.max(0, Number(effect.readConfig('DebugMarble', 0)) | 0);
@@ -103,9 +105,16 @@ class BurnMyWindowsMarbleEffect {
103 105 // Mix target. tintMode 0..10 = named colours; 11 = Willekeurig (seq → hue);
104 106 // 12 = Semiwillekeurig (hash of window.windowClass → hue). Random modes use HSV
105 107 // with fixed S=1 and V=0.6667 (matches the named #aa… glass colours), not a palette.
108 // Final RGB is computed once in JS (and cached per windowClass for mode 12); the shader
109 // only indexes a precomputed hue→RGB table — never runs HSV per fragment.
110 // Single-channel pack: uProgress = tintId + morph01*0.999 (tintId 0..10 or 1000..1359).
111 // Callers may still pass overshoot m (m_to = 1/crumpleEnd); values m>=1 encode as morph=1.
112 // Shader restores timing with uCrumpleEnd: c = raw/(uCrumpleEnd*0.999). No second ShaderUniform.
106 113 prog(window, m) {
107 const v = (window.bmwBase || 0) + Math.min(4000, Math.max(0, m));
108 if (this.debug) console.log('MARBLEDBG prog caption=' + window.caption + ' m=' + m + ' v=' + v);
114 const tid = (window && window.bmwTintId >= 0) ? window.bmwTintId : (window ? (window.bmwBase || 0) : 0);
115 const morph = Math.min(1, Math.max(0, m));
116 const v = tid + morph * 0.999;
117 if (this.debug) console.log('MARBLEDBG prog caption=' + window.caption + ' m=' + m + ' morph=' + morph + ' v=' + v + ' tintId=' + tid);
109 118 return v;
110 119 }
111 120
@@ -135,10 +144,21 @@ class BurnMyWindowsMarbleEffect {
135 144 c = FIXED[this.tintMode];
136 145 if (window) { window.bmwTint = null; window.bmwHue = null; }
137 146 } else if (this.tintMode === 12 && window) {
138 // Semiwillekeurig: stable per application (windowClass); empty → black
147 // Semiwillekeurig: stable per application (windowClass); empty → black.
148 // RGB/hue computed once per class (cached); shader gets ready RGB via HUE_RGB[hue] (no per-fragment HSV).
139 149 const cls = String(window.windowClass || '').trim();
140 150 if (!cls) { c = FIXED[0]; hue = null; }
141 else { hue = this.hashHue(cls); c = this.hsvToRgb(hue, HS, HV); }
151 else {
152 if (!this.classHueCache) this.classHueCache = Object.create(null);
153 let cached = this.classHueCache[cls];
154 if (!cached) {
155 hue = this.hashHue(cls);
156 c = this.hsvToRgb(hue, HS, HV);
157 this.classHueCache[cls] = { hue: hue, rgb: c };
158 } else {
159 hue = cached.hue; c = cached.rgb;
160 }
161 }
142 162 window.bmwTint = c; window.bmwHue = hue;
143 163 } else if (window && reuse && window.bmwTint) {
144 164 c = window.bmwTint; hue = (window.bmwHue == null ? null : window.bmwHue);
@@ -153,12 +173,14 @@ class BurnMyWindowsMarbleEffect {
153 173 c = FIXED[0];
154 174 }
155 175 if (window) {
156 // Shader: tk < 11 → named table; tk >= 1000 → HSV hue = tk - 1000
157 window.bmwBase = (hue == null)
158 ? 4096 * Math.max(0, FIXED.findIndex(x => x[0] == c[0] && x[1] == c[1] && x[2] == c[2]))
159 : 4096 * (1000 + (hue | 0));
176 // Shader: tk < 11 → named table; tk >= 1000 → HUE_RGB[tk-1000].
177 // Compact id in uProgress integer part (NOT *4096 — that destroyed float32 morph precision).
178 window.bmwTintId = (hue == null)
179 ? Math.max(0, FIXED.findIndex(x => x[0] == c[0] && x[1] == c[1] && x[2] == c[2]))
180 : (1000 + (hue | 0));
181 window.bmwBase = window.bmwTintId;
160 182 }
161 if (this.debug && window) console.log('MARBLEDBG tint caption=' + window.caption + ' class=' + window.windowClass + ' seq=' + window.bmwSeq + ' hue=' + hue + ' reuse=' + reuse + ' mode=' + this.tintMode + ' base=' + window.bmwBase);
183 if (this.debug && window) console.log('MARBLEDBG tint caption=' + window.caption + ' class=' + window.windowClass + ' seq=' + window.bmwSeq + ' hue=' + hue + ' reuse=' + reuse + ' mode=' + this.tintMode + ' tintId=' + window.bmwTintId);
162 184 effect.setUniform(this.shader, 'uTintR', c[0]);
163 185 effect.setUniform(this.shader, 'uTintG', c[1]);
164 186 effect.setUniform(this.shader, 'uTintB', c[2]);
@@ -85,9 +85,11 @@ class BurnMyWindowsMarbleEffect {
85 this.fallDuration = animationTime(Math.round(1000 * Math.sqrt(2 * this.fallDistance / this.gravity)));
85 this.fallDuration = animationTime(Math.round(1000 * Math.sqrt(2 * this.fallDistance / this.gravity)));
86 effect.setUniform(this.shader, 'uDuration', (this.duration + this.pause + this.fallDuration) * 0.001);
86 effect.setUniform(this.shader, 'uDuration', (this.duration + this.pause + this.fallDuration) * 0.001);
87 // 0..10 named colours, 11 = Willekeurig, 12 = Semiwillekeurig. Older >12 → 12.
87 // 0..10 named colours, 11 = Willekeurig, 12 = Semiwillekeurig. Older >12 → 12.
88 let mc = Math.floor(Number(effect.readConfig('MixColor', 0)));
88 let mc = Math.floor(Number(effect.readConfig('MixColor', 12)));
89 if (!(mc >= 0)) mc = 0; else if (mc > 12) mc = 12;
89 if (!(mc >= 0)) mc = 0; else if (mc > 12) mc = 12;
90 this.tintMode = mc;
90 this.tintMode = mc;
91 // Drop per-class cache when settings reload (MixColor / speed etc. may change).
92 this.classHueCache = Object.create(null);
91 this.applyTint(null, false);
93 this.applyTint(null, false);
92 effect.setUniform(this.shader, 'uMarbleSize', Math.max(4, Number(effect.readConfig('MarbleSize', 42))));
94 effect.setUniform(this.shader, 'uMarbleSize', Math.max(4, Number(effect.readConfig('MarbleSize', 42))));
93 this.debug = Math.max(0, Number(effect.readConfig('DebugMarble', 0)) | 0);
95 this.debug = Math.max(0, Number(effect.readConfig('DebugMarble', 0)) | 0);
@@ -103,9 +105,16 @@ class BurnMyWindowsMarbleEffect {
103 // Mix target. tintMode 0..10 = named colours; 11 = Willekeurig (seq → hue);
105 // Mix target. tintMode 0..10 = named colours; 11 = Willekeurig (seq → hue);
104 // 12 = Semiwillekeurig (hash of window.windowClass → hue). Random modes use HSV
106 // 12 = Semiwillekeurig (hash of window.windowClass → hue). Random modes use HSV
105 // with fixed S=1 and V=0.6667 (matches the named #aa… glass colours), not a palette.
107 // with fixed S=1 and V=0.6667 (matches the named #aa… glass colours), not a palette.
108 // Final RGB is computed once in JS (and cached per windowClass for mode 12); the shader
109 // only indexes a precomputed hue→RGB table — never runs HSV per fragment.
110 // Single-channel pack: uProgress = tintId + morph01*0.999 (tintId 0..10 or 1000..1359).
111 // Callers may still pass overshoot m (m_to = 1/crumpleEnd); values m>=1 encode as morph=1.
112 // Shader restores timing with uCrumpleEnd: c = raw/(uCrumpleEnd*0.999). No second ShaderUniform.
106 prog(window, m) {
113 prog(window, m) {
107 const v = (window.bmwBase || 0) + Math.min(4000, Math.max(0, m));
114 const tid = (window && window.bmwTintId >= 0) ? window.bmwTintId : (window ? (window.bmwBase || 0) : 0);
108 if (this.debug) console.log('MARBLEDBG prog caption=' + window.caption + ' m=' + m + ' v=' + v);
115 const morph = Math.min(1, Math.max(0, m));
116 const v = tid + morph * 0.999;
117 if (this.debug) console.log('MARBLEDBG prog caption=' + window.caption + ' m=' + m + ' morph=' + morph + ' v=' + v + ' tintId=' + tid);
109 return v;
118 return v;
110 }
119 }
111
120
@@ -135,10 +144,21 @@ class BurnMyWindowsMarbleEffect {
135 c = FIXED[this.tintMode];
144 c = FIXED[this.tintMode];
136 if (window) { window.bmwTint = null; window.bmwHue = null; }
145 if (window) { window.bmwTint = null; window.bmwHue = null; }
137 } else if (this.tintMode === 12 && window) {
146 } else if (this.tintMode === 12 && window) {
138 // Semiwillekeurig: stable per application (windowClass); empty → black
147 // Semiwillekeurig: stable per application (windowClass); empty → black.
148 // RGB/hue computed once per class (cached); shader gets ready RGB via HUE_RGB[hue] (no per-fragment HSV).
139 const cls = String(window.windowClass || '').trim();
149 const cls = String(window.windowClass || '').trim();
140 if (!cls) { c = FIXED[0]; hue = null; }
150 if (!cls) { c = FIXED[0]; hue = null; }
141 else { hue = this.hashHue(cls); c = this.hsvToRgb(hue, HS, HV); }
151 else {
152 if (!this.classHueCache) this.classHueCache = Object.create(null);
153 let cached = this.classHueCache[cls];
154 if (!cached) {
155 hue = this.hashHue(cls);
156 c = this.hsvToRgb(hue, HS, HV);
157 this.classHueCache[cls] = { hue: hue, rgb: c };
158 } else {
159 hue = cached.hue; c = cached.rgb;
160 }
161 }
142 window.bmwTint = c; window.bmwHue = hue;
162 window.bmwTint = c; window.bmwHue = hue;
143 } else if (window && reuse && window.bmwTint) {
163 } else if (window && reuse && window.bmwTint) {
144 c = window.bmwTint; hue = (window.bmwHue == null ? null : window.bmwHue);
164 c = window.bmwTint; hue = (window.bmwHue == null ? null : window.bmwHue);
@@ -153,12 +173,14 @@ class BurnMyWindowsMarbleEffect {
153 c = FIXED[0];
173 c = FIXED[0];
154 }
174 }
155 if (window) {
175 if (window) {
156 // Shader: tk < 11 → named table; tk >= 1000 → HSV hue = tk - 1000
176 // Shader: tk < 11 → named table; tk >= 1000 → HUE_RGB[tk-1000].
157 window.bmwBase = (hue == null)
177 // Compact id in uProgress integer part (NOT *4096 — that destroyed float32 morph precision).
158 ? 4096 * Math.max(0, FIXED.findIndex(x => x[0] == c[0] && x[1] == c[1] && x[2] == c[2]))
178 window.bmwTintId = (hue == null)
159 : 4096 * (1000 + (hue | 0));
179 ? Math.max(0, FIXED.findIndex(x => x[0] == c[0] && x[1] == c[1] && x[2] == c[2]))
180 : (1000 + (hue | 0));
181 window.bmwBase = window.bmwTintId;
160 }
182 }
161 if (this.debug && window) console.log('MARBLEDBG tint caption=' + window.caption + ' class=' + window.windowClass + ' seq=' + window.bmwSeq + ' hue=' + hue + ' reuse=' + reuse + ' mode=' + this.tintMode + ' base=' + window.bmwBase);
183 if (this.debug && window) console.log('MARBLEDBG tint caption=' + window.caption + ' class=' + window.windowClass + ' seq=' + window.bmwSeq + ' hue=' + hue + ' reuse=' + reuse + ' mode=' + this.tintMode + ' tintId=' + window.bmwTintId);
162 effect.setUniform(this.shader, 'uTintR', c[0]);
184 effect.setUniform(this.shader, 'uTintR', c[0]);
163 effect.setUniform(this.shader, 'uTintG', c[1]);
185 effect.setUniform(this.shader, 'uTintG', c[1]);
164 effect.setUniform(this.shader, 'uTintB', c[2]);
186 effect.setUniform(this.shader, 'uTintB', c[2]);
kwin6_effect_marble/contents/config/main.xml +1 −1
@@ -7,7 +7,7 @@
7 7 <entry name="Gravity" type="UInt"><default>4500</default></entry>
8 8 <entry name="BlackMixOuter" type="UInt"><default>80</default></entry>
9 9 <entry name="BlackMixCenter" type="UInt"><default>5</default></entry>
10 <entry name="MixColor" type="Int"><default>0</default></entry>
10 <entry name="MixColor" type="Int"><default>12</default></entry>
11 11 <entry name="MarbleSize" type="UInt"><default>42</default></entry>
12 12 <entry name="DebugMarble" type="Int"><default>0</default></entry>
13 13 </group>
@@ -7,7 +7,7 @@
7 <entry name="Gravity" type="UInt"><default>4500</default></entry>
7 <entry name="Gravity" type="UInt"><default>4500</default></entry>
8 <entry name="BlackMixOuter" type="UInt"><default>80</default></entry>
8 <entry name="BlackMixOuter" type="UInt"><default>80</default></entry>
9 <entry name="BlackMixCenter" type="UInt"><default>5</default></entry>
9 <entry name="BlackMixCenter" type="UInt"><default>5</default></entry>
10 <entry name="MixColor" type="Int"><default>0</default></entry>
10 <entry name="MixColor" type="Int"><default>12</default></entry>
11 <entry name="MarbleSize" type="UInt"><default>42</default></entry>
11 <entry name="MarbleSize" type="UInt"><default>42</default></entry>
12 <entry name="DebugMarble" type="Int"><default>0</default></entry>
12 <entry name="DebugMarble" type="Int"><default>0</default></entry>
13 </group>
13 </group>
kwin6_effect_marble/contents/shaders/marble.frag +104 −14
@@ -752,22 +752,112 @@ uniform float uDebug; // 2 = show the raw window texture inside the marble
752 752 uniform float uMixCenter; // 0..1 black mix, centre/top zone
753 753
754 754 void main() {
755 // per-window state in uProgress (setUniform is global): uProgress = tk * 4096 + m
756 // tk 0..10 = named colours; tk >= 1000 = HSV hue (tk-1000) at S=1, V=0.6667
757 float tk = floor(uProgress / 4096.0);
758 float c = clamp(uProgress - tk * 4096.0, 0.0, 1.0);
759 if (uCrumpleEnd < -1.0) c = 0.0; // keep uCrumpleEnd alive (still set by the script)
755 // Per-window state in one float (setUniform is global; animate() values are per-window):
756 // uProgress = tintId + morph01*0.999, tintId 0..10 named or 1000..1359 hue.
757 // morph01 runs 0→1 over the full ShaderUniform animation; uCrumpleEnd scales so c hits 1
758 // at the morph boundary (same timing as the old overshoot encoding, without a huge offset).
759 float tk = floor(uProgress);
760 float raw = uProgress - tk; // 0..0.999
761 float c = clamp(raw / max(uCrumpleEnd * 0.999, 1e-6), 0.0, 1.0);
762 if (uCrumpleEnd < -1.0) c = 0.0; // keep alive + guard
763 // Precomputed RGB for hue 0..359 at S=1 V=0.6667 (same formula as old per-fragment HSV).
764 // Indexed by tk-1000; avoids HSV ALU every fragment while keeping per-window tint in uProgress.
765 const vec3 HUE_RGB[360] = vec3[](
766 vec3(0.6667, 0.0, 0.0), vec3(0.6667, 0.011112, 0.0), vec3(0.6667, 0.022223, 0.0), vec3(0.6667, 0.033335, 0.0),
767 vec3(0.6667, 0.044447, 0.0), vec3(0.6667, 0.055558, 0.0), vec3(0.6667, 0.06667, 0.0), vec3(0.6667, 0.077782, 0.0),
768 vec3(0.6667, 0.088893, 0.0), vec3(0.6667, 0.100005, 0.0), vec3(0.6667, 0.111117, 0.0), vec3(0.6667, 0.122228, 0.0),
769 vec3(0.6667, 0.13334, 0.0), vec3(0.6667, 0.144452, 0.0), vec3(0.6667, 0.155563, 0.0), vec3(0.6667, 0.166675, 0.0),
770 vec3(0.6667, 0.177787, 0.0), vec3(0.6667, 0.188898, 0.0), vec3(0.6667, 0.20001, 0.0), vec3(0.6667, 0.211122, 0.0),
771 vec3(0.6667, 0.222233, 0.0), vec3(0.6667, 0.233345, 0.0), vec3(0.6667, 0.244457, 0.0), vec3(0.6667, 0.255568, 0.0),
772 vec3(0.6667, 0.26668, 0.0), vec3(0.6667, 0.277792, 0.0), vec3(0.6667, 0.288903, 0.0), vec3(0.6667, 0.300015, 0.0),
773 vec3(0.6667, 0.311127, 0.0), vec3(0.6667, 0.322238, 0.0), vec3(0.6667, 0.33335, 0.0), vec3(0.6667, 0.344462, 0.0),
774 vec3(0.6667, 0.355573, 0.0), vec3(0.6667, 0.366685, 0.0), vec3(0.6667, 0.377797, 0.0), vec3(0.6667, 0.388908, 0.0),
775 vec3(0.6667, 0.40002, 0.0), vec3(0.6667, 0.411132, 0.0), vec3(0.6667, 0.422243, 0.0), vec3(0.6667, 0.433355, 0.0),
776 vec3(0.6667, 0.444467, 0.0), vec3(0.6667, 0.455578, 0.0), vec3(0.6667, 0.46669, 0.0), vec3(0.6667, 0.477802, 0.0),
777 vec3(0.6667, 0.488913, 0.0), vec3(0.6667, 0.500025, 0.0), vec3(0.6667, 0.511137, 0.0), vec3(0.6667, 0.522248, 0.0),
778 vec3(0.6667, 0.53336, 0.0), vec3(0.6667, 0.544472, 0.0), vec3(0.6667, 0.555583, 0.0), vec3(0.6667, 0.566695, 0.0),
779 vec3(0.6667, 0.577807, 0.0), vec3(0.6667, 0.588918, 0.0), vec3(0.6667, 0.60003, 0.0), vec3(0.6667, 0.611142, 0.0),
780 vec3(0.6667, 0.622253, 0.0), vec3(0.6667, 0.633365, 0.0), vec3(0.6667, 0.644477, 0.0), vec3(0.6667, 0.655588, 0.0),
781 vec3(0.6667, 0.6667, 0.0), vec3(0.655588, 0.6667, 0.0), vec3(0.644477, 0.6667, 0.0), vec3(0.633365, 0.6667, 0.0),
782 vec3(0.622253, 0.6667, 0.0), vec3(0.611142, 0.6667, 0.0), vec3(0.60003, 0.6667, 0.0), vec3(0.588918, 0.6667, 0.0),
783 vec3(0.577807, 0.6667, 0.0), vec3(0.566695, 0.6667, 0.0), vec3(0.555583, 0.6667, 0.0), vec3(0.544472, 0.6667, 0.0),
784 vec3(0.53336, 0.6667, 0.0), vec3(0.522248, 0.6667, 0.0), vec3(0.511137, 0.6667, 0.0), vec3(0.500025, 0.6667, 0.0),
785 vec3(0.488913, 0.6667, 0.0), vec3(0.477802, 0.6667, 0.0), vec3(0.46669, 0.6667, 0.0), vec3(0.455578, 0.6667, 0.0),
786 vec3(0.444467, 0.6667, 0.0), vec3(0.433355, 0.6667, 0.0), vec3(0.422243, 0.6667, 0.0), vec3(0.411132, 0.6667, 0.0),
787 vec3(0.40002, 0.6667, 0.0), vec3(0.388908, 0.6667, 0.0), vec3(0.377797, 0.6667, 0.0), vec3(0.366685, 0.6667, 0.0),
788 vec3(0.355573, 0.6667, 0.0), vec3(0.344462, 0.6667, 0.0), vec3(0.33335, 0.6667, 0.0), vec3(0.322238, 0.6667, 0.0),
789 vec3(0.311127, 0.6667, 0.0), vec3(0.300015, 0.6667, 0.0), vec3(0.288903, 0.6667, 0.0), vec3(0.277792, 0.6667, 0.0),
790 vec3(0.26668, 0.6667, 0.0), vec3(0.255568, 0.6667, 0.0), vec3(0.244457, 0.6667, 0.0), vec3(0.233345, 0.6667, 0.0),
791 vec3(0.222233, 0.6667, 0.0), vec3(0.211122, 0.6667, 0.0), vec3(0.20001, 0.6667, 0.0), vec3(0.188898, 0.6667, 0.0),
792 vec3(0.177787, 0.6667, 0.0), vec3(0.166675, 0.6667, 0.0), vec3(0.155563, 0.6667, 0.0), vec3(0.144452, 0.6667, 0.0),
793 vec3(0.13334, 0.6667, 0.0), vec3(0.122228, 0.6667, 0.0), vec3(0.111117, 0.6667, 0.0), vec3(0.100005, 0.6667, 0.0),
794 vec3(0.088893, 0.6667, 0.0), vec3(0.077782, 0.6667, 0.0), vec3(0.06667, 0.6667, 0.0), vec3(0.055558, 0.6667, 0.0),
795 vec3(0.044447, 0.6667, 0.0), vec3(0.033335, 0.6667, 0.0), vec3(0.022223, 0.6667, 0.0), vec3(0.011112, 0.6667, 0.0),
796 vec3(0.0, 0.6667, 0.0), vec3(0.0, 0.6667, 0.011112), vec3(0.0, 0.6667, 0.022223), vec3(0.0, 0.6667, 0.033335),
797 vec3(0.0, 0.6667, 0.044447), vec3(0.0, 0.6667, 0.055558), vec3(0.0, 0.6667, 0.06667), vec3(0.0, 0.6667, 0.077782),
798 vec3(0.0, 0.6667, 0.088893), vec3(0.0, 0.6667, 0.100005), vec3(0.0, 0.6667, 0.111117), vec3(0.0, 0.6667, 0.122228),
799 vec3(0.0, 0.6667, 0.13334), vec3(0.0, 0.6667, 0.144452), vec3(0.0, 0.6667, 0.155563), vec3(0.0, 0.6667, 0.166675),
800 vec3(0.0, 0.6667, 0.177787), vec3(0.0, 0.6667, 0.188898), vec3(0.0, 0.6667, 0.20001), vec3(0.0, 0.6667, 0.211122),
801 vec3(0.0, 0.6667, 0.222233), vec3(0.0, 0.6667, 0.233345), vec3(0.0, 0.6667, 0.244457), vec3(0.0, 0.6667, 0.255568),
802 vec3(0.0, 0.6667, 0.26668), vec3(0.0, 0.6667, 0.277792), vec3(0.0, 0.6667, 0.288903), vec3(0.0, 0.6667, 0.300015),
803 vec3(0.0, 0.6667, 0.311127), vec3(0.0, 0.6667, 0.322238), vec3(0.0, 0.6667, 0.33335), vec3(0.0, 0.6667, 0.344462),
804 vec3(0.0, 0.6667, 0.355573), vec3(0.0, 0.6667, 0.366685), vec3(0.0, 0.6667, 0.377797), vec3(0.0, 0.6667, 0.388908),
805 vec3(0.0, 0.6667, 0.40002), vec3(0.0, 0.6667, 0.411132), vec3(0.0, 0.6667, 0.422243), vec3(0.0, 0.6667, 0.433355),
806 vec3(0.0, 0.6667, 0.444467), vec3(0.0, 0.6667, 0.455578), vec3(0.0, 0.6667, 0.46669), vec3(0.0, 0.6667, 0.477802),
807 vec3(0.0, 0.6667, 0.488913), vec3(0.0, 0.6667, 0.500025), vec3(0.0, 0.6667, 0.511137), vec3(0.0, 0.6667, 0.522248),
808 vec3(0.0, 0.6667, 0.53336), vec3(0.0, 0.6667, 0.544472), vec3(0.0, 0.6667, 0.555583), vec3(0.0, 0.6667, 0.566695),
809 vec3(0.0, 0.6667, 0.577807), vec3(0.0, 0.6667, 0.588918), vec3(0.0, 0.6667, 0.60003), vec3(0.0, 0.6667, 0.611142),
810 vec3(0.0, 0.6667, 0.622253), vec3(0.0, 0.6667, 0.633365), vec3(0.0, 0.6667, 0.644477), vec3(0.0, 0.6667, 0.655588),
811 vec3(0.0, 0.6667, 0.6667), vec3(0.0, 0.655588, 0.6667), vec3(0.0, 0.644477, 0.6667), vec3(0.0, 0.633365, 0.6667),
812 vec3(0.0, 0.622253, 0.6667), vec3(0.0, 0.611142, 0.6667), vec3(0.0, 0.60003, 0.6667), vec3(0.0, 0.588918, 0.6667),
813 vec3(0.0, 0.577807, 0.6667), vec3(0.0, 0.566695, 0.6667), vec3(0.0, 0.555583, 0.6667), vec3(0.0, 0.544472, 0.6667),
814 vec3(0.0, 0.53336, 0.6667), vec3(0.0, 0.522248, 0.6667), vec3(0.0, 0.511137, 0.6667), vec3(0.0, 0.500025, 0.6667),
815 vec3(0.0, 0.488913, 0.6667), vec3(0.0, 0.477802, 0.6667), vec3(0.0, 0.46669, 0.6667), vec3(0.0, 0.455578, 0.6667),
816 vec3(0.0, 0.444467, 0.6667), vec3(0.0, 0.433355, 0.6667), vec3(0.0, 0.422243, 0.6667), vec3(0.0, 0.411132, 0.6667),
817 vec3(0.0, 0.40002, 0.6667), vec3(0.0, 0.388908, 0.6667), vec3(0.0, 0.377797, 0.6667), vec3(0.0, 0.366685, 0.6667),
818 vec3(0.0, 0.355573, 0.6667), vec3(0.0, 0.344462, 0.6667), vec3(0.0, 0.33335, 0.6667), vec3(0.0, 0.322238, 0.6667),
819 vec3(0.0, 0.311127, 0.6667), vec3(0.0, 0.300015, 0.6667), vec3(0.0, 0.288903, 0.6667), vec3(0.0, 0.277792, 0.6667),
820 vec3(0.0, 0.26668, 0.6667), vec3(0.0, 0.255568, 0.6667), vec3(0.0, 0.244457, 0.6667), vec3(0.0, 0.233345, 0.6667),
821 vec3(0.0, 0.222233, 0.6667), vec3(0.0, 0.211122, 0.6667), vec3(0.0, 0.20001, 0.6667), vec3(0.0, 0.188898, 0.6667),
822 vec3(0.0, 0.177787, 0.6667), vec3(0.0, 0.166675, 0.6667), vec3(0.0, 0.155563, 0.6667), vec3(0.0, 0.144452, 0.6667),
823 vec3(0.0, 0.13334, 0.6667), vec3(0.0, 0.122228, 0.6667), vec3(0.0, 0.111117, 0.6667), vec3(0.0, 0.100005, 0.6667),
824 vec3(0.0, 0.088893, 0.6667), vec3(0.0, 0.077782, 0.6667), vec3(0.0, 0.06667, 0.6667), vec3(0.0, 0.055558, 0.6667),
825 vec3(0.0, 0.044447, 0.6667), vec3(0.0, 0.033335, 0.6667), vec3(0.0, 0.022223, 0.6667), vec3(0.0, 0.011112, 0.6667),
826 vec3(0.0, 0.0, 0.6667), vec3(0.011112, 0.0, 0.6667), vec3(0.022223, 0.0, 0.6667), vec3(0.033335, 0.0, 0.6667),
827 vec3(0.044447, 0.0, 0.6667), vec3(0.055558, 0.0, 0.6667), vec3(0.06667, 0.0, 0.6667), vec3(0.077782, 0.0, 0.6667),
828 vec3(0.088893, 0.0, 0.6667), vec3(0.100005, 0.0, 0.6667), vec3(0.111117, 0.0, 0.6667), vec3(0.122228, 0.0, 0.6667),
829 vec3(0.13334, 0.0, 0.6667), vec3(0.144452, 0.0, 0.6667), vec3(0.155563, 0.0, 0.6667), vec3(0.166675, 0.0, 0.6667),
830 vec3(0.177787, 0.0, 0.6667), vec3(0.188898, 0.0, 0.6667), vec3(0.20001, 0.0, 0.6667), vec3(0.211122, 0.0, 0.6667),
831 vec3(0.222233, 0.0, 0.6667), vec3(0.233345, 0.0, 0.6667), vec3(0.244457, 0.0, 0.6667), vec3(0.255568, 0.0, 0.6667),
832 vec3(0.26668, 0.0, 0.6667), vec3(0.277792, 0.0, 0.6667), vec3(0.288903, 0.0, 0.6667), vec3(0.300015, 0.0, 0.6667),
833 vec3(0.311127, 0.0, 0.6667), vec3(0.322238, 0.0, 0.6667), vec3(0.33335, 0.0, 0.6667), vec3(0.344462, 0.0, 0.6667),
834 vec3(0.355573, 0.0, 0.6667), vec3(0.366685, 0.0, 0.6667), vec3(0.377797, 0.0, 0.6667), vec3(0.388908, 0.0, 0.6667),
835 vec3(0.40002, 0.0, 0.6667), vec3(0.411132, 0.0, 0.6667), vec3(0.422243, 0.0, 0.6667), vec3(0.433355, 0.0, 0.6667),
836 vec3(0.444467, 0.0, 0.6667), vec3(0.455578, 0.0, 0.6667), vec3(0.46669, 0.0, 0.6667), vec3(0.477802, 0.0, 0.6667),
837 vec3(0.488913, 0.0, 0.6667), vec3(0.500025, 0.0, 0.6667), vec3(0.511137, 0.0, 0.6667), vec3(0.522248, 0.0, 0.6667),
838 vec3(0.53336, 0.0, 0.6667), vec3(0.544472, 0.0, 0.6667), vec3(0.555583, 0.0, 0.6667), vec3(0.566695, 0.0, 0.6667),
839 vec3(0.577807, 0.0, 0.6667), vec3(0.588918, 0.0, 0.6667), vec3(0.60003, 0.0, 0.6667), vec3(0.611142, 0.0, 0.6667),
840 vec3(0.622253, 0.0, 0.6667), vec3(0.633365, 0.0, 0.6667), vec3(0.644477, 0.0, 0.6667), vec3(0.655588, 0.0, 0.6667),
841 vec3(0.6667, 0.0, 0.6667), vec3(0.6667, 0.0, 0.655588), vec3(0.6667, 0.0, 0.644477), vec3(0.6667, 0.0, 0.633365),
842 vec3(0.6667, 0.0, 0.622253), vec3(0.6667, 0.0, 0.611142), vec3(0.6667, 0.0, 0.60003), vec3(0.6667, 0.0, 0.588918),
843 vec3(0.6667, 0.0, 0.577807), vec3(0.6667, 0.0, 0.566695), vec3(0.6667, 0.0, 0.555583), vec3(0.6667, 0.0, 0.544472),
844 vec3(0.6667, 0.0, 0.53336), vec3(0.6667, 0.0, 0.522248), vec3(0.6667, 0.0, 0.511137), vec3(0.6667, 0.0, 0.500025),
845 vec3(0.6667, 0.0, 0.488913), vec3(0.6667, 0.0, 0.477802), vec3(0.6667, 0.0, 0.46669), vec3(0.6667, 0.0, 0.455578),
846 vec3(0.6667, 0.0, 0.444467), vec3(0.6667, 0.0, 0.433355), vec3(0.6667, 0.0, 0.422243), vec3(0.6667, 0.0, 0.411132),
847 vec3(0.6667, 0.0, 0.40002), vec3(0.6667, 0.0, 0.388908), vec3(0.6667, 0.0, 0.377797), vec3(0.6667, 0.0, 0.366685),
848 vec3(0.6667, 0.0, 0.355573), vec3(0.6667, 0.0, 0.344462), vec3(0.6667, 0.0, 0.33335), vec3(0.6667, 0.0, 0.322238),
849 vec3(0.6667, 0.0, 0.311127), vec3(0.6667, 0.0, 0.300015), vec3(0.6667, 0.0, 0.288903), vec3(0.6667, 0.0, 0.277792),
850 vec3(0.6667, 0.0, 0.26668), vec3(0.6667, 0.0, 0.255568), vec3(0.6667, 0.0, 0.244457), vec3(0.6667, 0.0, 0.233345),
851 vec3(0.6667, 0.0, 0.222233), vec3(0.6667, 0.0, 0.211122), vec3(0.6667, 0.0, 0.20001), vec3(0.6667, 0.0, 0.188898),
852 vec3(0.6667, 0.0, 0.177787), vec3(0.6667, 0.0, 0.166675), vec3(0.6667, 0.0, 0.155563), vec3(0.6667, 0.0, 0.144452),
853 vec3(0.6667, 0.0, 0.13334), vec3(0.6667, 0.0, 0.122228), vec3(0.6667, 0.0, 0.111117), vec3(0.6667, 0.0, 0.100005),
854 vec3(0.6667, 0.0, 0.088893), vec3(0.6667, 0.0, 0.077782), vec3(0.6667, 0.0, 0.06667), vec3(0.6667, 0.0, 0.055558),
855 vec3(0.6667, 0.0, 0.044447), vec3(0.6667, 0.0, 0.033335), vec3(0.6667, 0.0, 0.022223), vec3(0.6667, 0.0, 0.011112)
856 );
760 857 vec3 tint;
761 858 if (tk >= 999.5) {
762 float h = clamp(tk - 1000.0, 0.0, 359.0);
763 float s = 1.0, v = 0.6667;
764 float ch = v * s;
765 float x = ch * (1.0 - abs(mod(h / 60.0, 2.0) - 1.0));
766 float m = v - ch;
767 vec3 rgb = h < 60.0 ? vec3(ch, x, 0.0) : h < 120.0 ? vec3(x, ch, 0.0)
768 : h < 180.0 ? vec3(0.0, ch, x) : h < 240.0 ? vec3(0.0, x, ch)
769 : h < 300.0 ? vec3(x, 0.0, ch) : vec3(ch, 0.0, x);
770 tint = rgb + vec3(m);
859 int hi = int(clamp(tk - 1000.0, 0.0, 359.0));
860 tint = HUE_RGB[hi];
771 861 } else {
772 862 tint = tk < 0.5 ? vec3(0.0) : tk < 1.5 ? vec3(0.0, 0.0, 0.6667) : tk < 2.5 ? vec3(0.6667, 0.0, 0.0)
773 863 : tk < 3.5 ? vec3(0.0, 0.6667, 0.0) : tk < 4.5 ? vec3(0.4, 0.0, 0.6667) : tk < 5.5 ? vec3(0.6667, 0.6667, 0.0)
@@ -752,22 +752,112 @@ uniform float uDebug; // 2 = show the raw window texture inside the marble
752uniform float uMixCenter; // 0..1 black mix, centre/top zone
752uniform float uMixCenter; // 0..1 black mix, centre/top zone
753
753
754void main() {
754void main() {
755 // per-window state in uProgress (setUniform is global): uProgress = tk * 4096 + m
755 // Per-window state in one float (setUniform is global; animate() values are per-window):
756 // tk 0..10 = named colours; tk >= 1000 = HSV hue (tk-1000) at S=1, V=0.6667
756 // uProgress = tintId + morph01*0.999, tintId 0..10 named or 1000..1359 hue.
757 float tk = floor(uProgress / 4096.0);
757 // morph01 runs 0→1 over the full ShaderUniform animation; uCrumpleEnd scales so c hits 1
758 float c = clamp(uProgress - tk * 4096.0, 0.0, 1.0);
758 // at the morph boundary (same timing as the old overshoot encoding, without a huge offset).
759 if (uCrumpleEnd < -1.0) c = 0.0; // keep uCrumpleEnd alive (still set by the script)
759 float tk = floor(uProgress);
760 float raw = uProgress - tk; // 0..0.999
761 float c = clamp(raw / max(uCrumpleEnd * 0.999, 1e-6), 0.0, 1.0);
762 if (uCrumpleEnd < -1.0) c = 0.0; // keep alive + guard
763 // Precomputed RGB for hue 0..359 at S=1 V=0.6667 (same formula as old per-fragment HSV).
764 // Indexed by tk-1000; avoids HSV ALU every fragment while keeping per-window tint in uProgress.
765 const vec3 HUE_RGB[360] = vec3[](
766 vec3(0.6667, 0.0, 0.0), vec3(0.6667, 0.011112, 0.0), vec3(0.6667, 0.022223, 0.0), vec3(0.6667, 0.033335, 0.0),
767 vec3(0.6667, 0.044447, 0.0), vec3(0.6667, 0.055558, 0.0), vec3(0.6667, 0.06667, 0.0), vec3(0.6667, 0.077782, 0.0),
768 vec3(0.6667, 0.088893, 0.0), vec3(0.6667, 0.100005, 0.0), vec3(0.6667, 0.111117, 0.0), vec3(0.6667, 0.122228, 0.0),
769 vec3(0.6667, 0.13334, 0.0), vec3(0.6667, 0.144452, 0.0), vec3(0.6667, 0.155563, 0.0), vec3(0.6667, 0.166675, 0.0),
770 vec3(0.6667, 0.177787, 0.0), vec3(0.6667, 0.188898, 0.0), vec3(0.6667, 0.20001, 0.0), vec3(0.6667, 0.211122, 0.0),
771 vec3(0.6667, 0.222233, 0.0), vec3(0.6667, 0.233345, 0.0), vec3(0.6667, 0.244457, 0.0), vec3(0.6667, 0.255568, 0.0),
772 vec3(0.6667, 0.26668, 0.0), vec3(0.6667, 0.277792, 0.0), vec3(0.6667, 0.288903, 0.0), vec3(0.6667, 0.300015, 0.0),
773 vec3(0.6667, 0.311127, 0.0), vec3(0.6667, 0.322238, 0.0), vec3(0.6667, 0.33335, 0.0), vec3(0.6667, 0.344462, 0.0),
774 vec3(0.6667, 0.355573, 0.0), vec3(0.6667, 0.366685, 0.0), vec3(0.6667, 0.377797, 0.0), vec3(0.6667, 0.388908, 0.0),
775 vec3(0.6667, 0.40002, 0.0), vec3(0.6667, 0.411132, 0.0), vec3(0.6667, 0.422243, 0.0), vec3(0.6667, 0.433355, 0.0),
776 vec3(0.6667, 0.444467, 0.0), vec3(0.6667, 0.455578, 0.0), vec3(0.6667, 0.46669, 0.0), vec3(0.6667, 0.477802, 0.0),
777 vec3(0.6667, 0.488913, 0.0), vec3(0.6667, 0.500025, 0.0), vec3(0.6667, 0.511137, 0.0), vec3(0.6667, 0.522248, 0.0),
778 vec3(0.6667, 0.53336, 0.0), vec3(0.6667, 0.544472, 0.0), vec3(0.6667, 0.555583, 0.0), vec3(0.6667, 0.566695, 0.0),
779 vec3(0.6667, 0.577807, 0.0), vec3(0.6667, 0.588918, 0.0), vec3(0.6667, 0.60003, 0.0), vec3(0.6667, 0.611142, 0.0),
780 vec3(0.6667, 0.622253, 0.0), vec3(0.6667, 0.633365, 0.0), vec3(0.6667, 0.644477, 0.0), vec3(0.6667, 0.655588, 0.0),
781 vec3(0.6667, 0.6667, 0.0), vec3(0.655588, 0.6667, 0.0), vec3(0.644477, 0.6667, 0.0), vec3(0.633365, 0.6667, 0.0),
782 vec3(0.622253, 0.6667, 0.0), vec3(0.611142, 0.6667, 0.0), vec3(0.60003, 0.6667, 0.0), vec3(0.588918, 0.6667, 0.0),
783 vec3(0.577807, 0.6667, 0.0), vec3(0.566695, 0.6667, 0.0), vec3(0.555583, 0.6667, 0.0), vec3(0.544472, 0.6667, 0.0),
784 vec3(0.53336, 0.6667, 0.0), vec3(0.522248, 0.6667, 0.0), vec3(0.511137, 0.6667, 0.0), vec3(0.500025, 0.6667, 0.0),
785 vec3(0.488913, 0.6667, 0.0), vec3(0.477802, 0.6667, 0.0), vec3(0.46669, 0.6667, 0.0), vec3(0.455578, 0.6667, 0.0),
786 vec3(0.444467, 0.6667, 0.0), vec3(0.433355, 0.6667, 0.0), vec3(0.422243, 0.6667, 0.0), vec3(0.411132, 0.6667, 0.0),
787 vec3(0.40002, 0.6667, 0.0), vec3(0.388908, 0.6667, 0.0), vec3(0.377797, 0.6667, 0.0), vec3(0.366685, 0.6667, 0.0),
788 vec3(0.355573, 0.6667, 0.0), vec3(0.344462, 0.6667, 0.0), vec3(0.33335, 0.6667, 0.0), vec3(0.322238, 0.6667, 0.0),
789 vec3(0.311127, 0.6667, 0.0), vec3(0.300015, 0.6667, 0.0), vec3(0.288903, 0.6667, 0.0), vec3(0.277792, 0.6667, 0.0),
790 vec3(0.26668, 0.6667, 0.0), vec3(0.255568, 0.6667, 0.0), vec3(0.244457, 0.6667, 0.0), vec3(0.233345, 0.6667, 0.0),
791 vec3(0.222233, 0.6667, 0.0), vec3(0.211122, 0.6667, 0.0), vec3(0.20001, 0.6667, 0.0), vec3(0.188898, 0.6667, 0.0),
792 vec3(0.177787, 0.6667, 0.0), vec3(0.166675, 0.6667, 0.0), vec3(0.155563, 0.6667, 0.0), vec3(0.144452, 0.6667, 0.0),
793 vec3(0.13334, 0.6667, 0.0), vec3(0.122228, 0.6667, 0.0), vec3(0.111117, 0.6667, 0.0), vec3(0.100005, 0.6667, 0.0),
794 vec3(0.088893, 0.6667, 0.0), vec3(0.077782, 0.6667, 0.0), vec3(0.06667, 0.6667, 0.0), vec3(0.055558, 0.6667, 0.0),
795 vec3(0.044447, 0.6667, 0.0), vec3(0.033335, 0.6667, 0.0), vec3(0.022223, 0.6667, 0.0), vec3(0.011112, 0.6667, 0.0),
796 vec3(0.0, 0.6667, 0.0), vec3(0.0, 0.6667, 0.011112), vec3(0.0, 0.6667, 0.022223), vec3(0.0, 0.6667, 0.033335),
797 vec3(0.0, 0.6667, 0.044447), vec3(0.0, 0.6667, 0.055558), vec3(0.0, 0.6667, 0.06667), vec3(0.0, 0.6667, 0.077782),
798 vec3(0.0, 0.6667, 0.088893), vec3(0.0, 0.6667, 0.100005), vec3(0.0, 0.6667, 0.111117), vec3(0.0, 0.6667, 0.122228),
799 vec3(0.0, 0.6667, 0.13334), vec3(0.0, 0.6667, 0.144452), vec3(0.0, 0.6667, 0.155563), vec3(0.0, 0.6667, 0.166675),
800 vec3(0.0, 0.6667, 0.177787), vec3(0.0, 0.6667, 0.188898), vec3(0.0, 0.6667, 0.20001), vec3(0.0, 0.6667, 0.211122),
801 vec3(0.0, 0.6667, 0.222233), vec3(0.0, 0.6667, 0.233345), vec3(0.0, 0.6667, 0.244457), vec3(0.0, 0.6667, 0.255568),
802 vec3(0.0, 0.6667, 0.26668), vec3(0.0, 0.6667, 0.277792), vec3(0.0, 0.6667, 0.288903), vec3(0.0, 0.6667, 0.300015),
803 vec3(0.0, 0.6667, 0.311127), vec3(0.0, 0.6667, 0.322238), vec3(0.0, 0.6667, 0.33335), vec3(0.0, 0.6667, 0.344462),
804 vec3(0.0, 0.6667, 0.355573), vec3(0.0, 0.6667, 0.366685), vec3(0.0, 0.6667, 0.377797), vec3(0.0, 0.6667, 0.388908),
805 vec3(0.0, 0.6667, 0.40002), vec3(0.0, 0.6667, 0.411132), vec3(0.0, 0.6667, 0.422243), vec3(0.0, 0.6667, 0.433355),
806 vec3(0.0, 0.6667, 0.444467), vec3(0.0, 0.6667, 0.455578), vec3(0.0, 0.6667, 0.46669), vec3(0.0, 0.6667, 0.477802),
807 vec3(0.0, 0.6667, 0.488913), vec3(0.0, 0.6667, 0.500025), vec3(0.0, 0.6667, 0.511137), vec3(0.0, 0.6667, 0.522248),
808 vec3(0.0, 0.6667, 0.53336), vec3(0.0, 0.6667, 0.544472), vec3(0.0, 0.6667, 0.555583), vec3(0.0, 0.6667, 0.566695),
809 vec3(0.0, 0.6667, 0.577807), vec3(0.0, 0.6667, 0.588918), vec3(0.0, 0.6667, 0.60003), vec3(0.0, 0.6667, 0.611142),
810 vec3(0.0, 0.6667, 0.622253), vec3(0.0, 0.6667, 0.633365), vec3(0.0, 0.6667, 0.644477), vec3(0.0, 0.6667, 0.655588),
811 vec3(0.0, 0.6667, 0.6667), vec3(0.0, 0.655588, 0.6667), vec3(0.0, 0.644477, 0.6667), vec3(0.0, 0.633365, 0.6667),
812 vec3(0.0, 0.622253, 0.6667), vec3(0.0, 0.611142, 0.6667), vec3(0.0, 0.60003, 0.6667), vec3(0.0, 0.588918, 0.6667),
813 vec3(0.0, 0.577807, 0.6667), vec3(0.0, 0.566695, 0.6667), vec3(0.0, 0.555583, 0.6667), vec3(0.0, 0.544472, 0.6667),
814 vec3(0.0, 0.53336, 0.6667), vec3(0.0, 0.522248, 0.6667), vec3(0.0, 0.511137, 0.6667), vec3(0.0, 0.500025, 0.6667),
815 vec3(0.0, 0.488913, 0.6667), vec3(0.0, 0.477802, 0.6667), vec3(0.0, 0.46669, 0.6667), vec3(0.0, 0.455578, 0.6667),
816 vec3(0.0, 0.444467, 0.6667), vec3(0.0, 0.433355, 0.6667), vec3(0.0, 0.422243, 0.6667), vec3(0.0, 0.411132, 0.6667),
817 vec3(0.0, 0.40002, 0.6667), vec3(0.0, 0.388908, 0.6667), vec3(0.0, 0.377797, 0.6667), vec3(0.0, 0.366685, 0.6667),
818 vec3(0.0, 0.355573, 0.6667), vec3(0.0, 0.344462, 0.6667), vec3(0.0, 0.33335, 0.6667), vec3(0.0, 0.322238, 0.6667),
819 vec3(0.0, 0.311127, 0.6667), vec3(0.0, 0.300015, 0.6667), vec3(0.0, 0.288903, 0.6667), vec3(0.0, 0.277792, 0.6667),
820 vec3(0.0, 0.26668, 0.6667), vec3(0.0, 0.255568, 0.6667), vec3(0.0, 0.244457, 0.6667), vec3(0.0, 0.233345, 0.6667),
821 vec3(0.0, 0.222233, 0.6667), vec3(0.0, 0.211122, 0.6667), vec3(0.0, 0.20001, 0.6667), vec3(0.0, 0.188898, 0.6667),
822 vec3(0.0, 0.177787, 0.6667), vec3(0.0, 0.166675, 0.6667), vec3(0.0, 0.155563, 0.6667), vec3(0.0, 0.144452, 0.6667),
823 vec3(0.0, 0.13334, 0.6667), vec3(0.0, 0.122228, 0.6667), vec3(0.0, 0.111117, 0.6667), vec3(0.0, 0.100005, 0.6667),
824 vec3(0.0, 0.088893, 0.6667), vec3(0.0, 0.077782, 0.6667), vec3(0.0, 0.06667, 0.6667), vec3(0.0, 0.055558, 0.6667),
825 vec3(0.0, 0.044447, 0.6667), vec3(0.0, 0.033335, 0.6667), vec3(0.0, 0.022223, 0.6667), vec3(0.0, 0.011112, 0.6667),
826 vec3(0.0, 0.0, 0.6667), vec3(0.011112, 0.0, 0.6667), vec3(0.022223, 0.0, 0.6667), vec3(0.033335, 0.0, 0.6667),
827 vec3(0.044447, 0.0, 0.6667), vec3(0.055558, 0.0, 0.6667), vec3(0.06667, 0.0, 0.6667), vec3(0.077782, 0.0, 0.6667),
828 vec3(0.088893, 0.0, 0.6667), vec3(0.100005, 0.0, 0.6667), vec3(0.111117, 0.0, 0.6667), vec3(0.122228, 0.0, 0.6667),
829 vec3(0.13334, 0.0, 0.6667), vec3(0.144452, 0.0, 0.6667), vec3(0.155563, 0.0, 0.6667), vec3(0.166675, 0.0, 0.6667),
830 vec3(0.177787, 0.0, 0.6667), vec3(0.188898, 0.0, 0.6667), vec3(0.20001, 0.0, 0.6667), vec3(0.211122, 0.0, 0.6667),
831 vec3(0.222233, 0.0, 0.6667), vec3(0.233345, 0.0, 0.6667), vec3(0.244457, 0.0, 0.6667), vec3(0.255568, 0.0, 0.6667),
832 vec3(0.26668, 0.0, 0.6667), vec3(0.277792, 0.0, 0.6667), vec3(0.288903, 0.0, 0.6667), vec3(0.300015, 0.0, 0.6667),
833 vec3(0.311127, 0.0, 0.6667), vec3(0.322238, 0.0, 0.6667), vec3(0.33335, 0.0, 0.6667), vec3(0.344462, 0.0, 0.6667),
834 vec3(0.355573, 0.0, 0.6667), vec3(0.366685, 0.0, 0.6667), vec3(0.377797, 0.0, 0.6667), vec3(0.388908, 0.0, 0.6667),
835 vec3(0.40002, 0.0, 0.6667), vec3(0.411132, 0.0, 0.6667), vec3(0.422243, 0.0, 0.6667), vec3(0.433355, 0.0, 0.6667),
836 vec3(0.444467, 0.0, 0.6667), vec3(0.455578, 0.0, 0.6667), vec3(0.46669, 0.0, 0.6667), vec3(0.477802, 0.0, 0.6667),
837 vec3(0.488913, 0.0, 0.6667), vec3(0.500025, 0.0, 0.6667), vec3(0.511137, 0.0, 0.6667), vec3(0.522248, 0.0, 0.6667),
838 vec3(0.53336, 0.0, 0.6667), vec3(0.544472, 0.0, 0.6667), vec3(0.555583, 0.0, 0.6667), vec3(0.566695, 0.0, 0.6667),
839 vec3(0.577807, 0.0, 0.6667), vec3(0.588918, 0.0, 0.6667), vec3(0.60003, 0.0, 0.6667), vec3(0.611142, 0.0, 0.6667),
840 vec3(0.622253, 0.0, 0.6667), vec3(0.633365, 0.0, 0.6667), vec3(0.644477, 0.0, 0.6667), vec3(0.655588, 0.0, 0.6667),
841 vec3(0.6667, 0.0, 0.6667), vec3(0.6667, 0.0, 0.655588), vec3(0.6667, 0.0, 0.644477), vec3(0.6667, 0.0, 0.633365),
842 vec3(0.6667, 0.0, 0.622253), vec3(0.6667, 0.0, 0.611142), vec3(0.6667, 0.0, 0.60003), vec3(0.6667, 0.0, 0.588918),
843 vec3(0.6667, 0.0, 0.577807), vec3(0.6667, 0.0, 0.566695), vec3(0.6667, 0.0, 0.555583), vec3(0.6667, 0.0, 0.544472),
844 vec3(0.6667, 0.0, 0.53336), vec3(0.6667, 0.0, 0.522248), vec3(0.6667, 0.0, 0.511137), vec3(0.6667, 0.0, 0.500025),
845 vec3(0.6667, 0.0, 0.488913), vec3(0.6667, 0.0, 0.477802), vec3(0.6667, 0.0, 0.46669), vec3(0.6667, 0.0, 0.455578),
846 vec3(0.6667, 0.0, 0.444467), vec3(0.6667, 0.0, 0.433355), vec3(0.6667, 0.0, 0.422243), vec3(0.6667, 0.0, 0.411132),
847 vec3(0.6667, 0.0, 0.40002), vec3(0.6667, 0.0, 0.388908), vec3(0.6667, 0.0, 0.377797), vec3(0.6667, 0.0, 0.366685),
848 vec3(0.6667, 0.0, 0.355573), vec3(0.6667, 0.0, 0.344462), vec3(0.6667, 0.0, 0.33335), vec3(0.6667, 0.0, 0.322238),
849 vec3(0.6667, 0.0, 0.311127), vec3(0.6667, 0.0, 0.300015), vec3(0.6667, 0.0, 0.288903), vec3(0.6667, 0.0, 0.277792),
850 vec3(0.6667, 0.0, 0.26668), vec3(0.6667, 0.0, 0.255568), vec3(0.6667, 0.0, 0.244457), vec3(0.6667, 0.0, 0.233345),
851 vec3(0.6667, 0.0, 0.222233), vec3(0.6667, 0.0, 0.211122), vec3(0.6667, 0.0, 0.20001), vec3(0.6667, 0.0, 0.188898),
852 vec3(0.6667, 0.0, 0.177787), vec3(0.6667, 0.0, 0.166675), vec3(0.6667, 0.0, 0.155563), vec3(0.6667, 0.0, 0.144452),
853 vec3(0.6667, 0.0, 0.13334), vec3(0.6667, 0.0, 0.122228), vec3(0.6667, 0.0, 0.111117), vec3(0.6667, 0.0, 0.100005),
854 vec3(0.6667, 0.0, 0.088893), vec3(0.6667, 0.0, 0.077782), vec3(0.6667, 0.0, 0.06667), vec3(0.6667, 0.0, 0.055558),
855 vec3(0.6667, 0.0, 0.044447), vec3(0.6667, 0.0, 0.033335), vec3(0.6667, 0.0, 0.022223), vec3(0.6667, 0.0, 0.011112)
856 );
760 vec3 tint;
857 vec3 tint;
761 if (tk >= 999.5) {
858 if (tk >= 999.5) {
762 float h = clamp(tk - 1000.0, 0.0, 359.0);
859 int hi = int(clamp(tk - 1000.0, 0.0, 359.0));
763 float s = 1.0, v = 0.6667;
860 tint = HUE_RGB[hi];
764 float ch = v * s;
765 float x = ch * (1.0 - abs(mod(h / 60.0, 2.0) - 1.0));
766 float m = v - ch;
767 vec3 rgb = h < 60.0 ? vec3(ch, x, 0.0) : h < 120.0 ? vec3(x, ch, 0.0)
768 : h < 180.0 ? vec3(0.0, ch, x) : h < 240.0 ? vec3(0.0, x, ch)
769 : h < 300.0 ? vec3(x, 0.0, ch) : vec3(ch, 0.0, x);
770 tint = rgb + vec3(m);
771 } else {
861 } else {
772 tint = tk < 0.5 ? vec3(0.0) : tk < 1.5 ? vec3(0.0, 0.0, 0.6667) : tk < 2.5 ? vec3(0.6667, 0.0, 0.0)
862 tint = tk < 0.5 ? vec3(0.0) : tk < 1.5 ? vec3(0.0, 0.0, 0.6667) : tk < 2.5 ? vec3(0.6667, 0.0, 0.0)
773 : tk < 3.5 ? vec3(0.0, 0.6667, 0.0) : tk < 4.5 ? vec3(0.4, 0.0, 0.6667) : tk < 5.5 ? vec3(0.6667, 0.6667, 0.0)
863 : tk < 3.5 ? vec3(0.0, 0.6667, 0.0) : tk < 4.5 ? vec3(0.4, 0.0, 0.6667) : tk < 5.5 ? vec3(0.6667, 0.6667, 0.0)
kwin6_effect_marble/contents/shaders/marble_core.frag +104 −14
@@ -753,22 +753,112 @@ uniform float uDebug; // 2 = show the raw window texture inside the marble
753 753 uniform float uMixCenter; // 0..1 black mix, centre/top zone
754 754
755 755 void main() {
756 // per-window state in uProgress (setUniform is global): uProgress = tk * 4096 + m
757 // tk 0..10 = named colours; tk >= 1000 = HSV hue (tk-1000) at S=1, V=0.6667
758 float tk = floor(uProgress / 4096.0);
759 float c = clamp(uProgress - tk * 4096.0, 0.0, 1.0);
760 if (uCrumpleEnd < -1.0) c = 0.0; // keep uCrumpleEnd alive (still set by the script)
756 // Per-window state in one float (setUniform is global; animate() values are per-window):
757 // uProgress = tintId + morph01*0.999, tintId 0..10 named or 1000..1359 hue.
758 // morph01 runs 0→1 over the full ShaderUniform animation; uCrumpleEnd scales so c hits 1
759 // at the morph boundary (same timing as the old overshoot encoding, without a huge offset).
760 float tk = floor(uProgress);
761 float raw = uProgress - tk; // 0..0.999
762 float c = clamp(raw / max(uCrumpleEnd * 0.999, 1e-6), 0.0, 1.0);
763 if (uCrumpleEnd < -1.0) c = 0.0; // keep alive + guard
764 // Precomputed RGB for hue 0..359 at S=1 V=0.6667 (same formula as old per-fragment HSV).
765 // Indexed by tk-1000; avoids HSV ALU every fragment while keeping per-window tint in uProgress.
766 const vec3 HUE_RGB[360] = vec3[](
767 vec3(0.6667, 0.0, 0.0), vec3(0.6667, 0.011112, 0.0), vec3(0.6667, 0.022223, 0.0), vec3(0.6667, 0.033335, 0.0),
768 vec3(0.6667, 0.044447, 0.0), vec3(0.6667, 0.055558, 0.0), vec3(0.6667, 0.06667, 0.0), vec3(0.6667, 0.077782, 0.0),
769 vec3(0.6667, 0.088893, 0.0), vec3(0.6667, 0.100005, 0.0), vec3(0.6667, 0.111117, 0.0), vec3(0.6667, 0.122228, 0.0),
770 vec3(0.6667, 0.13334, 0.0), vec3(0.6667, 0.144452, 0.0), vec3(0.6667, 0.155563, 0.0), vec3(0.6667, 0.166675, 0.0),
771 vec3(0.6667, 0.177787, 0.0), vec3(0.6667, 0.188898, 0.0), vec3(0.6667, 0.20001, 0.0), vec3(0.6667, 0.211122, 0.0),
772 vec3(0.6667, 0.222233, 0.0), vec3(0.6667, 0.233345, 0.0), vec3(0.6667, 0.244457, 0.0), vec3(0.6667, 0.255568, 0.0),
773 vec3(0.6667, 0.26668, 0.0), vec3(0.6667, 0.277792, 0.0), vec3(0.6667, 0.288903, 0.0), vec3(0.6667, 0.300015, 0.0),
774 vec3(0.6667, 0.311127, 0.0), vec3(0.6667, 0.322238, 0.0), vec3(0.6667, 0.33335, 0.0), vec3(0.6667, 0.344462, 0.0),
775 vec3(0.6667, 0.355573, 0.0), vec3(0.6667, 0.366685, 0.0), vec3(0.6667, 0.377797, 0.0), vec3(0.6667, 0.388908, 0.0),
776 vec3(0.6667, 0.40002, 0.0), vec3(0.6667, 0.411132, 0.0), vec3(0.6667, 0.422243, 0.0), vec3(0.6667, 0.433355, 0.0),
777 vec3(0.6667, 0.444467, 0.0), vec3(0.6667, 0.455578, 0.0), vec3(0.6667, 0.46669, 0.0), vec3(0.6667, 0.477802, 0.0),
778 vec3(0.6667, 0.488913, 0.0), vec3(0.6667, 0.500025, 0.0), vec3(0.6667, 0.511137, 0.0), vec3(0.6667, 0.522248, 0.0),
779 vec3(0.6667, 0.53336, 0.0), vec3(0.6667, 0.544472, 0.0), vec3(0.6667, 0.555583, 0.0), vec3(0.6667, 0.566695, 0.0),
780 vec3(0.6667, 0.577807, 0.0), vec3(0.6667, 0.588918, 0.0), vec3(0.6667, 0.60003, 0.0), vec3(0.6667, 0.611142, 0.0),
781 vec3(0.6667, 0.622253, 0.0), vec3(0.6667, 0.633365, 0.0), vec3(0.6667, 0.644477, 0.0), vec3(0.6667, 0.655588, 0.0),
782 vec3(0.6667, 0.6667, 0.0), vec3(0.655588, 0.6667, 0.0), vec3(0.644477, 0.6667, 0.0), vec3(0.633365, 0.6667, 0.0),
783 vec3(0.622253, 0.6667, 0.0), vec3(0.611142, 0.6667, 0.0), vec3(0.60003, 0.6667, 0.0), vec3(0.588918, 0.6667, 0.0),
784 vec3(0.577807, 0.6667, 0.0), vec3(0.566695, 0.6667, 0.0), vec3(0.555583, 0.6667, 0.0), vec3(0.544472, 0.6667, 0.0),
785 vec3(0.53336, 0.6667, 0.0), vec3(0.522248, 0.6667, 0.0), vec3(0.511137, 0.6667, 0.0), vec3(0.500025, 0.6667, 0.0),
786 vec3(0.488913, 0.6667, 0.0), vec3(0.477802, 0.6667, 0.0), vec3(0.46669, 0.6667, 0.0), vec3(0.455578, 0.6667, 0.0),
787 vec3(0.444467, 0.6667, 0.0), vec3(0.433355, 0.6667, 0.0), vec3(0.422243, 0.6667, 0.0), vec3(0.411132, 0.6667, 0.0),
788 vec3(0.40002, 0.6667, 0.0), vec3(0.388908, 0.6667, 0.0), vec3(0.377797, 0.6667, 0.0), vec3(0.366685, 0.6667, 0.0),
789 vec3(0.355573, 0.6667, 0.0), vec3(0.344462, 0.6667, 0.0), vec3(0.33335, 0.6667, 0.0), vec3(0.322238, 0.6667, 0.0),
790 vec3(0.311127, 0.6667, 0.0), vec3(0.300015, 0.6667, 0.0), vec3(0.288903, 0.6667, 0.0), vec3(0.277792, 0.6667, 0.0),
791 vec3(0.26668, 0.6667, 0.0), vec3(0.255568, 0.6667, 0.0), vec3(0.244457, 0.6667, 0.0), vec3(0.233345, 0.6667, 0.0),
792 vec3(0.222233, 0.6667, 0.0), vec3(0.211122, 0.6667, 0.0), vec3(0.20001, 0.6667, 0.0), vec3(0.188898, 0.6667, 0.0),
793 vec3(0.177787, 0.6667, 0.0), vec3(0.166675, 0.6667, 0.0), vec3(0.155563, 0.6667, 0.0), vec3(0.144452, 0.6667, 0.0),
794 vec3(0.13334, 0.6667, 0.0), vec3(0.122228, 0.6667, 0.0), vec3(0.111117, 0.6667, 0.0), vec3(0.100005, 0.6667, 0.0),
795 vec3(0.088893, 0.6667, 0.0), vec3(0.077782, 0.6667, 0.0), vec3(0.06667, 0.6667, 0.0), vec3(0.055558, 0.6667, 0.0),
796 vec3(0.044447, 0.6667, 0.0), vec3(0.033335, 0.6667, 0.0), vec3(0.022223, 0.6667, 0.0), vec3(0.011112, 0.6667, 0.0),
797 vec3(0.0, 0.6667, 0.0), vec3(0.0, 0.6667, 0.011112), vec3(0.0, 0.6667, 0.022223), vec3(0.0, 0.6667, 0.033335),
798 vec3(0.0, 0.6667, 0.044447), vec3(0.0, 0.6667, 0.055558), vec3(0.0, 0.6667, 0.06667), vec3(0.0, 0.6667, 0.077782),
799 vec3(0.0, 0.6667, 0.088893), vec3(0.0, 0.6667, 0.100005), vec3(0.0, 0.6667, 0.111117), vec3(0.0, 0.6667, 0.122228),
800 vec3(0.0, 0.6667, 0.13334), vec3(0.0, 0.6667, 0.144452), vec3(0.0, 0.6667, 0.155563), vec3(0.0, 0.6667, 0.166675),
801 vec3(0.0, 0.6667, 0.177787), vec3(0.0, 0.6667, 0.188898), vec3(0.0, 0.6667, 0.20001), vec3(0.0, 0.6667, 0.211122),
802 vec3(0.0, 0.6667, 0.222233), vec3(0.0, 0.6667, 0.233345), vec3(0.0, 0.6667, 0.244457), vec3(0.0, 0.6667, 0.255568),
803 vec3(0.0, 0.6667, 0.26668), vec3(0.0, 0.6667, 0.277792), vec3(0.0, 0.6667, 0.288903), vec3(0.0, 0.6667, 0.300015),
804 vec3(0.0, 0.6667, 0.311127), vec3(0.0, 0.6667, 0.322238), vec3(0.0, 0.6667, 0.33335), vec3(0.0, 0.6667, 0.344462),
805 vec3(0.0, 0.6667, 0.355573), vec3(0.0, 0.6667, 0.366685), vec3(0.0, 0.6667, 0.377797), vec3(0.0, 0.6667, 0.388908),
806 vec3(0.0, 0.6667, 0.40002), vec3(0.0, 0.6667, 0.411132), vec3(0.0, 0.6667, 0.422243), vec3(0.0, 0.6667, 0.433355),
807 vec3(0.0, 0.6667, 0.444467), vec3(0.0, 0.6667, 0.455578), vec3(0.0, 0.6667, 0.46669), vec3(0.0, 0.6667, 0.477802),
808 vec3(0.0, 0.6667, 0.488913), vec3(0.0, 0.6667, 0.500025), vec3(0.0, 0.6667, 0.511137), vec3(0.0, 0.6667, 0.522248),
809 vec3(0.0, 0.6667, 0.53336), vec3(0.0, 0.6667, 0.544472), vec3(0.0, 0.6667, 0.555583), vec3(0.0, 0.6667, 0.566695),
810 vec3(0.0, 0.6667, 0.577807), vec3(0.0, 0.6667, 0.588918), vec3(0.0, 0.6667, 0.60003), vec3(0.0, 0.6667, 0.611142),
811 vec3(0.0, 0.6667, 0.622253), vec3(0.0, 0.6667, 0.633365), vec3(0.0, 0.6667, 0.644477), vec3(0.0, 0.6667, 0.655588),
812 vec3(0.0, 0.6667, 0.6667), vec3(0.0, 0.655588, 0.6667), vec3(0.0, 0.644477, 0.6667), vec3(0.0, 0.633365, 0.6667),
813 vec3(0.0, 0.622253, 0.6667), vec3(0.0, 0.611142, 0.6667), vec3(0.0, 0.60003, 0.6667), vec3(0.0, 0.588918, 0.6667),
814 vec3(0.0, 0.577807, 0.6667), vec3(0.0, 0.566695, 0.6667), vec3(0.0, 0.555583, 0.6667), vec3(0.0, 0.544472, 0.6667),
815 vec3(0.0, 0.53336, 0.6667), vec3(0.0, 0.522248, 0.6667), vec3(0.0, 0.511137, 0.6667), vec3(0.0, 0.500025, 0.6667),
816 vec3(0.0, 0.488913, 0.6667), vec3(0.0, 0.477802, 0.6667), vec3(0.0, 0.46669, 0.6667), vec3(0.0, 0.455578, 0.6667),
817 vec3(0.0, 0.444467, 0.6667), vec3(0.0, 0.433355, 0.6667), vec3(0.0, 0.422243, 0.6667), vec3(0.0, 0.411132, 0.6667),
818 vec3(0.0, 0.40002, 0.6667), vec3(0.0, 0.388908, 0.6667), vec3(0.0, 0.377797, 0.6667), vec3(0.0, 0.366685, 0.6667),
819 vec3(0.0, 0.355573, 0.6667), vec3(0.0, 0.344462, 0.6667), vec3(0.0, 0.33335, 0.6667), vec3(0.0, 0.322238, 0.6667),
820 vec3(0.0, 0.311127, 0.6667), vec3(0.0, 0.300015, 0.6667), vec3(0.0, 0.288903, 0.6667), vec3(0.0, 0.277792, 0.6667),
821 vec3(0.0, 0.26668, 0.6667), vec3(0.0, 0.255568, 0.6667), vec3(0.0, 0.244457, 0.6667), vec3(0.0, 0.233345, 0.6667),
822 vec3(0.0, 0.222233, 0.6667), vec3(0.0, 0.211122, 0.6667), vec3(0.0, 0.20001, 0.6667), vec3(0.0, 0.188898, 0.6667),
823 vec3(0.0, 0.177787, 0.6667), vec3(0.0, 0.166675, 0.6667), vec3(0.0, 0.155563, 0.6667), vec3(0.0, 0.144452, 0.6667),
824 vec3(0.0, 0.13334, 0.6667), vec3(0.0, 0.122228, 0.6667), vec3(0.0, 0.111117, 0.6667), vec3(0.0, 0.100005, 0.6667),
825 vec3(0.0, 0.088893, 0.6667), vec3(0.0, 0.077782, 0.6667), vec3(0.0, 0.06667, 0.6667), vec3(0.0, 0.055558, 0.6667),
826 vec3(0.0, 0.044447, 0.6667), vec3(0.0, 0.033335, 0.6667), vec3(0.0, 0.022223, 0.6667), vec3(0.0, 0.011112, 0.6667),
827 vec3(0.0, 0.0, 0.6667), vec3(0.011112, 0.0, 0.6667), vec3(0.022223, 0.0, 0.6667), vec3(0.033335, 0.0, 0.6667),
828 vec3(0.044447, 0.0, 0.6667), vec3(0.055558, 0.0, 0.6667), vec3(0.06667, 0.0, 0.6667), vec3(0.077782, 0.0, 0.6667),
829 vec3(0.088893, 0.0, 0.6667), vec3(0.100005, 0.0, 0.6667), vec3(0.111117, 0.0, 0.6667), vec3(0.122228, 0.0, 0.6667),
830 vec3(0.13334, 0.0, 0.6667), vec3(0.144452, 0.0, 0.6667), vec3(0.155563, 0.0, 0.6667), vec3(0.166675, 0.0, 0.6667),
831 vec3(0.177787, 0.0, 0.6667), vec3(0.188898, 0.0, 0.6667), vec3(0.20001, 0.0, 0.6667), vec3(0.211122, 0.0, 0.6667),
832 vec3(0.222233, 0.0, 0.6667), vec3(0.233345, 0.0, 0.6667), vec3(0.244457, 0.0, 0.6667), vec3(0.255568, 0.0, 0.6667),
833 vec3(0.26668, 0.0, 0.6667), vec3(0.277792, 0.0, 0.6667), vec3(0.288903, 0.0, 0.6667), vec3(0.300015, 0.0, 0.6667),
834 vec3(0.311127, 0.0, 0.6667), vec3(0.322238, 0.0, 0.6667), vec3(0.33335, 0.0, 0.6667), vec3(0.344462, 0.0, 0.6667),
835 vec3(0.355573, 0.0, 0.6667), vec3(0.366685, 0.0, 0.6667), vec3(0.377797, 0.0, 0.6667), vec3(0.388908, 0.0, 0.6667),
836 vec3(0.40002, 0.0, 0.6667), vec3(0.411132, 0.0, 0.6667), vec3(0.422243, 0.0, 0.6667), vec3(0.433355, 0.0, 0.6667),
837 vec3(0.444467, 0.0, 0.6667), vec3(0.455578, 0.0, 0.6667), vec3(0.46669, 0.0, 0.6667), vec3(0.477802, 0.0, 0.6667),
838 vec3(0.488913, 0.0, 0.6667), vec3(0.500025, 0.0, 0.6667), vec3(0.511137, 0.0, 0.6667), vec3(0.522248, 0.0, 0.6667),
839 vec3(0.53336, 0.0, 0.6667), vec3(0.544472, 0.0, 0.6667), vec3(0.555583, 0.0, 0.6667), vec3(0.566695, 0.0, 0.6667),
840 vec3(0.577807, 0.0, 0.6667), vec3(0.588918, 0.0, 0.6667), vec3(0.60003, 0.0, 0.6667), vec3(0.611142, 0.0, 0.6667),
841 vec3(0.622253, 0.0, 0.6667), vec3(0.633365, 0.0, 0.6667), vec3(0.644477, 0.0, 0.6667), vec3(0.655588, 0.0, 0.6667),
842 vec3(0.6667, 0.0, 0.6667), vec3(0.6667, 0.0, 0.655588), vec3(0.6667, 0.0, 0.644477), vec3(0.6667, 0.0, 0.633365),
843 vec3(0.6667, 0.0, 0.622253), vec3(0.6667, 0.0, 0.611142), vec3(0.6667, 0.0, 0.60003), vec3(0.6667, 0.0, 0.588918),
844 vec3(0.6667, 0.0, 0.577807), vec3(0.6667, 0.0, 0.566695), vec3(0.6667, 0.0, 0.555583), vec3(0.6667, 0.0, 0.544472),
845 vec3(0.6667, 0.0, 0.53336), vec3(0.6667, 0.0, 0.522248), vec3(0.6667, 0.0, 0.511137), vec3(0.6667, 0.0, 0.500025),
846 vec3(0.6667, 0.0, 0.488913), vec3(0.6667, 0.0, 0.477802), vec3(0.6667, 0.0, 0.46669), vec3(0.6667, 0.0, 0.455578),
847 vec3(0.6667, 0.0, 0.444467), vec3(0.6667, 0.0, 0.433355), vec3(0.6667, 0.0, 0.422243), vec3(0.6667, 0.0, 0.411132),
848 vec3(0.6667, 0.0, 0.40002), vec3(0.6667, 0.0, 0.388908), vec3(0.6667, 0.0, 0.377797), vec3(0.6667, 0.0, 0.366685),
849 vec3(0.6667, 0.0, 0.355573), vec3(0.6667, 0.0, 0.344462), vec3(0.6667, 0.0, 0.33335), vec3(0.6667, 0.0, 0.322238),
850 vec3(0.6667, 0.0, 0.311127), vec3(0.6667, 0.0, 0.300015), vec3(0.6667, 0.0, 0.288903), vec3(0.6667, 0.0, 0.277792),
851 vec3(0.6667, 0.0, 0.26668), vec3(0.6667, 0.0, 0.255568), vec3(0.6667, 0.0, 0.244457), vec3(0.6667, 0.0, 0.233345),
852 vec3(0.6667, 0.0, 0.222233), vec3(0.6667, 0.0, 0.211122), vec3(0.6667, 0.0, 0.20001), vec3(0.6667, 0.0, 0.188898),
853 vec3(0.6667, 0.0, 0.177787), vec3(0.6667, 0.0, 0.166675), vec3(0.6667, 0.0, 0.155563), vec3(0.6667, 0.0, 0.144452),
854 vec3(0.6667, 0.0, 0.13334), vec3(0.6667, 0.0, 0.122228), vec3(0.6667, 0.0, 0.111117), vec3(0.6667, 0.0, 0.100005),
855 vec3(0.6667, 0.0, 0.088893), vec3(0.6667, 0.0, 0.077782), vec3(0.6667, 0.0, 0.06667), vec3(0.6667, 0.0, 0.055558),
856 vec3(0.6667, 0.0, 0.044447), vec3(0.6667, 0.0, 0.033335), vec3(0.6667, 0.0, 0.022223), vec3(0.6667, 0.0, 0.011112)
857 );
761 858 vec3 tint;
762 859 if (tk >= 999.5) {
763 float h = clamp(tk - 1000.0, 0.0, 359.0);
764 float s = 1.0, v = 0.6667;
765 float ch = v * s;
766 float x = ch * (1.0 - abs(mod(h / 60.0, 2.0) - 1.0));
767 float m = v - ch;
768 vec3 rgb = h < 60.0 ? vec3(ch, x, 0.0) : h < 120.0 ? vec3(x, ch, 0.0)
769 : h < 180.0 ? vec3(0.0, ch, x) : h < 240.0 ? vec3(0.0, x, ch)
770 : h < 300.0 ? vec3(x, 0.0, ch) : vec3(ch, 0.0, x);
771 tint = rgb + vec3(m);
860 int hi = int(clamp(tk - 1000.0, 0.0, 359.0));
861 tint = HUE_RGB[hi];
772 862 } else {
773 863 tint = tk < 0.5 ? vec3(0.0) : tk < 1.5 ? vec3(0.0, 0.0, 0.6667) : tk < 2.5 ? vec3(0.6667, 0.0, 0.0)
774 864 : tk < 3.5 ? vec3(0.0, 0.6667, 0.0) : tk < 4.5 ? vec3(0.4, 0.0, 0.6667) : tk < 5.5 ? vec3(0.6667, 0.6667, 0.0)
@@ -753,22 +753,112 @@ uniform float uDebug; // 2 = show the raw window texture inside the marble
753uniform float uMixCenter; // 0..1 black mix, centre/top zone
753uniform float uMixCenter; // 0..1 black mix, centre/top zone
754
754
755void main() {
755void main() {
756 // per-window state in uProgress (setUniform is global): uProgress = tk * 4096 + m
756 // Per-window state in one float (setUniform is global; animate() values are per-window):
757 // tk 0..10 = named colours; tk >= 1000 = HSV hue (tk-1000) at S=1, V=0.6667
757 // uProgress = tintId + morph01*0.999, tintId 0..10 named or 1000..1359 hue.
758 float tk = floor(uProgress / 4096.0);
758 // morph01 runs 0→1 over the full ShaderUniform animation; uCrumpleEnd scales so c hits 1
759 float c = clamp(uProgress - tk * 4096.0, 0.0, 1.0);
759 // at the morph boundary (same timing as the old overshoot encoding, without a huge offset).
760 if (uCrumpleEnd < -1.0) c = 0.0; // keep uCrumpleEnd alive (still set by the script)
760 float tk = floor(uProgress);
761 float raw = uProgress - tk; // 0..0.999
762 float c = clamp(raw / max(uCrumpleEnd * 0.999, 1e-6), 0.0, 1.0);
763 if (uCrumpleEnd < -1.0) c = 0.0; // keep alive + guard
764 // Precomputed RGB for hue 0..359 at S=1 V=0.6667 (same formula as old per-fragment HSV).
765 // Indexed by tk-1000; avoids HSV ALU every fragment while keeping per-window tint in uProgress.
766 const vec3 HUE_RGB[360] = vec3[](
767 vec3(0.6667, 0.0, 0.0), vec3(0.6667, 0.011112, 0.0), vec3(0.6667, 0.022223, 0.0), vec3(0.6667, 0.033335, 0.0),
768 vec3(0.6667, 0.044447, 0.0), vec3(0.6667, 0.055558, 0.0), vec3(0.6667, 0.06667, 0.0), vec3(0.6667, 0.077782, 0.0),
769 vec3(0.6667, 0.088893, 0.0), vec3(0.6667, 0.100005, 0.0), vec3(0.6667, 0.111117, 0.0), vec3(0.6667, 0.122228, 0.0),
770 vec3(0.6667, 0.13334, 0.0), vec3(0.6667, 0.144452, 0.0), vec3(0.6667, 0.155563, 0.0), vec3(0.6667, 0.166675, 0.0),
771 vec3(0.6667, 0.177787, 0.0), vec3(0.6667, 0.188898, 0.0), vec3(0.6667, 0.20001, 0.0), vec3(0.6667, 0.211122, 0.0),
772 vec3(0.6667, 0.222233, 0.0), vec3(0.6667, 0.233345, 0.0), vec3(0.6667, 0.244457, 0.0), vec3(0.6667, 0.255568, 0.0),
773 vec3(0.6667, 0.26668, 0.0), vec3(0.6667, 0.277792, 0.0), vec3(0.6667, 0.288903, 0.0), vec3(0.6667, 0.300015, 0.0),
774 vec3(0.6667, 0.311127, 0.0), vec3(0.6667, 0.322238, 0.0), vec3(0.6667, 0.33335, 0.0), vec3(0.6667, 0.344462, 0.0),
775 vec3(0.6667, 0.355573, 0.0), vec3(0.6667, 0.366685, 0.0), vec3(0.6667, 0.377797, 0.0), vec3(0.6667, 0.388908, 0.0),
776 vec3(0.6667, 0.40002, 0.0), vec3(0.6667, 0.411132, 0.0), vec3(0.6667, 0.422243, 0.0), vec3(0.6667, 0.433355, 0.0),
777 vec3(0.6667, 0.444467, 0.0), vec3(0.6667, 0.455578, 0.0), vec3(0.6667, 0.46669, 0.0), vec3(0.6667, 0.477802, 0.0),
778 vec3(0.6667, 0.488913, 0.0), vec3(0.6667, 0.500025, 0.0), vec3(0.6667, 0.511137, 0.0), vec3(0.6667, 0.522248, 0.0),
779 vec3(0.6667, 0.53336, 0.0), vec3(0.6667, 0.544472, 0.0), vec3(0.6667, 0.555583, 0.0), vec3(0.6667, 0.566695, 0.0),
780 vec3(0.6667, 0.577807, 0.0), vec3(0.6667, 0.588918, 0.0), vec3(0.6667, 0.60003, 0.0), vec3(0.6667, 0.611142, 0.0),
781 vec3(0.6667, 0.622253, 0.0), vec3(0.6667, 0.633365, 0.0), vec3(0.6667, 0.644477, 0.0), vec3(0.6667, 0.655588, 0.0),
782 vec3(0.6667, 0.6667, 0.0), vec3(0.655588, 0.6667, 0.0), vec3(0.644477, 0.6667, 0.0), vec3(0.633365, 0.6667, 0.0),
783 vec3(0.622253, 0.6667, 0.0), vec3(0.611142, 0.6667, 0.0), vec3(0.60003, 0.6667, 0.0), vec3(0.588918, 0.6667, 0.0),
784 vec3(0.577807, 0.6667, 0.0), vec3(0.566695, 0.6667, 0.0), vec3(0.555583, 0.6667, 0.0), vec3(0.544472, 0.6667, 0.0),
785 vec3(0.53336, 0.6667, 0.0), vec3(0.522248, 0.6667, 0.0), vec3(0.511137, 0.6667, 0.0), vec3(0.500025, 0.6667, 0.0),
786 vec3(0.488913, 0.6667, 0.0), vec3(0.477802, 0.6667, 0.0), vec3(0.46669, 0.6667, 0.0), vec3(0.455578, 0.6667, 0.0),
787 vec3(0.444467, 0.6667, 0.0), vec3(0.433355, 0.6667, 0.0), vec3(0.422243, 0.6667, 0.0), vec3(0.411132, 0.6667, 0.0),
788 vec3(0.40002, 0.6667, 0.0), vec3(0.388908, 0.6667, 0.0), vec3(0.377797, 0.6667, 0.0), vec3(0.366685, 0.6667, 0.0),
789 vec3(0.355573, 0.6667, 0.0), vec3(0.344462, 0.6667, 0.0), vec3(0.33335, 0.6667, 0.0), vec3(0.322238, 0.6667, 0.0),
790 vec3(0.311127, 0.6667, 0.0), vec3(0.300015, 0.6667, 0.0), vec3(0.288903, 0.6667, 0.0), vec3(0.277792, 0.6667, 0.0),
791 vec3(0.26668, 0.6667, 0.0), vec3(0.255568, 0.6667, 0.0), vec3(0.244457, 0.6667, 0.0), vec3(0.233345, 0.6667, 0.0),
792 vec3(0.222233, 0.6667, 0.0), vec3(0.211122, 0.6667, 0.0), vec3(0.20001, 0.6667, 0.0), vec3(0.188898, 0.6667, 0.0),
793 vec3(0.177787, 0.6667, 0.0), vec3(0.166675, 0.6667, 0.0), vec3(0.155563, 0.6667, 0.0), vec3(0.144452, 0.6667, 0.0),
794 vec3(0.13334, 0.6667, 0.0), vec3(0.122228, 0.6667, 0.0), vec3(0.111117, 0.6667, 0.0), vec3(0.100005, 0.6667, 0.0),
795 vec3(0.088893, 0.6667, 0.0), vec3(0.077782, 0.6667, 0.0), vec3(0.06667, 0.6667, 0.0), vec3(0.055558, 0.6667, 0.0),
796 vec3(0.044447, 0.6667, 0.0), vec3(0.033335, 0.6667, 0.0), vec3(0.022223, 0.6667, 0.0), vec3(0.011112, 0.6667, 0.0),
797 vec3(0.0, 0.6667, 0.0), vec3(0.0, 0.6667, 0.011112), vec3(0.0, 0.6667, 0.022223), vec3(0.0, 0.6667, 0.033335),
798 vec3(0.0, 0.6667, 0.044447), vec3(0.0, 0.6667, 0.055558), vec3(0.0, 0.6667, 0.06667), vec3(0.0, 0.6667, 0.077782),
799 vec3(0.0, 0.6667, 0.088893), vec3(0.0, 0.6667, 0.100005), vec3(0.0, 0.6667, 0.111117), vec3(0.0, 0.6667, 0.122228),
800 vec3(0.0, 0.6667, 0.13334), vec3(0.0, 0.6667, 0.144452), vec3(0.0, 0.6667, 0.155563), vec3(0.0, 0.6667, 0.166675),
801 vec3(0.0, 0.6667, 0.177787), vec3(0.0, 0.6667, 0.188898), vec3(0.0, 0.6667, 0.20001), vec3(0.0, 0.6667, 0.211122),
802 vec3(0.0, 0.6667, 0.222233), vec3(0.0, 0.6667, 0.233345), vec3(0.0, 0.6667, 0.244457), vec3(0.0, 0.6667, 0.255568),
803 vec3(0.0, 0.6667, 0.26668), vec3(0.0, 0.6667, 0.277792), vec3(0.0, 0.6667, 0.288903), vec3(0.0, 0.6667, 0.300015),
804 vec3(0.0, 0.6667, 0.311127), vec3(0.0, 0.6667, 0.322238), vec3(0.0, 0.6667, 0.33335), vec3(0.0, 0.6667, 0.344462),
805 vec3(0.0, 0.6667, 0.355573), vec3(0.0, 0.6667, 0.366685), vec3(0.0, 0.6667, 0.377797), vec3(0.0, 0.6667, 0.388908),
806 vec3(0.0, 0.6667, 0.40002), vec3(0.0, 0.6667, 0.411132), vec3(0.0, 0.6667, 0.422243), vec3(0.0, 0.6667, 0.433355),
807 vec3(0.0, 0.6667, 0.444467), vec3(0.0, 0.6667, 0.455578), vec3(0.0, 0.6667, 0.46669), vec3(0.0, 0.6667, 0.477802),
808 vec3(0.0, 0.6667, 0.488913), vec3(0.0, 0.6667, 0.500025), vec3(0.0, 0.6667, 0.511137), vec3(0.0, 0.6667, 0.522248),
809 vec3(0.0, 0.6667, 0.53336), vec3(0.0, 0.6667, 0.544472), vec3(0.0, 0.6667, 0.555583), vec3(0.0, 0.6667, 0.566695),
810 vec3(0.0, 0.6667, 0.577807), vec3(0.0, 0.6667, 0.588918), vec3(0.0, 0.6667, 0.60003), vec3(0.0, 0.6667, 0.611142),
811 vec3(0.0, 0.6667, 0.622253), vec3(0.0, 0.6667, 0.633365), vec3(0.0, 0.6667, 0.644477), vec3(0.0, 0.6667, 0.655588),
812 vec3(0.0, 0.6667, 0.6667), vec3(0.0, 0.655588, 0.6667), vec3(0.0, 0.644477, 0.6667), vec3(0.0, 0.633365, 0.6667),
813 vec3(0.0, 0.622253, 0.6667), vec3(0.0, 0.611142, 0.6667), vec3(0.0, 0.60003, 0.6667), vec3(0.0, 0.588918, 0.6667),
814 vec3(0.0, 0.577807, 0.6667), vec3(0.0, 0.566695, 0.6667), vec3(0.0, 0.555583, 0.6667), vec3(0.0, 0.544472, 0.6667),
815 vec3(0.0, 0.53336, 0.6667), vec3(0.0, 0.522248, 0.6667), vec3(0.0, 0.511137, 0.6667), vec3(0.0, 0.500025, 0.6667),
816 vec3(0.0, 0.488913, 0.6667), vec3(0.0, 0.477802, 0.6667), vec3(0.0, 0.46669, 0.6667), vec3(0.0, 0.455578, 0.6667),
817 vec3(0.0, 0.444467, 0.6667), vec3(0.0, 0.433355, 0.6667), vec3(0.0, 0.422243, 0.6667), vec3(0.0, 0.411132, 0.6667),
818 vec3(0.0, 0.40002, 0.6667), vec3(0.0, 0.388908, 0.6667), vec3(0.0, 0.377797, 0.6667), vec3(0.0, 0.366685, 0.6667),
819 vec3(0.0, 0.355573, 0.6667), vec3(0.0, 0.344462, 0.6667), vec3(0.0, 0.33335, 0.6667), vec3(0.0, 0.322238, 0.6667),
820 vec3(0.0, 0.311127, 0.6667), vec3(0.0, 0.300015, 0.6667), vec3(0.0, 0.288903, 0.6667), vec3(0.0, 0.277792, 0.6667),
821 vec3(0.0, 0.26668, 0.6667), vec3(0.0, 0.255568, 0.6667), vec3(0.0, 0.244457, 0.6667), vec3(0.0, 0.233345, 0.6667),
822 vec3(0.0, 0.222233, 0.6667), vec3(0.0, 0.211122, 0.6667), vec3(0.0, 0.20001, 0.6667), vec3(0.0, 0.188898, 0.6667),
823 vec3(0.0, 0.177787, 0.6667), vec3(0.0, 0.166675, 0.6667), vec3(0.0, 0.155563, 0.6667), vec3(0.0, 0.144452, 0.6667),
824 vec3(0.0, 0.13334, 0.6667), vec3(0.0, 0.122228, 0.6667), vec3(0.0, 0.111117, 0.6667), vec3(0.0, 0.100005, 0.6667),
825 vec3(0.0, 0.088893, 0.6667), vec3(0.0, 0.077782, 0.6667), vec3(0.0, 0.06667, 0.6667), vec3(0.0, 0.055558, 0.6667),
826 vec3(0.0, 0.044447, 0.6667), vec3(0.0, 0.033335, 0.6667), vec3(0.0, 0.022223, 0.6667), vec3(0.0, 0.011112, 0.6667),
827 vec3(0.0, 0.0, 0.6667), vec3(0.011112, 0.0, 0.6667), vec3(0.022223, 0.0, 0.6667), vec3(0.033335, 0.0, 0.6667),
828 vec3(0.044447, 0.0, 0.6667), vec3(0.055558, 0.0, 0.6667), vec3(0.06667, 0.0, 0.6667), vec3(0.077782, 0.0, 0.6667),
829 vec3(0.088893, 0.0, 0.6667), vec3(0.100005, 0.0, 0.6667), vec3(0.111117, 0.0, 0.6667), vec3(0.122228, 0.0, 0.6667),
830 vec3(0.13334, 0.0, 0.6667), vec3(0.144452, 0.0, 0.6667), vec3(0.155563, 0.0, 0.6667), vec3(0.166675, 0.0, 0.6667),
831 vec3(0.177787, 0.0, 0.6667), vec3(0.188898, 0.0, 0.6667), vec3(0.20001, 0.0, 0.6667), vec3(0.211122, 0.0, 0.6667),
832 vec3(0.222233, 0.0, 0.6667), vec3(0.233345, 0.0, 0.6667), vec3(0.244457, 0.0, 0.6667), vec3(0.255568, 0.0, 0.6667),
833 vec3(0.26668, 0.0, 0.6667), vec3(0.277792, 0.0, 0.6667), vec3(0.288903, 0.0, 0.6667), vec3(0.300015, 0.0, 0.6667),
834 vec3(0.311127, 0.0, 0.6667), vec3(0.322238, 0.0, 0.6667), vec3(0.33335, 0.0, 0.6667), vec3(0.344462, 0.0, 0.6667),
835 vec3(0.355573, 0.0, 0.6667), vec3(0.366685, 0.0, 0.6667), vec3(0.377797, 0.0, 0.6667), vec3(0.388908, 0.0, 0.6667),
836 vec3(0.40002, 0.0, 0.6667), vec3(0.411132, 0.0, 0.6667), vec3(0.422243, 0.0, 0.6667), vec3(0.433355, 0.0, 0.6667),
837 vec3(0.444467, 0.0, 0.6667), vec3(0.455578, 0.0, 0.6667), vec3(0.46669, 0.0, 0.6667), vec3(0.477802, 0.0, 0.6667),
838 vec3(0.488913, 0.0, 0.6667), vec3(0.500025, 0.0, 0.6667), vec3(0.511137, 0.0, 0.6667), vec3(0.522248, 0.0, 0.6667),
839 vec3(0.53336, 0.0, 0.6667), vec3(0.544472, 0.0, 0.6667), vec3(0.555583, 0.0, 0.6667), vec3(0.566695, 0.0, 0.6667),
840 vec3(0.577807, 0.0, 0.6667), vec3(0.588918, 0.0, 0.6667), vec3(0.60003, 0.0, 0.6667), vec3(0.611142, 0.0, 0.6667),
841 vec3(0.622253, 0.0, 0.6667), vec3(0.633365, 0.0, 0.6667), vec3(0.644477, 0.0, 0.6667), vec3(0.655588, 0.0, 0.6667),
842 vec3(0.6667, 0.0, 0.6667), vec3(0.6667, 0.0, 0.655588), vec3(0.6667, 0.0, 0.644477), vec3(0.6667, 0.0, 0.633365),
843 vec3(0.6667, 0.0, 0.622253), vec3(0.6667, 0.0, 0.611142), vec3(0.6667, 0.0, 0.60003), vec3(0.6667, 0.0, 0.588918),
844 vec3(0.6667, 0.0, 0.577807), vec3(0.6667, 0.0, 0.566695), vec3(0.6667, 0.0, 0.555583), vec3(0.6667, 0.0, 0.544472),
845 vec3(0.6667, 0.0, 0.53336), vec3(0.6667, 0.0, 0.522248), vec3(0.6667, 0.0, 0.511137), vec3(0.6667, 0.0, 0.500025),
846 vec3(0.6667, 0.0, 0.488913), vec3(0.6667, 0.0, 0.477802), vec3(0.6667, 0.0, 0.46669), vec3(0.6667, 0.0, 0.455578),
847 vec3(0.6667, 0.0, 0.444467), vec3(0.6667, 0.0, 0.433355), vec3(0.6667, 0.0, 0.422243), vec3(0.6667, 0.0, 0.411132),
848 vec3(0.6667, 0.0, 0.40002), vec3(0.6667, 0.0, 0.388908), vec3(0.6667, 0.0, 0.377797), vec3(0.6667, 0.0, 0.366685),
849 vec3(0.6667, 0.0, 0.355573), vec3(0.6667, 0.0, 0.344462), vec3(0.6667, 0.0, 0.33335), vec3(0.6667, 0.0, 0.322238),
850 vec3(0.6667, 0.0, 0.311127), vec3(0.6667, 0.0, 0.300015), vec3(0.6667, 0.0, 0.288903), vec3(0.6667, 0.0, 0.277792),
851 vec3(0.6667, 0.0, 0.26668), vec3(0.6667, 0.0, 0.255568), vec3(0.6667, 0.0, 0.244457), vec3(0.6667, 0.0, 0.233345),
852 vec3(0.6667, 0.0, 0.222233), vec3(0.6667, 0.0, 0.211122), vec3(0.6667, 0.0, 0.20001), vec3(0.6667, 0.0, 0.188898),
853 vec3(0.6667, 0.0, 0.177787), vec3(0.6667, 0.0, 0.166675), vec3(0.6667, 0.0, 0.155563), vec3(0.6667, 0.0, 0.144452),
854 vec3(0.6667, 0.0, 0.13334), vec3(0.6667, 0.0, 0.122228), vec3(0.6667, 0.0, 0.111117), vec3(0.6667, 0.0, 0.100005),
855 vec3(0.6667, 0.0, 0.088893), vec3(0.6667, 0.0, 0.077782), vec3(0.6667, 0.0, 0.06667), vec3(0.6667, 0.0, 0.055558),
856 vec3(0.6667, 0.0, 0.044447), vec3(0.6667, 0.0, 0.033335), vec3(0.6667, 0.0, 0.022223), vec3(0.6667, 0.0, 0.011112)
857 );
761 vec3 tint;
858 vec3 tint;
762 if (tk >= 999.5) {
859 if (tk >= 999.5) {
763 float h = clamp(tk - 1000.0, 0.0, 359.0);
860 int hi = int(clamp(tk - 1000.0, 0.0, 359.0));
764 float s = 1.0, v = 0.6667;
861 tint = HUE_RGB[hi];
765 float ch = v * s;
766 float x = ch * (1.0 - abs(mod(h / 60.0, 2.0) - 1.0));
767 float m = v - ch;
768 vec3 rgb = h < 60.0 ? vec3(ch, x, 0.0) : h < 120.0 ? vec3(x, ch, 0.0)
769 : h < 180.0 ? vec3(0.0, ch, x) : h < 240.0 ? vec3(0.0, x, ch)
770 : h < 300.0 ? vec3(x, 0.0, ch) : vec3(ch, 0.0, x);
771 tint = rgb + vec3(m);
772 } else {
862 } else {
773 tint = tk < 0.5 ? vec3(0.0) : tk < 1.5 ? vec3(0.0, 0.0, 0.6667) : tk < 2.5 ? vec3(0.6667, 0.0, 0.0)
863 tint = tk < 0.5 ? vec3(0.0) : tk < 1.5 ? vec3(0.0, 0.0, 0.6667) : tk < 2.5 ? vec3(0.6667, 0.0, 0.0)
774 : tk < 3.5 ? vec3(0.0, 0.6667, 0.0) : tk < 4.5 ? vec3(0.4, 0.0, 0.6667) : tk < 5.5 ? vec3(0.6667, 0.6667, 0.0)
864 : tk < 3.5 ? vec3(0.0, 0.6667, 0.0) : tk < 4.5 ? vec3(0.4, 0.0, 0.6667) : tk < 5.5 ? vec3(0.6667, 0.6667, 0.0)
kwin6_effect_marble/contents/ui/config.ui +1 −1
@@ -14,7 +14,7 @@
14 14 <item row="4" column="0"><widget class="QLabel" name="l5"><property name="text"><string>Black mix center (%)</string></property></widget></item>
15 15 <item row="4" column="1"><widget class="QSpinBox" name="kcfg_BlackMixCenter"><property name="maximum"><number>100</number></property></widget></item>
16 16 <item row="5" column="0"><widget class="QLabel" name="l6"><property name="text"><string>Mix colour</string></property><property name="toolTip"><string>Zwart–Bruin: vaste mixkleur. Willekeurig: nieuwe kleur per volgend venster. Semiwillekeurig: vaste kleur per programma (windowClass).</string></property></widget></item>
17 <item row="5" column="1"><widget class="QComboBox" name="kcfg_MixColor"><item><property name="text"><string>Zwart (#000000)</string></property></item><item><property name="text"><string>Blauw (#0000aa)</string></property></item><item><property name="text"><string>Rood (#aa0000)</string></property></item><item><property name="text"><string>Groen (#00aa00)</string></property></item><item><property name="text"><string>Paars (#6600aa)</string></property></item><item><property name="text"><string>Geel (#aaaa00)</string></property></item><item><property name="text"><string>Oranje (#aa5500)</string></property></item><item><property name="text"><string>Cyaan (#00aaaa)</string></property></item><item><property name="text"><string>Roze (#aa0066)</string></property></item><item><property name="text"><string>Grijs (#555555)</string></property></item><item><property name="text"><string>Bruin (#553300)</string></property></item><item><property name="text"><string>Willekeurig</string></property></item><item><property name="text"><string>Semiwillekeurig</string></property></item></widget><property name="toolTip"><string>Zwart–Bruin: vaste mixkleur.&#10;Willekeurig: elk volgend venster een nieuwe kleur (teller → kleurtoon), vaste saturatie/helderheid.&#10;Semiwillekeurig: vaste kleur per programma uit windowClass (hash → kleurtoon); Dolphin blijft dezelfde tint.</string></property></item>
17 <item row="5" column="1"><widget class="QComboBox" name="kcfg_MixColor"><item><property name="text"><string>Zwart (#000000)</string></property></item><item><property name="text"><string>Blauw (#0000aa)</string></property></item><item><property name="text"><string>Rood (#aa0000)</string></property></item><item><property name="text"><string>Groen (#00aa00)</string></property></item><item><property name="text"><string>Paars (#6600aa)</string></property></item><item><property name="text"><string>Geel (#aaaa00)</string></property></item><item><property name="text"><string>Oranje (#aa5500)</string></property></item><item><property name="text"><string>Cyaan (#00aaaa)</string></property></item><item><property name="text"><string>Roze (#aa0066)</string></property></item><item><property name="text"><string>Grijs (#555555)</string></property></item><item><property name="text"><string>Bruin (#553300)</string></property></item><item><property name="text"><string>Willekeurig</string></property></item><item><property name="text"><string>Semiwillekeurig</string></property></item><property name="toolTip"><string>Zwart–Bruin: vaste mixkleur.&#10;Willekeurig: elk volgend venster een nieuwe kleur (teller → kleurtoon), vaste saturatie/helderheid.&#10;Semiwillekeurig: vaste kleur per programma uit windowClass (hash → kleurtoon); Dolphin blijft dezelfde tint.</string></property></widget></item>
18 18 <item row="6" column="0"><widget class="QLabel" name="l7"><property name="text"><string>Marble size (px)</string></property></widget></item>
19 19 <item row="6" column="1"><widget class="QSpinBox" name="kcfg_MarbleSize"><property name="minimum"><number>4</number></property><property name="maximum"><number>1000</number></property></widget></item>
20 20 </layout>
@@ -14,7 +14,7 @@
14 <item row="4" column="0"><widget class="QLabel" name="l5"><property name="text"><string>Black mix center (%)</string></property></widget></item>
14 <item row="4" column="0"><widget class="QLabel" name="l5"><property name="text"><string>Black mix center (%)</string></property></widget></item>
15 <item row="4" column="1"><widget class="QSpinBox" name="kcfg_BlackMixCenter"><property name="maximum"><number>100</number></property></widget></item>
15 <item row="4" column="1"><widget class="QSpinBox" name="kcfg_BlackMixCenter"><property name="maximum"><number>100</number></property></widget></item>
16 <item row="5" column="0"><widget class="QLabel" name="l6"><property name="text"><string>Mix colour</string></property><property name="toolTip"><string>Zwart–Bruin: vaste mixkleur. Willekeurig: nieuwe kleur per volgend venster. Semiwillekeurig: vaste kleur per programma (windowClass).</string></property></widget></item>
16 <item row="5" column="0"><widget class="QLabel" name="l6"><property name="text"><string>Mix colour</string></property><property name="toolTip"><string>Zwart–Bruin: vaste mixkleur. Willekeurig: nieuwe kleur per volgend venster. Semiwillekeurig: vaste kleur per programma (windowClass).</string></property></widget></item>
17 <item row="5" column="1"><widget class="QComboBox" name="kcfg_MixColor"><item><property name="text"><string>Zwart (#000000)</string></property></item><item><property name="text"><string>Blauw (#0000aa)</string></property></item><item><property name="text"><string>Rood (#aa0000)</string></property></item><item><property name="text"><string>Groen (#00aa00)</string></property></item><item><property name="text"><string>Paars (#6600aa)</string></property></item><item><property name="text"><string>Geel (#aaaa00)</string></property></item><item><property name="text"><string>Oranje (#aa5500)</string></property></item><item><property name="text"><string>Cyaan (#00aaaa)</string></property></item><item><property name="text"><string>Roze (#aa0066)</string></property></item><item><property name="text"><string>Grijs (#555555)</string></property></item><item><property name="text"><string>Bruin (#553300)</string></property></item><item><property name="text"><string>Willekeurig</string></property></item><item><property name="text"><string>Semiwillekeurig</string></property></item></widget><property name="toolTip"><string>Zwart–Bruin: vaste mixkleur.&#10;Willekeurig: elk volgend venster een nieuwe kleur (teller → kleurtoon), vaste saturatie/helderheid.&#10;Semiwillekeurig: vaste kleur per programma uit windowClass (hash → kleurtoon); Dolphin blijft dezelfde tint.</string></property></item>
17 <item row="5" column="1"><widget class="QComboBox" name="kcfg_MixColor"><item><property name="text"><string>Zwart (#000000)</string></property></item><item><property name="text"><string>Blauw (#0000aa)</string></property></item><item><property name="text"><string>Rood (#aa0000)</string></property></item><item><property name="text"><string>Groen (#00aa00)</string></property></item><item><property name="text"><string>Paars (#6600aa)</string></property></item><item><property name="text"><string>Geel (#aaaa00)</string></property></item><item><property name="text"><string>Oranje (#aa5500)</string></property></item><item><property name="text"><string>Cyaan (#00aaaa)</string></property></item><item><property name="text"><string>Roze (#aa0066)</string></property></item><item><property name="text"><string>Grijs (#555555)</string></property></item><item><property name="text"><string>Bruin (#553300)</string></property></item><item><property name="text"><string>Willekeurig</string></property></item><item><property name="text"><string>Semiwillekeurig</string></property></item><property name="toolTip"><string>Zwart–Bruin: vaste mixkleur.&#10;Willekeurig: elk volgend venster een nieuwe kleur (teller → kleurtoon), vaste saturatie/helderheid.&#10;Semiwillekeurig: vaste kleur per programma uit windowClass (hash → kleurtoon); Dolphin blijft dezelfde tint.</string></property></widget></item>
18 <item row="6" column="0"><widget class="QLabel" name="l7"><property name="text"><string>Marble size (px)</string></property></widget></item>
18 <item row="6" column="0"><widget class="QLabel" name="l7"><property name="text"><string>Marble size (px)</string></property></widget></item>
19 <item row="6" column="1"><widget class="QSpinBox" name="kcfg_MarbleSize"><property name="minimum"><number>4</number></property><property name="maximum"><number>1000</number></property></widget></item>
19 <item row="6" column="1"><widget class="QSpinBox" name="kcfg_MarbleSize"><property name="minimum"><number>4</number></property><property name="maximum"><number>1000</number></property></widget></item>
20 </layout>
20 </layout>
kwin6_effect_marble_minimize/contents/code/main.js +33 −11
@@ -94,9 +94,11 @@ class BurnMyWindowsMarbleMinimizeEffect {
94 94 this.fallDuration = animationTime(Math.round(1000 * Math.sqrt(2 * this.fallDistance / this.gravity)));
95 95 effect.setUniform(this.shader, 'uDuration', (this.duration + this.pause + this.fallDuration) * 0.001);
96 96 // 0..10 named colours, 11 = Willekeurig, 12 = Semiwillekeurig. Older >12 → 12.
97 let mc = Math.floor(Number(effect.readConfig('MixColor', 0)));
97 let mc = Math.floor(Number(effect.readConfig('MixColor', 12)));
98 98 if (!(mc >= 0)) mc = 0; else if (mc > 12) mc = 12;
99 99 this.tintMode = mc;
100 // Drop per-class cache when settings reload (MixColor / speed etc. may change).
101 this.classHueCache = Object.create(null);
100 102 this.applyTint(null, false);
101 103 effect.setUniform(this.shader, 'uMarbleSize', Math.max(4, Number(effect.readConfig('MarbleSize', 42))));
102 104 this.debug = Math.max(0, Number(effect.readConfig('DebugMarble', 0)) | 0);
@@ -110,9 +112,16 @@ class BurnMyWindowsMarbleMinimizeEffect {
110 112 // Mix target. tintMode 0..10 = named colours; 11 = Willekeurig (seq → hue);
111 113 // 12 = Semiwillekeurig (hash of window.windowClass → hue). Random modes use HSV
112 114 // with fixed S=1 and V=0.6667 (matches the named #aa… glass colours), not a palette.
115 // Final RGB is computed once in JS (and cached per windowClass for mode 12); the shader
116 // only indexes a precomputed hue→RGB table — never runs HSV per fragment.
117 // Single-channel pack: uProgress = tintId + morph01*0.999 (tintId 0..10 or 1000..1359).
118 // Callers may still pass overshoot m (m_to = 1/crumpleEnd); values m>=1 encode as morph=1.
119 // Shader restores timing with uCrumpleEnd: c = raw/(uCrumpleEnd*0.999). No second ShaderUniform.
113 120 prog(window, m) {
114 const v = (window.bmwBase || 0) + Math.min(4000, Math.max(0, m));
115 if (this.debug) console.log('MARBLEDBG prog caption=' + window.caption + ' m=' + m + ' v=' + v);
121 const tid = (window && window.bmwTintId >= 0) ? window.bmwTintId : (window ? (window.bmwBase || 0) : 0);
122 const morph = Math.min(1, Math.max(0, m));
123 const v = tid + morph * 0.999;
124 if (this.debug) console.log('MARBLEDBG prog caption=' + window.caption + ' m=' + m + ' morph=' + morph + ' v=' + v + ' tintId=' + tid);
116 125 return v;
117 126 }
118 127
@@ -142,10 +151,21 @@ class BurnMyWindowsMarbleMinimizeEffect {
142 151 c = FIXED[this.tintMode];
143 152 if (window) { window.bmwTint = null; window.bmwHue = null; }
144 153 } else if (this.tintMode === 12 && window) {
145 // Semiwillekeurig: stable per application (windowClass); empty → black
154 // Semiwillekeurig: stable per application (windowClass); empty → black.
155 // RGB/hue computed once per class (cached); shader gets ready RGB via HUE_RGB[hue] (no per-fragment HSV).
146 156 const cls = String(window.windowClass || '').trim();
147 157 if (!cls) { c = FIXED[0]; hue = null; }
148 else { hue = this.hashHue(cls); c = this.hsvToRgb(hue, HS, HV); }
158 else {
159 if (!this.classHueCache) this.classHueCache = Object.create(null);
160 let cached = this.classHueCache[cls];
161 if (!cached) {
162 hue = this.hashHue(cls);
163 c = this.hsvToRgb(hue, HS, HV);
164 this.classHueCache[cls] = { hue: hue, rgb: c };
165 } else {
166 hue = cached.hue; c = cached.rgb;
167 }
168 }
149 169 window.bmwTint = c; window.bmwHue = hue;
150 170 } else if (window && reuse && window.bmwTint) {
151 171 c = window.bmwTint; hue = (window.bmwHue == null ? null : window.bmwHue);
@@ -160,12 +180,14 @@ class BurnMyWindowsMarbleMinimizeEffect {
160 180 c = FIXED[0];
161 181 }
162 182 if (window) {
163 // Shader: tk < 11 → named table; tk >= 1000 → HSV hue = tk - 1000
164 window.bmwBase = (hue == null)
165 ? 4096 * Math.max(0, FIXED.findIndex(x => x[0] == c[0] && x[1] == c[1] && x[2] == c[2]))
166 : 4096 * (1000 + (hue | 0));
183 // Shader: tk < 11 → named table; tk >= 1000 → HUE_RGB[tk-1000].
184 // Compact id in uProgress integer part (NOT *4096 — that destroyed float32 morph precision).
185 window.bmwTintId = (hue == null)
186 ? Math.max(0, FIXED.findIndex(x => x[0] == c[0] && x[1] == c[1] && x[2] == c[2]))
187 : (1000 + (hue | 0));
188 window.bmwBase = window.bmwTintId;
167 189 }
168 if (this.debug && window) console.log('MARBLEDBG tint caption=' + window.caption + ' class=' + window.windowClass + ' seq=' + window.bmwSeq + ' hue=' + hue + ' reuse=' + reuse + ' mode=' + this.tintMode + ' base=' + window.bmwBase);
190 if (this.debug && window) console.log('MARBLEDBG tint caption=' + window.caption + ' class=' + window.windowClass + ' seq=' + window.bmwSeq + ' hue=' + hue + ' reuse=' + reuse + ' mode=' + this.tintMode + ' tintId=' + window.bmwTintId);
169 191 effect.setUniform(this.shader, 'uTintR', c[0]);
170 192 effect.setUniform(this.shader, 'uTintG', c[1]);
171 193 effect.setUniform(this.shader, 'uTintB', c[2]);
@@ -324,7 +346,7 @@ class BurnMyWindowsMarbleMinimizeEffect {
324 346 effect.setUniform(this.shader, "uForOpening", 0.0);
325 347 effect.setUniform(this.shader, "uIsFullscreen", window.fullScreen ? 1.0 : 0.0);
326 348 effect.setUniform(this.shader, "uDuration", total * 0.001);
327 effect.setUniform(this.shader, "uCrumpleEnd", this.duration / Math.max(1, total));
349 effect.setUniform(this.shader, "uCrumpleEnd", this.duration / Math.max(1, total + 3000)); // match ShaderUniform duration (total+3000)
328 350 // one shader animation, deliberately longer; cancelled after the invisible tail (flash fix)
329 351 window.bmwMinAnimation = animate({
330 352 window: window, curve: QEasingCurve.Linear, duration: total + 3000,
@@ -94,9 +94,11 @@ class BurnMyWindowsMarbleMinimizeEffect {
94 this.fallDuration = animationTime(Math.round(1000 * Math.sqrt(2 * this.fallDistance / this.gravity)));
94 this.fallDuration = animationTime(Math.round(1000 * Math.sqrt(2 * this.fallDistance / this.gravity)));
95 effect.setUniform(this.shader, 'uDuration', (this.duration + this.pause + this.fallDuration) * 0.001);
95 effect.setUniform(this.shader, 'uDuration', (this.duration + this.pause + this.fallDuration) * 0.001);
96 // 0..10 named colours, 11 = Willekeurig, 12 = Semiwillekeurig. Older >12 → 12.
96 // 0..10 named colours, 11 = Willekeurig, 12 = Semiwillekeurig. Older >12 → 12.
97 let mc = Math.floor(Number(effect.readConfig('MixColor', 0)));
97 let mc = Math.floor(Number(effect.readConfig('MixColor', 12)));
98 if (!(mc >= 0)) mc = 0; else if (mc > 12) mc = 12;
98 if (!(mc >= 0)) mc = 0; else if (mc > 12) mc = 12;
99 this.tintMode = mc;
99 this.tintMode = mc;
100 // Drop per-class cache when settings reload (MixColor / speed etc. may change).
101 this.classHueCache = Object.create(null);
100 this.applyTint(null, false);
102 this.applyTint(null, false);
101 effect.setUniform(this.shader, 'uMarbleSize', Math.max(4, Number(effect.readConfig('MarbleSize', 42))));
103 effect.setUniform(this.shader, 'uMarbleSize', Math.max(4, Number(effect.readConfig('MarbleSize', 42))));
102 this.debug = Math.max(0, Number(effect.readConfig('DebugMarble', 0)) | 0);
104 this.debug = Math.max(0, Number(effect.readConfig('DebugMarble', 0)) | 0);
@@ -110,9 +112,16 @@ class BurnMyWindowsMarbleMinimizeEffect {
110 // Mix target. tintMode 0..10 = named colours; 11 = Willekeurig (seq → hue);
112 // Mix target. tintMode 0..10 = named colours; 11 = Willekeurig (seq → hue);
111 // 12 = Semiwillekeurig (hash of window.windowClass → hue). Random modes use HSV
113 // 12 = Semiwillekeurig (hash of window.windowClass → hue). Random modes use HSV
112 // with fixed S=1 and V=0.6667 (matches the named #aa… glass colours), not a palette.
114 // with fixed S=1 and V=0.6667 (matches the named #aa… glass colours), not a palette.
115 // Final RGB is computed once in JS (and cached per windowClass for mode 12); the shader
116 // only indexes a precomputed hue→RGB table — never runs HSV per fragment.
117 // Single-channel pack: uProgress = tintId + morph01*0.999 (tintId 0..10 or 1000..1359).
118 // Callers may still pass overshoot m (m_to = 1/crumpleEnd); values m>=1 encode as morph=1.
119 // Shader restores timing with uCrumpleEnd: c = raw/(uCrumpleEnd*0.999). No second ShaderUniform.
113 prog(window, m) {
120 prog(window, m) {
114 const v = (window.bmwBase || 0) + Math.min(4000, Math.max(0, m));
121 const tid = (window && window.bmwTintId >= 0) ? window.bmwTintId : (window ? (window.bmwBase || 0) : 0);
115 if (this.debug) console.log('MARBLEDBG prog caption=' + window.caption + ' m=' + m + ' v=' + v);
122 const morph = Math.min(1, Math.max(0, m));
123 const v = tid + morph * 0.999;
124 if (this.debug) console.log('MARBLEDBG prog caption=' + window.caption + ' m=' + m + ' morph=' + morph + ' v=' + v + ' tintId=' + tid);
116 return v;
125 return v;
117 }
126 }
118
127
@@ -142,10 +151,21 @@ class BurnMyWindowsMarbleMinimizeEffect {
142 c = FIXED[this.tintMode];
151 c = FIXED[this.tintMode];
143 if (window) { window.bmwTint = null; window.bmwHue = null; }
152 if (window) { window.bmwTint = null; window.bmwHue = null; }
144 } else if (this.tintMode === 12 && window) {
153 } else if (this.tintMode === 12 && window) {
145 // Semiwillekeurig: stable per application (windowClass); empty → black
154 // Semiwillekeurig: stable per application (windowClass); empty → black.
155 // RGB/hue computed once per class (cached); shader gets ready RGB via HUE_RGB[hue] (no per-fragment HSV).
146 const cls = String(window.windowClass || '').trim();
156 const cls = String(window.windowClass || '').trim();
147 if (!cls) { c = FIXED[0]; hue = null; }
157 if (!cls) { c = FIXED[0]; hue = null; }
148 else { hue = this.hashHue(cls); c = this.hsvToRgb(hue, HS, HV); }
158 else {
159 if (!this.classHueCache) this.classHueCache = Object.create(null);
160 let cached = this.classHueCache[cls];
161 if (!cached) {
162 hue = this.hashHue(cls);
163 c = this.hsvToRgb(hue, HS, HV);
164 this.classHueCache[cls] = { hue: hue, rgb: c };
165 } else {
166 hue = cached.hue; c = cached.rgb;
167 }
168 }
149 window.bmwTint = c; window.bmwHue = hue;
169 window.bmwTint = c; window.bmwHue = hue;
150 } else if (window && reuse && window.bmwTint) {
170 } else if (window && reuse && window.bmwTint) {
151 c = window.bmwTint; hue = (window.bmwHue == null ? null : window.bmwHue);
171 c = window.bmwTint; hue = (window.bmwHue == null ? null : window.bmwHue);
@@ -160,12 +180,14 @@ class BurnMyWindowsMarbleMinimizeEffect {
160 c = FIXED[0];
180 c = FIXED[0];
161 }
181 }
162 if (window) {
182 if (window) {
163 // Shader: tk < 11 → named table; tk >= 1000 → HSV hue = tk - 1000
183 // Shader: tk < 11 → named table; tk >= 1000 → HUE_RGB[tk-1000].
164 window.bmwBase = (hue == null)
184 // Compact id in uProgress integer part (NOT *4096 — that destroyed float32 morph precision).
165 ? 4096 * Math.max(0, FIXED.findIndex(x => x[0] == c[0] && x[1] == c[1] && x[2] == c[2]))
185 window.bmwTintId = (hue == null)
166 : 4096 * (1000 + (hue | 0));
186 ? Math.max(0, FIXED.findIndex(x => x[0] == c[0] && x[1] == c[1] && x[2] == c[2]))
187 : (1000 + (hue | 0));
188 window.bmwBase = window.bmwTintId;
167 }
189 }
168 if (this.debug && window) console.log('MARBLEDBG tint caption=' + window.caption + ' class=' + window.windowClass + ' seq=' + window.bmwSeq + ' hue=' + hue + ' reuse=' + reuse + ' mode=' + this.tintMode + ' base=' + window.bmwBase);
190 if (this.debug && window) console.log('MARBLEDBG tint caption=' + window.caption + ' class=' + window.windowClass + ' seq=' + window.bmwSeq + ' hue=' + hue + ' reuse=' + reuse + ' mode=' + this.tintMode + ' tintId=' + window.bmwTintId);
169 effect.setUniform(this.shader, 'uTintR', c[0]);
191 effect.setUniform(this.shader, 'uTintR', c[0]);
170 effect.setUniform(this.shader, 'uTintG', c[1]);
192 effect.setUniform(this.shader, 'uTintG', c[1]);
171 effect.setUniform(this.shader, 'uTintB', c[2]);
193 effect.setUniform(this.shader, 'uTintB', c[2]);
@@ -324,7 +346,7 @@ class BurnMyWindowsMarbleMinimizeEffect {
324 effect.setUniform(this.shader, "uForOpening", 0.0);
346 effect.setUniform(this.shader, "uForOpening", 0.0);
325 effect.setUniform(this.shader, "uIsFullscreen", window.fullScreen ? 1.0 : 0.0);
347 effect.setUniform(this.shader, "uIsFullscreen", window.fullScreen ? 1.0 : 0.0);
326 effect.setUniform(this.shader, "uDuration", total * 0.001);
348 effect.setUniform(this.shader, "uDuration", total * 0.001);
327 effect.setUniform(this.shader, "uCrumpleEnd", this.duration / Math.max(1, total));
349 effect.setUniform(this.shader, "uCrumpleEnd", this.duration / Math.max(1, total + 3000)); // match ShaderUniform duration (total+3000)
328 // one shader animation, deliberately longer; cancelled after the invisible tail (flash fix)
350 // one shader animation, deliberately longer; cancelled after the invisible tail (flash fix)
329 window.bmwMinAnimation = animate({
351 window.bmwMinAnimation = animate({
330 window: window, curve: QEasingCurve.Linear, duration: total + 3000,
352 window: window, curve: QEasingCurve.Linear, duration: total + 3000,
kwin6_effect_marble_minimize/contents/config/main.xml +1 −1
@@ -7,7 +7,7 @@
7 7 <entry name="Gravity" type="UInt"><default>4500</default></entry>
8 8 <entry name="BlackMixOuter" type="UInt"><default>80</default></entry>
9 9 <entry name="BlackMixCenter" type="UInt"><default>5</default></entry>
10 <entry name="MixColor" type="Int"><default>0</default></entry>
10 <entry name="MixColor" type="Int"><default>12</default></entry>
11 11 <entry name="MarbleSize" type="UInt"><default>42</default></entry>
12 12 <entry name="DebugMarble" type="Int"><default>0</default></entry>
13 13 </group>
@@ -7,7 +7,7 @@
7 <entry name="Gravity" type="UInt"><default>4500</default></entry>
7 <entry name="Gravity" type="UInt"><default>4500</default></entry>
8 <entry name="BlackMixOuter" type="UInt"><default>80</default></entry>
8 <entry name="BlackMixOuter" type="UInt"><default>80</default></entry>
9 <entry name="BlackMixCenter" type="UInt"><default>5</default></entry>
9 <entry name="BlackMixCenter" type="UInt"><default>5</default></entry>
10 <entry name="MixColor" type="Int"><default>0</default></entry>
10 <entry name="MixColor" type="Int"><default>12</default></entry>
11 <entry name="MarbleSize" type="UInt"><default>42</default></entry>
11 <entry name="MarbleSize" type="UInt"><default>42</default></entry>
12 <entry name="DebugMarble" type="Int"><default>0</default></entry>
12 <entry name="DebugMarble" type="Int"><default>0</default></entry>
13 </group>
13 </group>
kwin6_effect_marble_minimize/contents/shaders/marble.frag +104 −14
@@ -752,22 +752,112 @@ uniform float uDebug; // 2 = show the raw window texture inside the marble
752 752 uniform float uMixCenter; // 0..1 black mix, centre/top zone
753 753
754 754 void main() {
755 // per-window state in uProgress (setUniform is global): uProgress = tk * 4096 + m
756 // tk 0..10 = named colours; tk >= 1000 = HSV hue (tk-1000) at S=1, V=0.6667
757 float tk = floor(uProgress / 4096.0);
758 float c = clamp(uProgress - tk * 4096.0, 0.0, 1.0);
759 if (uCrumpleEnd < -1.0) c = 0.0; // keep uCrumpleEnd alive (still set by the script)
755 // Per-window state in one float (setUniform is global; animate() values are per-window):
756 // uProgress = tintId + morph01*0.999, tintId 0..10 named or 1000..1359 hue.
757 // morph01 runs 0→1 over the full ShaderUniform animation; uCrumpleEnd scales so c hits 1
758 // at the morph boundary (same timing as the old overshoot encoding, without a huge offset).
759 float tk = floor(uProgress);
760 float raw = uProgress - tk; // 0..0.999
761 float c = clamp(raw / max(uCrumpleEnd * 0.999, 1e-6), 0.0, 1.0);
762 if (uCrumpleEnd < -1.0) c = 0.0; // keep alive + guard
763 // Precomputed RGB for hue 0..359 at S=1 V=0.6667 (same formula as old per-fragment HSV).
764 // Indexed by tk-1000; avoids HSV ALU every fragment while keeping per-window tint in uProgress.
765 const vec3 HUE_RGB[360] = vec3[](
766 vec3(0.6667, 0.0, 0.0), vec3(0.6667, 0.011112, 0.0), vec3(0.6667, 0.022223, 0.0), vec3(0.6667, 0.033335, 0.0),
767 vec3(0.6667, 0.044447, 0.0), vec3(0.6667, 0.055558, 0.0), vec3(0.6667, 0.06667, 0.0), vec3(0.6667, 0.077782, 0.0),
768 vec3(0.6667, 0.088893, 0.0), vec3(0.6667, 0.100005, 0.0), vec3(0.6667, 0.111117, 0.0), vec3(0.6667, 0.122228, 0.0),
769 vec3(0.6667, 0.13334, 0.0), vec3(0.6667, 0.144452, 0.0), vec3(0.6667, 0.155563, 0.0), vec3(0.6667, 0.166675, 0.0),
770 vec3(0.6667, 0.177787, 0.0), vec3(0.6667, 0.188898, 0.0), vec3(0.6667, 0.20001, 0.0), vec3(0.6667, 0.211122, 0.0),
771 vec3(0.6667, 0.222233, 0.0), vec3(0.6667, 0.233345, 0.0), vec3(0.6667, 0.244457, 0.0), vec3(0.6667, 0.255568, 0.0),
772 vec3(0.6667, 0.26668, 0.0), vec3(0.6667, 0.277792, 0.0), vec3(0.6667, 0.288903, 0.0), vec3(0.6667, 0.300015, 0.0),
773 vec3(0.6667, 0.311127, 0.0), vec3(0.6667, 0.322238, 0.0), vec3(0.6667, 0.33335, 0.0), vec3(0.6667, 0.344462, 0.0),
774 vec3(0.6667, 0.355573, 0.0), vec3(0.6667, 0.366685, 0.0), vec3(0.6667, 0.377797, 0.0), vec3(0.6667, 0.388908, 0.0),
775 vec3(0.6667, 0.40002, 0.0), vec3(0.6667, 0.411132, 0.0), vec3(0.6667, 0.422243, 0.0), vec3(0.6667, 0.433355, 0.0),
776 vec3(0.6667, 0.444467, 0.0), vec3(0.6667, 0.455578, 0.0), vec3(0.6667, 0.46669, 0.0), vec3(0.6667, 0.477802, 0.0),
777 vec3(0.6667, 0.488913, 0.0), vec3(0.6667, 0.500025, 0.0), vec3(0.6667, 0.511137, 0.0), vec3(0.6667, 0.522248, 0.0),
778 vec3(0.6667, 0.53336, 0.0), vec3(0.6667, 0.544472, 0.0), vec3(0.6667, 0.555583, 0.0), vec3(0.6667, 0.566695, 0.0),
779 vec3(0.6667, 0.577807, 0.0), vec3(0.6667, 0.588918, 0.0), vec3(0.6667, 0.60003, 0.0), vec3(0.6667, 0.611142, 0.0),
780 vec3(0.6667, 0.622253, 0.0), vec3(0.6667, 0.633365, 0.0), vec3(0.6667, 0.644477, 0.0), vec3(0.6667, 0.655588, 0.0),
781 vec3(0.6667, 0.6667, 0.0), vec3(0.655588, 0.6667, 0.0), vec3(0.644477, 0.6667, 0.0), vec3(0.633365, 0.6667, 0.0),
782 vec3(0.622253, 0.6667, 0.0), vec3(0.611142, 0.6667, 0.0), vec3(0.60003, 0.6667, 0.0), vec3(0.588918, 0.6667, 0.0),
783 vec3(0.577807, 0.6667, 0.0), vec3(0.566695, 0.6667, 0.0), vec3(0.555583, 0.6667, 0.0), vec3(0.544472, 0.6667, 0.0),
784 vec3(0.53336, 0.6667, 0.0), vec3(0.522248, 0.6667, 0.0), vec3(0.511137, 0.6667, 0.0), vec3(0.500025, 0.6667, 0.0),
785 vec3(0.488913, 0.6667, 0.0), vec3(0.477802, 0.6667, 0.0), vec3(0.46669, 0.6667, 0.0), vec3(0.455578, 0.6667, 0.0),
786 vec3(0.444467, 0.6667, 0.0), vec3(0.433355, 0.6667, 0.0), vec3(0.422243, 0.6667, 0.0), vec3(0.411132, 0.6667, 0.0),
787 vec3(0.40002, 0.6667, 0.0), vec3(0.388908, 0.6667, 0.0), vec3(0.377797, 0.6667, 0.0), vec3(0.366685, 0.6667, 0.0),
788 vec3(0.355573, 0.6667, 0.0), vec3(0.344462, 0.6667, 0.0), vec3(0.33335, 0.6667, 0.0), vec3(0.322238, 0.6667, 0.0),
789 vec3(0.311127, 0.6667, 0.0), vec3(0.300015, 0.6667, 0.0), vec3(0.288903, 0.6667, 0.0), vec3(0.277792, 0.6667, 0.0),
790 vec3(0.26668, 0.6667, 0.0), vec3(0.255568, 0.6667, 0.0), vec3(0.244457, 0.6667, 0.0), vec3(0.233345, 0.6667, 0.0),
791 vec3(0.222233, 0.6667, 0.0), vec3(0.211122, 0.6667, 0.0), vec3(0.20001, 0.6667, 0.0), vec3(0.188898, 0.6667, 0.0),
792 vec3(0.177787, 0.6667, 0.0), vec3(0.166675, 0.6667, 0.0), vec3(0.155563, 0.6667, 0.0), vec3(0.144452, 0.6667, 0.0),
793 vec3(0.13334, 0.6667, 0.0), vec3(0.122228, 0.6667, 0.0), vec3(0.111117, 0.6667, 0.0), vec3(0.100005, 0.6667, 0.0),
794 vec3(0.088893, 0.6667, 0.0), vec3(0.077782, 0.6667, 0.0), vec3(0.06667, 0.6667, 0.0), vec3(0.055558, 0.6667, 0.0),
795 vec3(0.044447, 0.6667, 0.0), vec3(0.033335, 0.6667, 0.0), vec3(0.022223, 0.6667, 0.0), vec3(0.011112, 0.6667, 0.0),
796 vec3(0.0, 0.6667, 0.0), vec3(0.0, 0.6667, 0.011112), vec3(0.0, 0.6667, 0.022223), vec3(0.0, 0.6667, 0.033335),
797 vec3(0.0, 0.6667, 0.044447), vec3(0.0, 0.6667, 0.055558), vec3(0.0, 0.6667, 0.06667), vec3(0.0, 0.6667, 0.077782),
798 vec3(0.0, 0.6667, 0.088893), vec3(0.0, 0.6667, 0.100005), vec3(0.0, 0.6667, 0.111117), vec3(0.0, 0.6667, 0.122228),
799 vec3(0.0, 0.6667, 0.13334), vec3(0.0, 0.6667, 0.144452), vec3(0.0, 0.6667, 0.155563), vec3(0.0, 0.6667, 0.166675),
800 vec3(0.0, 0.6667, 0.177787), vec3(0.0, 0.6667, 0.188898), vec3(0.0, 0.6667, 0.20001), vec3(0.0, 0.6667, 0.211122),
801 vec3(0.0, 0.6667, 0.222233), vec3(0.0, 0.6667, 0.233345), vec3(0.0, 0.6667, 0.244457), vec3(0.0, 0.6667, 0.255568),
802 vec3(0.0, 0.6667, 0.26668), vec3(0.0, 0.6667, 0.277792), vec3(0.0, 0.6667, 0.288903), vec3(0.0, 0.6667, 0.300015),
803 vec3(0.0, 0.6667, 0.311127), vec3(0.0, 0.6667, 0.322238), vec3(0.0, 0.6667, 0.33335), vec3(0.0, 0.6667, 0.344462),
804 vec3(0.0, 0.6667, 0.355573), vec3(0.0, 0.6667, 0.366685), vec3(0.0, 0.6667, 0.377797), vec3(0.0, 0.6667, 0.388908),
805 vec3(0.0, 0.6667, 0.40002), vec3(0.0, 0.6667, 0.411132), vec3(0.0, 0.6667, 0.422243), vec3(0.0, 0.6667, 0.433355),
806 vec3(0.0, 0.6667, 0.444467), vec3(0.0, 0.6667, 0.455578), vec3(0.0, 0.6667, 0.46669), vec3(0.0, 0.6667, 0.477802),
807 vec3(0.0, 0.6667, 0.488913), vec3(0.0, 0.6667, 0.500025), vec3(0.0, 0.6667, 0.511137), vec3(0.0, 0.6667, 0.522248),
808 vec3(0.0, 0.6667, 0.53336), vec3(0.0, 0.6667, 0.544472), vec3(0.0, 0.6667, 0.555583), vec3(0.0, 0.6667, 0.566695),
809 vec3(0.0, 0.6667, 0.577807), vec3(0.0, 0.6667, 0.588918), vec3(0.0, 0.6667, 0.60003), vec3(0.0, 0.6667, 0.611142),
810 vec3(0.0, 0.6667, 0.622253), vec3(0.0, 0.6667, 0.633365), vec3(0.0, 0.6667, 0.644477), vec3(0.0, 0.6667, 0.655588),
811 vec3(0.0, 0.6667, 0.6667), vec3(0.0, 0.655588, 0.6667), vec3(0.0, 0.644477, 0.6667), vec3(0.0, 0.633365, 0.6667),
812 vec3(0.0, 0.622253, 0.6667), vec3(0.0, 0.611142, 0.6667), vec3(0.0, 0.60003, 0.6667), vec3(0.0, 0.588918, 0.6667),
813 vec3(0.0, 0.577807, 0.6667), vec3(0.0, 0.566695, 0.6667), vec3(0.0, 0.555583, 0.6667), vec3(0.0, 0.544472, 0.6667),
814 vec3(0.0, 0.53336, 0.6667), vec3(0.0, 0.522248, 0.6667), vec3(0.0, 0.511137, 0.6667), vec3(0.0, 0.500025, 0.6667),
815 vec3(0.0, 0.488913, 0.6667), vec3(0.0, 0.477802, 0.6667), vec3(0.0, 0.46669, 0.6667), vec3(0.0, 0.455578, 0.6667),
816 vec3(0.0, 0.444467, 0.6667), vec3(0.0, 0.433355, 0.6667), vec3(0.0, 0.422243, 0.6667), vec3(0.0, 0.411132, 0.6667),
817 vec3(0.0, 0.40002, 0.6667), vec3(0.0, 0.388908, 0.6667), vec3(0.0, 0.377797, 0.6667), vec3(0.0, 0.366685, 0.6667),
818 vec3(0.0, 0.355573, 0.6667), vec3(0.0, 0.344462, 0.6667), vec3(0.0, 0.33335, 0.6667), vec3(0.0, 0.322238, 0.6667),
819 vec3(0.0, 0.311127, 0.6667), vec3(0.0, 0.300015, 0.6667), vec3(0.0, 0.288903, 0.6667), vec3(0.0, 0.277792, 0.6667),
820 vec3(0.0, 0.26668, 0.6667), vec3(0.0, 0.255568, 0.6667), vec3(0.0, 0.244457, 0.6667), vec3(0.0, 0.233345, 0.6667),
821 vec3(0.0, 0.222233, 0.6667), vec3(0.0, 0.211122, 0.6667), vec3(0.0, 0.20001, 0.6667), vec3(0.0, 0.188898, 0.6667),
822 vec3(0.0, 0.177787, 0.6667), vec3(0.0, 0.166675, 0.6667), vec3(0.0, 0.155563, 0.6667), vec3(0.0, 0.144452, 0.6667),
823 vec3(0.0, 0.13334, 0.6667), vec3(0.0, 0.122228, 0.6667), vec3(0.0, 0.111117, 0.6667), vec3(0.0, 0.100005, 0.6667),
824 vec3(0.0, 0.088893, 0.6667), vec3(0.0, 0.077782, 0.6667), vec3(0.0, 0.06667, 0.6667), vec3(0.0, 0.055558, 0.6667),
825 vec3(0.0, 0.044447, 0.6667), vec3(0.0, 0.033335, 0.6667), vec3(0.0, 0.022223, 0.6667), vec3(0.0, 0.011112, 0.6667),
826 vec3(0.0, 0.0, 0.6667), vec3(0.011112, 0.0, 0.6667), vec3(0.022223, 0.0, 0.6667), vec3(0.033335, 0.0, 0.6667),
827 vec3(0.044447, 0.0, 0.6667), vec3(0.055558, 0.0, 0.6667), vec3(0.06667, 0.0, 0.6667), vec3(0.077782, 0.0, 0.6667),
828 vec3(0.088893, 0.0, 0.6667), vec3(0.100005, 0.0, 0.6667), vec3(0.111117, 0.0, 0.6667), vec3(0.122228, 0.0, 0.6667),
829 vec3(0.13334, 0.0, 0.6667), vec3(0.144452, 0.0, 0.6667), vec3(0.155563, 0.0, 0.6667), vec3(0.166675, 0.0, 0.6667),
830 vec3(0.177787, 0.0, 0.6667), vec3(0.188898, 0.0, 0.6667), vec3(0.20001, 0.0, 0.6667), vec3(0.211122, 0.0, 0.6667),
831 vec3(0.222233, 0.0, 0.6667), vec3(0.233345, 0.0, 0.6667), vec3(0.244457, 0.0, 0.6667), vec3(0.255568, 0.0, 0.6667),
832 vec3(0.26668, 0.0, 0.6667), vec3(0.277792, 0.0, 0.6667), vec3(0.288903, 0.0, 0.6667), vec3(0.300015, 0.0, 0.6667),
833 vec3(0.311127, 0.0, 0.6667), vec3(0.322238, 0.0, 0.6667), vec3(0.33335, 0.0, 0.6667), vec3(0.344462, 0.0, 0.6667),
834 vec3(0.355573, 0.0, 0.6667), vec3(0.366685, 0.0, 0.6667), vec3(0.377797, 0.0, 0.6667), vec3(0.388908, 0.0, 0.6667),
835 vec3(0.40002, 0.0, 0.6667), vec3(0.411132, 0.0, 0.6667), vec3(0.422243, 0.0, 0.6667), vec3(0.433355, 0.0, 0.6667),
836 vec3(0.444467, 0.0, 0.6667), vec3(0.455578, 0.0, 0.6667), vec3(0.46669, 0.0, 0.6667), vec3(0.477802, 0.0, 0.6667),
837 vec3(0.488913, 0.0, 0.6667), vec3(0.500025, 0.0, 0.6667), vec3(0.511137, 0.0, 0.6667), vec3(0.522248, 0.0, 0.6667),
838 vec3(0.53336, 0.0, 0.6667), vec3(0.544472, 0.0, 0.6667), vec3(0.555583, 0.0, 0.6667), vec3(0.566695, 0.0, 0.6667),
839 vec3(0.577807, 0.0, 0.6667), vec3(0.588918, 0.0, 0.6667), vec3(0.60003, 0.0, 0.6667), vec3(0.611142, 0.0, 0.6667),
840 vec3(0.622253, 0.0, 0.6667), vec3(0.633365, 0.0, 0.6667), vec3(0.644477, 0.0, 0.6667), vec3(0.655588, 0.0, 0.6667),
841 vec3(0.6667, 0.0, 0.6667), vec3(0.6667, 0.0, 0.655588), vec3(0.6667, 0.0, 0.644477), vec3(0.6667, 0.0, 0.633365),
842 vec3(0.6667, 0.0, 0.622253), vec3(0.6667, 0.0, 0.611142), vec3(0.6667, 0.0, 0.60003), vec3(0.6667, 0.0, 0.588918),
843 vec3(0.6667, 0.0, 0.577807), vec3(0.6667, 0.0, 0.566695), vec3(0.6667, 0.0, 0.555583), vec3(0.6667, 0.0, 0.544472),
844 vec3(0.6667, 0.0, 0.53336), vec3(0.6667, 0.0, 0.522248), vec3(0.6667, 0.0, 0.511137), vec3(0.6667, 0.0, 0.500025),
845 vec3(0.6667, 0.0, 0.488913), vec3(0.6667, 0.0, 0.477802), vec3(0.6667, 0.0, 0.46669), vec3(0.6667, 0.0, 0.455578),
846 vec3(0.6667, 0.0, 0.444467), vec3(0.6667, 0.0, 0.433355), vec3(0.6667, 0.0, 0.422243), vec3(0.6667, 0.0, 0.411132),
847 vec3(0.6667, 0.0, 0.40002), vec3(0.6667, 0.0, 0.388908), vec3(0.6667, 0.0, 0.377797), vec3(0.6667, 0.0, 0.366685),
848 vec3(0.6667, 0.0, 0.355573), vec3(0.6667, 0.0, 0.344462), vec3(0.6667, 0.0, 0.33335), vec3(0.6667, 0.0, 0.322238),
849 vec3(0.6667, 0.0, 0.311127), vec3(0.6667, 0.0, 0.300015), vec3(0.6667, 0.0, 0.288903), vec3(0.6667, 0.0, 0.277792),
850 vec3(0.6667, 0.0, 0.26668), vec3(0.6667, 0.0, 0.255568), vec3(0.6667, 0.0, 0.244457), vec3(0.6667, 0.0, 0.233345),
851 vec3(0.6667, 0.0, 0.222233), vec3(0.6667, 0.0, 0.211122), vec3(0.6667, 0.0, 0.20001), vec3(0.6667, 0.0, 0.188898),
852 vec3(0.6667, 0.0, 0.177787), vec3(0.6667, 0.0, 0.166675), vec3(0.6667, 0.0, 0.155563), vec3(0.6667, 0.0, 0.144452),
853 vec3(0.6667, 0.0, 0.13334), vec3(0.6667, 0.0, 0.122228), vec3(0.6667, 0.0, 0.111117), vec3(0.6667, 0.0, 0.100005),
854 vec3(0.6667, 0.0, 0.088893), vec3(0.6667, 0.0, 0.077782), vec3(0.6667, 0.0, 0.06667), vec3(0.6667, 0.0, 0.055558),
855 vec3(0.6667, 0.0, 0.044447), vec3(0.6667, 0.0, 0.033335), vec3(0.6667, 0.0, 0.022223), vec3(0.6667, 0.0, 0.011112)
856 );
760 857 vec3 tint;
761 858 if (tk >= 999.5) {
762 float h = clamp(tk - 1000.0, 0.0, 359.0);
763 float s = 1.0, v = 0.6667;
764 float ch = v * s;
765 float x = ch * (1.0 - abs(mod(h / 60.0, 2.0) - 1.0));
766 float m = v - ch;
767 vec3 rgb = h < 60.0 ? vec3(ch, x, 0.0) : h < 120.0 ? vec3(x, ch, 0.0)
768 : h < 180.0 ? vec3(0.0, ch, x) : h < 240.0 ? vec3(0.0, x, ch)
769 : h < 300.0 ? vec3(x, 0.0, ch) : vec3(ch, 0.0, x);
770 tint = rgb + vec3(m);
859 int hi = int(clamp(tk - 1000.0, 0.0, 359.0));
860 tint = HUE_RGB[hi];
771 861 } else {
772 862 tint = tk < 0.5 ? vec3(0.0) : tk < 1.5 ? vec3(0.0, 0.0, 0.6667) : tk < 2.5 ? vec3(0.6667, 0.0, 0.0)
773 863 : tk < 3.5 ? vec3(0.0, 0.6667, 0.0) : tk < 4.5 ? vec3(0.4, 0.0, 0.6667) : tk < 5.5 ? vec3(0.6667, 0.6667, 0.0)
@@ -752,22 +752,112 @@ uniform float uDebug; // 2 = show the raw window texture inside the marble
752uniform float uMixCenter; // 0..1 black mix, centre/top zone
752uniform float uMixCenter; // 0..1 black mix, centre/top zone
753
753
754void main() {
754void main() {
755 // per-window state in uProgress (setUniform is global): uProgress = tk * 4096 + m
755 // Per-window state in one float (setUniform is global; animate() values are per-window):
756 // tk 0..10 = named colours; tk >= 1000 = HSV hue (tk-1000) at S=1, V=0.6667
756 // uProgress = tintId + morph01*0.999, tintId 0..10 named or 1000..1359 hue.
757 float tk = floor(uProgress / 4096.0);
757 // morph01 runs 0→1 over the full ShaderUniform animation; uCrumpleEnd scales so c hits 1
758 float c = clamp(uProgress - tk * 4096.0, 0.0, 1.0);
758 // at the morph boundary (same timing as the old overshoot encoding, without a huge offset).
759 if (uCrumpleEnd < -1.0) c = 0.0; // keep uCrumpleEnd alive (still set by the script)
759 float tk = floor(uProgress);
760 float raw = uProgress - tk; // 0..0.999
761 float c = clamp(raw / max(uCrumpleEnd * 0.999, 1e-6), 0.0, 1.0);
762 if (uCrumpleEnd < -1.0) c = 0.0; // keep alive + guard
763 // Precomputed RGB for hue 0..359 at S=1 V=0.6667 (same formula as old per-fragment HSV).
764 // Indexed by tk-1000; avoids HSV ALU every fragment while keeping per-window tint in uProgress.
765 const vec3 HUE_RGB[360] = vec3[](
766 vec3(0.6667, 0.0, 0.0), vec3(0.6667, 0.011112, 0.0), vec3(0.6667, 0.022223, 0.0), vec3(0.6667, 0.033335, 0.0),
767 vec3(0.6667, 0.044447, 0.0), vec3(0.6667, 0.055558, 0.0), vec3(0.6667, 0.06667, 0.0), vec3(0.6667, 0.077782, 0.0),
768 vec3(0.6667, 0.088893, 0.0), vec3(0.6667, 0.100005, 0.0), vec3(0.6667, 0.111117, 0.0), vec3(0.6667, 0.122228, 0.0),
769 vec3(0.6667, 0.13334, 0.0), vec3(0.6667, 0.144452, 0.0), vec3(0.6667, 0.155563, 0.0), vec3(0.6667, 0.166675, 0.0),
770 vec3(0.6667, 0.177787, 0.0), vec3(0.6667, 0.188898, 0.0), vec3(0.6667, 0.20001, 0.0), vec3(0.6667, 0.211122, 0.0),
771 vec3(0.6667, 0.222233, 0.0), vec3(0.6667, 0.233345, 0.0), vec3(0.6667, 0.244457, 0.0), vec3(0.6667, 0.255568, 0.0),
772 vec3(0.6667, 0.26668, 0.0), vec3(0.6667, 0.277792, 0.0), vec3(0.6667, 0.288903, 0.0), vec3(0.6667, 0.300015, 0.0),
773 vec3(0.6667, 0.311127, 0.0), vec3(0.6667, 0.322238, 0.0), vec3(0.6667, 0.33335, 0.0), vec3(0.6667, 0.344462, 0.0),
774 vec3(0.6667, 0.355573, 0.0), vec3(0.6667, 0.366685, 0.0), vec3(0.6667, 0.377797, 0.0), vec3(0.6667, 0.388908, 0.0),
775 vec3(0.6667, 0.40002, 0.0), vec3(0.6667, 0.411132, 0.0), vec3(0.6667, 0.422243, 0.0), vec3(0.6667, 0.433355, 0.0),
776 vec3(0.6667, 0.444467, 0.0), vec3(0.6667, 0.455578, 0.0), vec3(0.6667, 0.46669, 0.0), vec3(0.6667, 0.477802, 0.0),
777 vec3(0.6667, 0.488913, 0.0), vec3(0.6667, 0.500025, 0.0), vec3(0.6667, 0.511137, 0.0), vec3(0.6667, 0.522248, 0.0),
778 vec3(0.6667, 0.53336, 0.0), vec3(0.6667, 0.544472, 0.0), vec3(0.6667, 0.555583, 0.0), vec3(0.6667, 0.566695, 0.0),
779 vec3(0.6667, 0.577807, 0.0), vec3(0.6667, 0.588918, 0.0), vec3(0.6667, 0.60003, 0.0), vec3(0.6667, 0.611142, 0.0),
780 vec3(0.6667, 0.622253, 0.0), vec3(0.6667, 0.633365, 0.0), vec3(0.6667, 0.644477, 0.0), vec3(0.6667, 0.655588, 0.0),
781 vec3(0.6667, 0.6667, 0.0), vec3(0.655588, 0.6667, 0.0), vec3(0.644477, 0.6667, 0.0), vec3(0.633365, 0.6667, 0.0),
782 vec3(0.622253, 0.6667, 0.0), vec3(0.611142, 0.6667, 0.0), vec3(0.60003, 0.6667, 0.0), vec3(0.588918, 0.6667, 0.0),
783 vec3(0.577807, 0.6667, 0.0), vec3(0.566695, 0.6667, 0.0), vec3(0.555583, 0.6667, 0.0), vec3(0.544472, 0.6667, 0.0),
784 vec3(0.53336, 0.6667, 0.0), vec3(0.522248, 0.6667, 0.0), vec3(0.511137, 0.6667, 0.0), vec3(0.500025, 0.6667, 0.0),
785 vec3(0.488913, 0.6667, 0.0), vec3(0.477802, 0.6667, 0.0), vec3(0.46669, 0.6667, 0.0), vec3(0.455578, 0.6667, 0.0),
786 vec3(0.444467, 0.6667, 0.0), vec3(0.433355, 0.6667, 0.0), vec3(0.422243, 0.6667, 0.0), vec3(0.411132, 0.6667, 0.0),
787 vec3(0.40002, 0.6667, 0.0), vec3(0.388908, 0.6667, 0.0), vec3(0.377797, 0.6667, 0.0), vec3(0.366685, 0.6667, 0.0),
788 vec3(0.355573, 0.6667, 0.0), vec3(0.344462, 0.6667, 0.0), vec3(0.33335, 0.6667, 0.0), vec3(0.322238, 0.6667, 0.0),
789 vec3(0.311127, 0.6667, 0.0), vec3(0.300015, 0.6667, 0.0), vec3(0.288903, 0.6667, 0.0), vec3(0.277792, 0.6667, 0.0),
790 vec3(0.26668, 0.6667, 0.0), vec3(0.255568, 0.6667, 0.0), vec3(0.244457, 0.6667, 0.0), vec3(0.233345, 0.6667, 0.0),
791 vec3(0.222233, 0.6667, 0.0), vec3(0.211122, 0.6667, 0.0), vec3(0.20001, 0.6667, 0.0), vec3(0.188898, 0.6667, 0.0),
792 vec3(0.177787, 0.6667, 0.0), vec3(0.166675, 0.6667, 0.0), vec3(0.155563, 0.6667, 0.0), vec3(0.144452, 0.6667, 0.0),
793 vec3(0.13334, 0.6667, 0.0), vec3(0.122228, 0.6667, 0.0), vec3(0.111117, 0.6667, 0.0), vec3(0.100005, 0.6667, 0.0),
794 vec3(0.088893, 0.6667, 0.0), vec3(0.077782, 0.6667, 0.0), vec3(0.06667, 0.6667, 0.0), vec3(0.055558, 0.6667, 0.0),
795 vec3(0.044447, 0.6667, 0.0), vec3(0.033335, 0.6667, 0.0), vec3(0.022223, 0.6667, 0.0), vec3(0.011112, 0.6667, 0.0),
796 vec3(0.0, 0.6667, 0.0), vec3(0.0, 0.6667, 0.011112), vec3(0.0, 0.6667, 0.022223), vec3(0.0, 0.6667, 0.033335),
797 vec3(0.0, 0.6667, 0.044447), vec3(0.0, 0.6667, 0.055558), vec3(0.0, 0.6667, 0.06667), vec3(0.0, 0.6667, 0.077782),
798 vec3(0.0, 0.6667, 0.088893), vec3(0.0, 0.6667, 0.100005), vec3(0.0, 0.6667, 0.111117), vec3(0.0, 0.6667, 0.122228),
799 vec3(0.0, 0.6667, 0.13334), vec3(0.0, 0.6667, 0.144452), vec3(0.0, 0.6667, 0.155563), vec3(0.0, 0.6667, 0.166675),
800 vec3(0.0, 0.6667, 0.177787), vec3(0.0, 0.6667, 0.188898), vec3(0.0, 0.6667, 0.20001), vec3(0.0, 0.6667, 0.211122),
801 vec3(0.0, 0.6667, 0.222233), vec3(0.0, 0.6667, 0.233345), vec3(0.0, 0.6667, 0.244457), vec3(0.0, 0.6667, 0.255568),
802 vec3(0.0, 0.6667, 0.26668), vec3(0.0, 0.6667, 0.277792), vec3(0.0, 0.6667, 0.288903), vec3(0.0, 0.6667, 0.300015),
803 vec3(0.0, 0.6667, 0.311127), vec3(0.0, 0.6667, 0.322238), vec3(0.0, 0.6667, 0.33335), vec3(0.0, 0.6667, 0.344462),
804 vec3(0.0, 0.6667, 0.355573), vec3(0.0, 0.6667, 0.366685), vec3(0.0, 0.6667, 0.377797), vec3(0.0, 0.6667, 0.388908),
805 vec3(0.0, 0.6667, 0.40002), vec3(0.0, 0.6667, 0.411132), vec3(0.0, 0.6667, 0.422243), vec3(0.0, 0.6667, 0.433355),
806 vec3(0.0, 0.6667, 0.444467), vec3(0.0, 0.6667, 0.455578), vec3(0.0, 0.6667, 0.46669), vec3(0.0, 0.6667, 0.477802),
807 vec3(0.0, 0.6667, 0.488913), vec3(0.0, 0.6667, 0.500025), vec3(0.0, 0.6667, 0.511137), vec3(0.0, 0.6667, 0.522248),
808 vec3(0.0, 0.6667, 0.53336), vec3(0.0, 0.6667, 0.544472), vec3(0.0, 0.6667, 0.555583), vec3(0.0, 0.6667, 0.566695),
809 vec3(0.0, 0.6667, 0.577807), vec3(0.0, 0.6667, 0.588918), vec3(0.0, 0.6667, 0.60003), vec3(0.0, 0.6667, 0.611142),
810 vec3(0.0, 0.6667, 0.622253), vec3(0.0, 0.6667, 0.633365), vec3(0.0, 0.6667, 0.644477), vec3(0.0, 0.6667, 0.655588),
811 vec3(0.0, 0.6667, 0.6667), vec3(0.0, 0.655588, 0.6667), vec3(0.0, 0.644477, 0.6667), vec3(0.0, 0.633365, 0.6667),
812 vec3(0.0, 0.622253, 0.6667), vec3(0.0, 0.611142, 0.6667), vec3(0.0, 0.60003, 0.6667), vec3(0.0, 0.588918, 0.6667),
813 vec3(0.0, 0.577807, 0.6667), vec3(0.0, 0.566695, 0.6667), vec3(0.0, 0.555583, 0.6667), vec3(0.0, 0.544472, 0.6667),
814 vec3(0.0, 0.53336, 0.6667), vec3(0.0, 0.522248, 0.6667), vec3(0.0, 0.511137, 0.6667), vec3(0.0, 0.500025, 0.6667),
815 vec3(0.0, 0.488913, 0.6667), vec3(0.0, 0.477802, 0.6667), vec3(0.0, 0.46669, 0.6667), vec3(0.0, 0.455578, 0.6667),
816 vec3(0.0, 0.444467, 0.6667), vec3(0.0, 0.433355, 0.6667), vec3(0.0, 0.422243, 0.6667), vec3(0.0, 0.411132, 0.6667),
817 vec3(0.0, 0.40002, 0.6667), vec3(0.0, 0.388908, 0.6667), vec3(0.0, 0.377797, 0.6667), vec3(0.0, 0.366685, 0.6667),
818 vec3(0.0, 0.355573, 0.6667), vec3(0.0, 0.344462, 0.6667), vec3(0.0, 0.33335, 0.6667), vec3(0.0, 0.322238, 0.6667),
819 vec3(0.0, 0.311127, 0.6667), vec3(0.0, 0.300015, 0.6667), vec3(0.0, 0.288903, 0.6667), vec3(0.0, 0.277792, 0.6667),
820 vec3(0.0, 0.26668, 0.6667), vec3(0.0, 0.255568, 0.6667), vec3(0.0, 0.244457, 0.6667), vec3(0.0, 0.233345, 0.6667),
821 vec3(0.0, 0.222233, 0.6667), vec3(0.0, 0.211122, 0.6667), vec3(0.0, 0.20001, 0.6667), vec3(0.0, 0.188898, 0.6667),
822 vec3(0.0, 0.177787, 0.6667), vec3(0.0, 0.166675, 0.6667), vec3(0.0, 0.155563, 0.6667), vec3(0.0, 0.144452, 0.6667),
823 vec3(0.0, 0.13334, 0.6667), vec3(0.0, 0.122228, 0.6667), vec3(0.0, 0.111117, 0.6667), vec3(0.0, 0.100005, 0.6667),
824 vec3(0.0, 0.088893, 0.6667), vec3(0.0, 0.077782, 0.6667), vec3(0.0, 0.06667, 0.6667), vec3(0.0, 0.055558, 0.6667),
825 vec3(0.0, 0.044447, 0.6667), vec3(0.0, 0.033335, 0.6667), vec3(0.0, 0.022223, 0.6667), vec3(0.0, 0.011112, 0.6667),
826 vec3(0.0, 0.0, 0.6667), vec3(0.011112, 0.0, 0.6667), vec3(0.022223, 0.0, 0.6667), vec3(0.033335, 0.0, 0.6667),
827 vec3(0.044447, 0.0, 0.6667), vec3(0.055558, 0.0, 0.6667), vec3(0.06667, 0.0, 0.6667), vec3(0.077782, 0.0, 0.6667),
828 vec3(0.088893, 0.0, 0.6667), vec3(0.100005, 0.0, 0.6667), vec3(0.111117, 0.0, 0.6667), vec3(0.122228, 0.0, 0.6667),
829 vec3(0.13334, 0.0, 0.6667), vec3(0.144452, 0.0, 0.6667), vec3(0.155563, 0.0, 0.6667), vec3(0.166675, 0.0, 0.6667),
830 vec3(0.177787, 0.0, 0.6667), vec3(0.188898, 0.0, 0.6667), vec3(0.20001, 0.0, 0.6667), vec3(0.211122, 0.0, 0.6667),
831 vec3(0.222233, 0.0, 0.6667), vec3(0.233345, 0.0, 0.6667), vec3(0.244457, 0.0, 0.6667), vec3(0.255568, 0.0, 0.6667),
832 vec3(0.26668, 0.0, 0.6667), vec3(0.277792, 0.0, 0.6667), vec3(0.288903, 0.0, 0.6667), vec3(0.300015, 0.0, 0.6667),
833 vec3(0.311127, 0.0, 0.6667), vec3(0.322238, 0.0, 0.6667), vec3(0.33335, 0.0, 0.6667), vec3(0.344462, 0.0, 0.6667),
834 vec3(0.355573, 0.0, 0.6667), vec3(0.366685, 0.0, 0.6667), vec3(0.377797, 0.0, 0.6667), vec3(0.388908, 0.0, 0.6667),
835 vec3(0.40002, 0.0, 0.6667), vec3(0.411132, 0.0, 0.6667), vec3(0.422243, 0.0, 0.6667), vec3(0.433355, 0.0, 0.6667),
836 vec3(0.444467, 0.0, 0.6667), vec3(0.455578, 0.0, 0.6667), vec3(0.46669, 0.0, 0.6667), vec3(0.477802, 0.0, 0.6667),
837 vec3(0.488913, 0.0, 0.6667), vec3(0.500025, 0.0, 0.6667), vec3(0.511137, 0.0, 0.6667), vec3(0.522248, 0.0, 0.6667),
838 vec3(0.53336, 0.0, 0.6667), vec3(0.544472, 0.0, 0.6667), vec3(0.555583, 0.0, 0.6667), vec3(0.566695, 0.0, 0.6667),
839 vec3(0.577807, 0.0, 0.6667), vec3(0.588918, 0.0, 0.6667), vec3(0.60003, 0.0, 0.6667), vec3(0.611142, 0.0, 0.6667),
840 vec3(0.622253, 0.0, 0.6667), vec3(0.633365, 0.0, 0.6667), vec3(0.644477, 0.0, 0.6667), vec3(0.655588, 0.0, 0.6667),
841 vec3(0.6667, 0.0, 0.6667), vec3(0.6667, 0.0, 0.655588), vec3(0.6667, 0.0, 0.644477), vec3(0.6667, 0.0, 0.633365),
842 vec3(0.6667, 0.0, 0.622253), vec3(0.6667, 0.0, 0.611142), vec3(0.6667, 0.0, 0.60003), vec3(0.6667, 0.0, 0.588918),
843 vec3(0.6667, 0.0, 0.577807), vec3(0.6667, 0.0, 0.566695), vec3(0.6667, 0.0, 0.555583), vec3(0.6667, 0.0, 0.544472),
844 vec3(0.6667, 0.0, 0.53336), vec3(0.6667, 0.0, 0.522248), vec3(0.6667, 0.0, 0.511137), vec3(0.6667, 0.0, 0.500025),
845 vec3(0.6667, 0.0, 0.488913), vec3(0.6667, 0.0, 0.477802), vec3(0.6667, 0.0, 0.46669), vec3(0.6667, 0.0, 0.455578),
846 vec3(0.6667, 0.0, 0.444467), vec3(0.6667, 0.0, 0.433355), vec3(0.6667, 0.0, 0.422243), vec3(0.6667, 0.0, 0.411132),
847 vec3(0.6667, 0.0, 0.40002), vec3(0.6667, 0.0, 0.388908), vec3(0.6667, 0.0, 0.377797), vec3(0.6667, 0.0, 0.366685),
848 vec3(0.6667, 0.0, 0.355573), vec3(0.6667, 0.0, 0.344462), vec3(0.6667, 0.0, 0.33335), vec3(0.6667, 0.0, 0.322238),
849 vec3(0.6667, 0.0, 0.311127), vec3(0.6667, 0.0, 0.300015), vec3(0.6667, 0.0, 0.288903), vec3(0.6667, 0.0, 0.277792),
850 vec3(0.6667, 0.0, 0.26668), vec3(0.6667, 0.0, 0.255568), vec3(0.6667, 0.0, 0.244457), vec3(0.6667, 0.0, 0.233345),
851 vec3(0.6667, 0.0, 0.222233), vec3(0.6667, 0.0, 0.211122), vec3(0.6667, 0.0, 0.20001), vec3(0.6667, 0.0, 0.188898),
852 vec3(0.6667, 0.0, 0.177787), vec3(0.6667, 0.0, 0.166675), vec3(0.6667, 0.0, 0.155563), vec3(0.6667, 0.0, 0.144452),
853 vec3(0.6667, 0.0, 0.13334), vec3(0.6667, 0.0, 0.122228), vec3(0.6667, 0.0, 0.111117), vec3(0.6667, 0.0, 0.100005),
854 vec3(0.6667, 0.0, 0.088893), vec3(0.6667, 0.0, 0.077782), vec3(0.6667, 0.0, 0.06667), vec3(0.6667, 0.0, 0.055558),
855 vec3(0.6667, 0.0, 0.044447), vec3(0.6667, 0.0, 0.033335), vec3(0.6667, 0.0, 0.022223), vec3(0.6667, 0.0, 0.011112)
856 );
760 vec3 tint;
857 vec3 tint;
761 if (tk >= 999.5) {
858 if (tk >= 999.5) {
762 float h = clamp(tk - 1000.0, 0.0, 359.0);
859 int hi = int(clamp(tk - 1000.0, 0.0, 359.0));
763 float s = 1.0, v = 0.6667;
860 tint = HUE_RGB[hi];
764 float ch = v * s;
765 float x = ch * (1.0 - abs(mod(h / 60.0, 2.0) - 1.0));
766 float m = v - ch;
767 vec3 rgb = h < 60.0 ? vec3(ch, x, 0.0) : h < 120.0 ? vec3(x, ch, 0.0)
768 : h < 180.0 ? vec3(0.0, ch, x) : h < 240.0 ? vec3(0.0, x, ch)
769 : h < 300.0 ? vec3(x, 0.0, ch) : vec3(ch, 0.0, x);
770 tint = rgb + vec3(m);
771 } else {
861 } else {
772 tint = tk < 0.5 ? vec3(0.0) : tk < 1.5 ? vec3(0.0, 0.0, 0.6667) : tk < 2.5 ? vec3(0.6667, 0.0, 0.0)
862 tint = tk < 0.5 ? vec3(0.0) : tk < 1.5 ? vec3(0.0, 0.0, 0.6667) : tk < 2.5 ? vec3(0.6667, 0.0, 0.0)
773 : tk < 3.5 ? vec3(0.0, 0.6667, 0.0) : tk < 4.5 ? vec3(0.4, 0.0, 0.6667) : tk < 5.5 ? vec3(0.6667, 0.6667, 0.0)
863 : tk < 3.5 ? vec3(0.0, 0.6667, 0.0) : tk < 4.5 ? vec3(0.4, 0.0, 0.6667) : tk < 5.5 ? vec3(0.6667, 0.6667, 0.0)
kwin6_effect_marble_minimize/contents/shaders/marble_core.frag +104 −14
@@ -753,22 +753,112 @@ uniform float uDebug; // 2 = show the raw window texture inside the marble
753 753 uniform float uMixCenter; // 0..1 black mix, centre/top zone
754 754
755 755 void main() {
756 // per-window state in uProgress (setUniform is global): uProgress = tk * 4096 + m
757 // tk 0..10 = named colours; tk >= 1000 = HSV hue (tk-1000) at S=1, V=0.6667
758 float tk = floor(uProgress / 4096.0);
759 float c = clamp(uProgress - tk * 4096.0, 0.0, 1.0);
760 if (uCrumpleEnd < -1.0) c = 0.0; // keep uCrumpleEnd alive (still set by the script)
756 // Per-window state in one float (setUniform is global; animate() values are per-window):
757 // uProgress = tintId + morph01*0.999, tintId 0..10 named or 1000..1359 hue.
758 // morph01 runs 0→1 over the full ShaderUniform animation; uCrumpleEnd scales so c hits 1
759 // at the morph boundary (same timing as the old overshoot encoding, without a huge offset).
760 float tk = floor(uProgress);
761 float raw = uProgress - tk; // 0..0.999
762 float c = clamp(raw / max(uCrumpleEnd * 0.999, 1e-6), 0.0, 1.0);
763 if (uCrumpleEnd < -1.0) c = 0.0; // keep alive + guard
764 // Precomputed RGB for hue 0..359 at S=1 V=0.6667 (same formula as old per-fragment HSV).
765 // Indexed by tk-1000; avoids HSV ALU every fragment while keeping per-window tint in uProgress.
766 const vec3 HUE_RGB[360] = vec3[](
767 vec3(0.6667, 0.0, 0.0), vec3(0.6667, 0.011112, 0.0), vec3(0.6667, 0.022223, 0.0), vec3(0.6667, 0.033335, 0.0),
768 vec3(0.6667, 0.044447, 0.0), vec3(0.6667, 0.055558, 0.0), vec3(0.6667, 0.06667, 0.0), vec3(0.6667, 0.077782, 0.0),
769 vec3(0.6667, 0.088893, 0.0), vec3(0.6667, 0.100005, 0.0), vec3(0.6667, 0.111117, 0.0), vec3(0.6667, 0.122228, 0.0),
770 vec3(0.6667, 0.13334, 0.0), vec3(0.6667, 0.144452, 0.0), vec3(0.6667, 0.155563, 0.0), vec3(0.6667, 0.166675, 0.0),
771 vec3(0.6667, 0.177787, 0.0), vec3(0.6667, 0.188898, 0.0), vec3(0.6667, 0.20001, 0.0), vec3(0.6667, 0.211122, 0.0),
772 vec3(0.6667, 0.222233, 0.0), vec3(0.6667, 0.233345, 0.0), vec3(0.6667, 0.244457, 0.0), vec3(0.6667, 0.255568, 0.0),
773 vec3(0.6667, 0.26668, 0.0), vec3(0.6667, 0.277792, 0.0), vec3(0.6667, 0.288903, 0.0), vec3(0.6667, 0.300015, 0.0),
774 vec3(0.6667, 0.311127, 0.0), vec3(0.6667, 0.322238, 0.0), vec3(0.6667, 0.33335, 0.0), vec3(0.6667, 0.344462, 0.0),
775 vec3(0.6667, 0.355573, 0.0), vec3(0.6667, 0.366685, 0.0), vec3(0.6667, 0.377797, 0.0), vec3(0.6667, 0.388908, 0.0),
776 vec3(0.6667, 0.40002, 0.0), vec3(0.6667, 0.411132, 0.0), vec3(0.6667, 0.422243, 0.0), vec3(0.6667, 0.433355, 0.0),
777 vec3(0.6667, 0.444467, 0.0), vec3(0.6667, 0.455578, 0.0), vec3(0.6667, 0.46669, 0.0), vec3(0.6667, 0.477802, 0.0),
778 vec3(0.6667, 0.488913, 0.0), vec3(0.6667, 0.500025, 0.0), vec3(0.6667, 0.511137, 0.0), vec3(0.6667, 0.522248, 0.0),
779 vec3(0.6667, 0.53336, 0.0), vec3(0.6667, 0.544472, 0.0), vec3(0.6667, 0.555583, 0.0), vec3(0.6667, 0.566695, 0.0),
780 vec3(0.6667, 0.577807, 0.0), vec3(0.6667, 0.588918, 0.0), vec3(0.6667, 0.60003, 0.0), vec3(0.6667, 0.611142, 0.0),
781 vec3(0.6667, 0.622253, 0.0), vec3(0.6667, 0.633365, 0.0), vec3(0.6667, 0.644477, 0.0), vec3(0.6667, 0.655588, 0.0),
782 vec3(0.6667, 0.6667, 0.0), vec3(0.655588, 0.6667, 0.0), vec3(0.644477, 0.6667, 0.0), vec3(0.633365, 0.6667, 0.0),
783 vec3(0.622253, 0.6667, 0.0), vec3(0.611142, 0.6667, 0.0), vec3(0.60003, 0.6667, 0.0), vec3(0.588918, 0.6667, 0.0),
784 vec3(0.577807, 0.6667, 0.0), vec3(0.566695, 0.6667, 0.0), vec3(0.555583, 0.6667, 0.0), vec3(0.544472, 0.6667, 0.0),
785 vec3(0.53336, 0.6667, 0.0), vec3(0.522248, 0.6667, 0.0), vec3(0.511137, 0.6667, 0.0), vec3(0.500025, 0.6667, 0.0),
786 vec3(0.488913, 0.6667, 0.0), vec3(0.477802, 0.6667, 0.0), vec3(0.46669, 0.6667, 0.0), vec3(0.455578, 0.6667, 0.0),
787 vec3(0.444467, 0.6667, 0.0), vec3(0.433355, 0.6667, 0.0), vec3(0.422243, 0.6667, 0.0), vec3(0.411132, 0.6667, 0.0),
788 vec3(0.40002, 0.6667, 0.0), vec3(0.388908, 0.6667, 0.0), vec3(0.377797, 0.6667, 0.0), vec3(0.366685, 0.6667, 0.0),
789 vec3(0.355573, 0.6667, 0.0), vec3(0.344462, 0.6667, 0.0), vec3(0.33335, 0.6667, 0.0), vec3(0.322238, 0.6667, 0.0),
790 vec3(0.311127, 0.6667, 0.0), vec3(0.300015, 0.6667, 0.0), vec3(0.288903, 0.6667, 0.0), vec3(0.277792, 0.6667, 0.0),
791 vec3(0.26668, 0.6667, 0.0), vec3(0.255568, 0.6667, 0.0), vec3(0.244457, 0.6667, 0.0), vec3(0.233345, 0.6667, 0.0),
792 vec3(0.222233, 0.6667, 0.0), vec3(0.211122, 0.6667, 0.0), vec3(0.20001, 0.6667, 0.0), vec3(0.188898, 0.6667, 0.0),
793 vec3(0.177787, 0.6667, 0.0), vec3(0.166675, 0.6667, 0.0), vec3(0.155563, 0.6667, 0.0), vec3(0.144452, 0.6667, 0.0),
794 vec3(0.13334, 0.6667, 0.0), vec3(0.122228, 0.6667, 0.0), vec3(0.111117, 0.6667, 0.0), vec3(0.100005, 0.6667, 0.0),
795 vec3(0.088893, 0.6667, 0.0), vec3(0.077782, 0.6667, 0.0), vec3(0.06667, 0.6667, 0.0), vec3(0.055558, 0.6667, 0.0),
796 vec3(0.044447, 0.6667, 0.0), vec3(0.033335, 0.6667, 0.0), vec3(0.022223, 0.6667, 0.0), vec3(0.011112, 0.6667, 0.0),
797 vec3(0.0, 0.6667, 0.0), vec3(0.0, 0.6667, 0.011112), vec3(0.0, 0.6667, 0.022223), vec3(0.0, 0.6667, 0.033335),
798 vec3(0.0, 0.6667, 0.044447), vec3(0.0, 0.6667, 0.055558), vec3(0.0, 0.6667, 0.06667), vec3(0.0, 0.6667, 0.077782),
799 vec3(0.0, 0.6667, 0.088893), vec3(0.0, 0.6667, 0.100005), vec3(0.0, 0.6667, 0.111117), vec3(0.0, 0.6667, 0.122228),
800 vec3(0.0, 0.6667, 0.13334), vec3(0.0, 0.6667, 0.144452), vec3(0.0, 0.6667, 0.155563), vec3(0.0, 0.6667, 0.166675),
801 vec3(0.0, 0.6667, 0.177787), vec3(0.0, 0.6667, 0.188898), vec3(0.0, 0.6667, 0.20001), vec3(0.0, 0.6667, 0.211122),
802 vec3(0.0, 0.6667, 0.222233), vec3(0.0, 0.6667, 0.233345), vec3(0.0, 0.6667, 0.244457), vec3(0.0, 0.6667, 0.255568),
803 vec3(0.0, 0.6667, 0.26668), vec3(0.0, 0.6667, 0.277792), vec3(0.0, 0.6667, 0.288903), vec3(0.0, 0.6667, 0.300015),
804 vec3(0.0, 0.6667, 0.311127), vec3(0.0, 0.6667, 0.322238), vec3(0.0, 0.6667, 0.33335), vec3(0.0, 0.6667, 0.344462),
805 vec3(0.0, 0.6667, 0.355573), vec3(0.0, 0.6667, 0.366685), vec3(0.0, 0.6667, 0.377797), vec3(0.0, 0.6667, 0.388908),
806 vec3(0.0, 0.6667, 0.40002), vec3(0.0, 0.6667, 0.411132), vec3(0.0, 0.6667, 0.422243), vec3(0.0, 0.6667, 0.433355),
807 vec3(0.0, 0.6667, 0.444467), vec3(0.0, 0.6667, 0.455578), vec3(0.0, 0.6667, 0.46669), vec3(0.0, 0.6667, 0.477802),
808 vec3(0.0, 0.6667, 0.488913), vec3(0.0, 0.6667, 0.500025), vec3(0.0, 0.6667, 0.511137), vec3(0.0, 0.6667, 0.522248),
809 vec3(0.0, 0.6667, 0.53336), vec3(0.0, 0.6667, 0.544472), vec3(0.0, 0.6667, 0.555583), vec3(0.0, 0.6667, 0.566695),
810 vec3(0.0, 0.6667, 0.577807), vec3(0.0, 0.6667, 0.588918), vec3(0.0, 0.6667, 0.60003), vec3(0.0, 0.6667, 0.611142),
811 vec3(0.0, 0.6667, 0.622253), vec3(0.0, 0.6667, 0.633365), vec3(0.0, 0.6667, 0.644477), vec3(0.0, 0.6667, 0.655588),
812 vec3(0.0, 0.6667, 0.6667), vec3(0.0, 0.655588, 0.6667), vec3(0.0, 0.644477, 0.6667), vec3(0.0, 0.633365, 0.6667),
813 vec3(0.0, 0.622253, 0.6667), vec3(0.0, 0.611142, 0.6667), vec3(0.0, 0.60003, 0.6667), vec3(0.0, 0.588918, 0.6667),
814 vec3(0.0, 0.577807, 0.6667), vec3(0.0, 0.566695, 0.6667), vec3(0.0, 0.555583, 0.6667), vec3(0.0, 0.544472, 0.6667),
815 vec3(0.0, 0.53336, 0.6667), vec3(0.0, 0.522248, 0.6667), vec3(0.0, 0.511137, 0.6667), vec3(0.0, 0.500025, 0.6667),
816 vec3(0.0, 0.488913, 0.6667), vec3(0.0, 0.477802, 0.6667), vec3(0.0, 0.46669, 0.6667), vec3(0.0, 0.455578, 0.6667),
817 vec3(0.0, 0.444467, 0.6667), vec3(0.0, 0.433355, 0.6667), vec3(0.0, 0.422243, 0.6667), vec3(0.0, 0.411132, 0.6667),
818 vec3(0.0, 0.40002, 0.6667), vec3(0.0, 0.388908, 0.6667), vec3(0.0, 0.377797, 0.6667), vec3(0.0, 0.366685, 0.6667),
819 vec3(0.0, 0.355573, 0.6667), vec3(0.0, 0.344462, 0.6667), vec3(0.0, 0.33335, 0.6667), vec3(0.0, 0.322238, 0.6667),
820 vec3(0.0, 0.311127, 0.6667), vec3(0.0, 0.300015, 0.6667), vec3(0.0, 0.288903, 0.6667), vec3(0.0, 0.277792, 0.6667),
821 vec3(0.0, 0.26668, 0.6667), vec3(0.0, 0.255568, 0.6667), vec3(0.0, 0.244457, 0.6667), vec3(0.0, 0.233345, 0.6667),
822 vec3(0.0, 0.222233, 0.6667), vec3(0.0, 0.211122, 0.6667), vec3(0.0, 0.20001, 0.6667), vec3(0.0, 0.188898, 0.6667),
823 vec3(0.0, 0.177787, 0.6667), vec3(0.0, 0.166675, 0.6667), vec3(0.0, 0.155563, 0.6667), vec3(0.0, 0.144452, 0.6667),
824 vec3(0.0, 0.13334, 0.6667), vec3(0.0, 0.122228, 0.6667), vec3(0.0, 0.111117, 0.6667), vec3(0.0, 0.100005, 0.6667),
825 vec3(0.0, 0.088893, 0.6667), vec3(0.0, 0.077782, 0.6667), vec3(0.0, 0.06667, 0.6667), vec3(0.0, 0.055558, 0.6667),
826 vec3(0.0, 0.044447, 0.6667), vec3(0.0, 0.033335, 0.6667), vec3(0.0, 0.022223, 0.6667), vec3(0.0, 0.011112, 0.6667),
827 vec3(0.0, 0.0, 0.6667), vec3(0.011112, 0.0, 0.6667), vec3(0.022223, 0.0, 0.6667), vec3(0.033335, 0.0, 0.6667),
828 vec3(0.044447, 0.0, 0.6667), vec3(0.055558, 0.0, 0.6667), vec3(0.06667, 0.0, 0.6667), vec3(0.077782, 0.0, 0.6667),
829 vec3(0.088893, 0.0, 0.6667), vec3(0.100005, 0.0, 0.6667), vec3(0.111117, 0.0, 0.6667), vec3(0.122228, 0.0, 0.6667),
830 vec3(0.13334, 0.0, 0.6667), vec3(0.144452, 0.0, 0.6667), vec3(0.155563, 0.0, 0.6667), vec3(0.166675, 0.0, 0.6667),
831 vec3(0.177787, 0.0, 0.6667), vec3(0.188898, 0.0, 0.6667), vec3(0.20001, 0.0, 0.6667), vec3(0.211122, 0.0, 0.6667),
832 vec3(0.222233, 0.0, 0.6667), vec3(0.233345, 0.0, 0.6667), vec3(0.244457, 0.0, 0.6667), vec3(0.255568, 0.0, 0.6667),
833 vec3(0.26668, 0.0, 0.6667), vec3(0.277792, 0.0, 0.6667), vec3(0.288903, 0.0, 0.6667), vec3(0.300015, 0.0, 0.6667),
834 vec3(0.311127, 0.0, 0.6667), vec3(0.322238, 0.0, 0.6667), vec3(0.33335, 0.0, 0.6667), vec3(0.344462, 0.0, 0.6667),
835 vec3(0.355573, 0.0, 0.6667), vec3(0.366685, 0.0, 0.6667), vec3(0.377797, 0.0, 0.6667), vec3(0.388908, 0.0, 0.6667),
836 vec3(0.40002, 0.0, 0.6667), vec3(0.411132, 0.0, 0.6667), vec3(0.422243, 0.0, 0.6667), vec3(0.433355, 0.0, 0.6667),
837 vec3(0.444467, 0.0, 0.6667), vec3(0.455578, 0.0, 0.6667), vec3(0.46669, 0.0, 0.6667), vec3(0.477802, 0.0, 0.6667),
838 vec3(0.488913, 0.0, 0.6667), vec3(0.500025, 0.0, 0.6667), vec3(0.511137, 0.0, 0.6667), vec3(0.522248, 0.0, 0.6667),
839 vec3(0.53336, 0.0, 0.6667), vec3(0.544472, 0.0, 0.6667), vec3(0.555583, 0.0, 0.6667), vec3(0.566695, 0.0, 0.6667),
840 vec3(0.577807, 0.0, 0.6667), vec3(0.588918, 0.0, 0.6667), vec3(0.60003, 0.0, 0.6667), vec3(0.611142, 0.0, 0.6667),
841 vec3(0.622253, 0.0, 0.6667), vec3(0.633365, 0.0, 0.6667), vec3(0.644477, 0.0, 0.6667), vec3(0.655588, 0.0, 0.6667),
842 vec3(0.6667, 0.0, 0.6667), vec3(0.6667, 0.0, 0.655588), vec3(0.6667, 0.0, 0.644477), vec3(0.6667, 0.0, 0.633365),
843 vec3(0.6667, 0.0, 0.622253), vec3(0.6667, 0.0, 0.611142), vec3(0.6667, 0.0, 0.60003), vec3(0.6667, 0.0, 0.588918),
844 vec3(0.6667, 0.0, 0.577807), vec3(0.6667, 0.0, 0.566695), vec3(0.6667, 0.0, 0.555583), vec3(0.6667, 0.0, 0.544472),
845 vec3(0.6667, 0.0, 0.53336), vec3(0.6667, 0.0, 0.522248), vec3(0.6667, 0.0, 0.511137), vec3(0.6667, 0.0, 0.500025),
846 vec3(0.6667, 0.0, 0.488913), vec3(0.6667, 0.0, 0.477802), vec3(0.6667, 0.0, 0.46669), vec3(0.6667, 0.0, 0.455578),
847 vec3(0.6667, 0.0, 0.444467), vec3(0.6667, 0.0, 0.433355), vec3(0.6667, 0.0, 0.422243), vec3(0.6667, 0.0, 0.411132),
848 vec3(0.6667, 0.0, 0.40002), vec3(0.6667, 0.0, 0.388908), vec3(0.6667, 0.0, 0.377797), vec3(0.6667, 0.0, 0.366685),
849 vec3(0.6667, 0.0, 0.355573), vec3(0.6667, 0.0, 0.344462), vec3(0.6667, 0.0, 0.33335), vec3(0.6667, 0.0, 0.322238),
850 vec3(0.6667, 0.0, 0.311127), vec3(0.6667, 0.0, 0.300015), vec3(0.6667, 0.0, 0.288903), vec3(0.6667, 0.0, 0.277792),
851 vec3(0.6667, 0.0, 0.26668), vec3(0.6667, 0.0, 0.255568), vec3(0.6667, 0.0, 0.244457), vec3(0.6667, 0.0, 0.233345),
852 vec3(0.6667, 0.0, 0.222233), vec3(0.6667, 0.0, 0.211122), vec3(0.6667, 0.0, 0.20001), vec3(0.6667, 0.0, 0.188898),
853 vec3(0.6667, 0.0, 0.177787), vec3(0.6667, 0.0, 0.166675), vec3(0.6667, 0.0, 0.155563), vec3(0.6667, 0.0, 0.144452),
854 vec3(0.6667, 0.0, 0.13334), vec3(0.6667, 0.0, 0.122228), vec3(0.6667, 0.0, 0.111117), vec3(0.6667, 0.0, 0.100005),
855 vec3(0.6667, 0.0, 0.088893), vec3(0.6667, 0.0, 0.077782), vec3(0.6667, 0.0, 0.06667), vec3(0.6667, 0.0, 0.055558),
856 vec3(0.6667, 0.0, 0.044447), vec3(0.6667, 0.0, 0.033335), vec3(0.6667, 0.0, 0.022223), vec3(0.6667, 0.0, 0.011112)
857 );
761 858 vec3 tint;
762 859 if (tk >= 999.5) {
763 float h = clamp(tk - 1000.0, 0.0, 359.0);
764 float s = 1.0, v = 0.6667;
765 float ch = v * s;
766 float x = ch * (1.0 - abs(mod(h / 60.0, 2.0) - 1.0));
767 float m = v - ch;
768 vec3 rgb = h < 60.0 ? vec3(ch, x, 0.0) : h < 120.0 ? vec3(x, ch, 0.0)
769 : h < 180.0 ? vec3(0.0, ch, x) : h < 240.0 ? vec3(0.0, x, ch)
770 : h < 300.0 ? vec3(x, 0.0, ch) : vec3(ch, 0.0, x);
771 tint = rgb + vec3(m);
860 int hi = int(clamp(tk - 1000.0, 0.0, 359.0));
861 tint = HUE_RGB[hi];
772 862 } else {
773 863 tint = tk < 0.5 ? vec3(0.0) : tk < 1.5 ? vec3(0.0, 0.0, 0.6667) : tk < 2.5 ? vec3(0.6667, 0.0, 0.0)
774 864 : tk < 3.5 ? vec3(0.0, 0.6667, 0.0) : tk < 4.5 ? vec3(0.4, 0.0, 0.6667) : tk < 5.5 ? vec3(0.6667, 0.6667, 0.0)
@@ -753,22 +753,112 @@ uniform float uDebug; // 2 = show the raw window texture inside the marble
753uniform float uMixCenter; // 0..1 black mix, centre/top zone
753uniform float uMixCenter; // 0..1 black mix, centre/top zone
754
754
755void main() {
755void main() {
756 // per-window state in uProgress (setUniform is global): uProgress = tk * 4096 + m
756 // Per-window state in one float (setUniform is global; animate() values are per-window):
757 // tk 0..10 = named colours; tk >= 1000 = HSV hue (tk-1000) at S=1, V=0.6667
757 // uProgress = tintId + morph01*0.999, tintId 0..10 named or 1000..1359 hue.
758 float tk = floor(uProgress / 4096.0);
758 // morph01 runs 0→1 over the full ShaderUniform animation; uCrumpleEnd scales so c hits 1
759 float c = clamp(uProgress - tk * 4096.0, 0.0, 1.0);
759 // at the morph boundary (same timing as the old overshoot encoding, without a huge offset).
760 if (uCrumpleEnd < -1.0) c = 0.0; // keep uCrumpleEnd alive (still set by the script)
760 float tk = floor(uProgress);
761 float raw = uProgress - tk; // 0..0.999
762 float c = clamp(raw / max(uCrumpleEnd * 0.999, 1e-6), 0.0, 1.0);
763 if (uCrumpleEnd < -1.0) c = 0.0; // keep alive + guard
764 // Precomputed RGB for hue 0..359 at S=1 V=0.6667 (same formula as old per-fragment HSV).
765 // Indexed by tk-1000; avoids HSV ALU every fragment while keeping per-window tint in uProgress.
766 const vec3 HUE_RGB[360] = vec3[](
767 vec3(0.6667, 0.0, 0.0), vec3(0.6667, 0.011112, 0.0), vec3(0.6667, 0.022223, 0.0), vec3(0.6667, 0.033335, 0.0),
768 vec3(0.6667, 0.044447, 0.0), vec3(0.6667, 0.055558, 0.0), vec3(0.6667, 0.06667, 0.0), vec3(0.6667, 0.077782, 0.0),
769 vec3(0.6667, 0.088893, 0.0), vec3(0.6667, 0.100005, 0.0), vec3(0.6667, 0.111117, 0.0), vec3(0.6667, 0.122228, 0.0),
770 vec3(0.6667, 0.13334, 0.0), vec3(0.6667, 0.144452, 0.0), vec3(0.6667, 0.155563, 0.0), vec3(0.6667, 0.166675, 0.0),
771 vec3(0.6667, 0.177787, 0.0), vec3(0.6667, 0.188898, 0.0), vec3(0.6667, 0.20001, 0.0), vec3(0.6667, 0.211122, 0.0),
772 vec3(0.6667, 0.222233, 0.0), vec3(0.6667, 0.233345, 0.0), vec3(0.6667, 0.244457, 0.0), vec3(0.6667, 0.255568, 0.0),
773 vec3(0.6667, 0.26668, 0.0), vec3(0.6667, 0.277792, 0.0), vec3(0.6667, 0.288903, 0.0), vec3(0.6667, 0.300015, 0.0),
774 vec3(0.6667, 0.311127, 0.0), vec3(0.6667, 0.322238, 0.0), vec3(0.6667, 0.33335, 0.0), vec3(0.6667, 0.344462, 0.0),
775 vec3(0.6667, 0.355573, 0.0), vec3(0.6667, 0.366685, 0.0), vec3(0.6667, 0.377797, 0.0), vec3(0.6667, 0.388908, 0.0),
776 vec3(0.6667, 0.40002, 0.0), vec3(0.6667, 0.411132, 0.0), vec3(0.6667, 0.422243, 0.0), vec3(0.6667, 0.433355, 0.0),
777 vec3(0.6667, 0.444467, 0.0), vec3(0.6667, 0.455578, 0.0), vec3(0.6667, 0.46669, 0.0), vec3(0.6667, 0.477802, 0.0),
778 vec3(0.6667, 0.488913, 0.0), vec3(0.6667, 0.500025, 0.0), vec3(0.6667, 0.511137, 0.0), vec3(0.6667, 0.522248, 0.0),
779 vec3(0.6667, 0.53336, 0.0), vec3(0.6667, 0.544472, 0.0), vec3(0.6667, 0.555583, 0.0), vec3(0.6667, 0.566695, 0.0),
780 vec3(0.6667, 0.577807, 0.0), vec3(0.6667, 0.588918, 0.0), vec3(0.6667, 0.60003, 0.0), vec3(0.6667, 0.611142, 0.0),
781 vec3(0.6667, 0.622253, 0.0), vec3(0.6667, 0.633365, 0.0), vec3(0.6667, 0.644477, 0.0), vec3(0.6667, 0.655588, 0.0),
782 vec3(0.6667, 0.6667, 0.0), vec3(0.655588, 0.6667, 0.0), vec3(0.644477, 0.6667, 0.0), vec3(0.633365, 0.6667, 0.0),
783 vec3(0.622253, 0.6667, 0.0), vec3(0.611142, 0.6667, 0.0), vec3(0.60003, 0.6667, 0.0), vec3(0.588918, 0.6667, 0.0),
784 vec3(0.577807, 0.6667, 0.0), vec3(0.566695, 0.6667, 0.0), vec3(0.555583, 0.6667, 0.0), vec3(0.544472, 0.6667, 0.0),
785 vec3(0.53336, 0.6667, 0.0), vec3(0.522248, 0.6667, 0.0), vec3(0.511137, 0.6667, 0.0), vec3(0.500025, 0.6667, 0.0),
786 vec3(0.488913, 0.6667, 0.0), vec3(0.477802, 0.6667, 0.0), vec3(0.46669, 0.6667, 0.0), vec3(0.455578, 0.6667, 0.0),
787 vec3(0.444467, 0.6667, 0.0), vec3(0.433355, 0.6667, 0.0), vec3(0.422243, 0.6667, 0.0), vec3(0.411132, 0.6667, 0.0),
788 vec3(0.40002, 0.6667, 0.0), vec3(0.388908, 0.6667, 0.0), vec3(0.377797, 0.6667, 0.0), vec3(0.366685, 0.6667, 0.0),
789 vec3(0.355573, 0.6667, 0.0), vec3(0.344462, 0.6667, 0.0), vec3(0.33335, 0.6667, 0.0), vec3(0.322238, 0.6667, 0.0),
790 vec3(0.311127, 0.6667, 0.0), vec3(0.300015, 0.6667, 0.0), vec3(0.288903, 0.6667, 0.0), vec3(0.277792, 0.6667, 0.0),
791 vec3(0.26668, 0.6667, 0.0), vec3(0.255568, 0.6667, 0.0), vec3(0.244457, 0.6667, 0.0), vec3(0.233345, 0.6667, 0.0),
792 vec3(0.222233, 0.6667, 0.0), vec3(0.211122, 0.6667, 0.0), vec3(0.20001, 0.6667, 0.0), vec3(0.188898, 0.6667, 0.0),
793 vec3(0.177787, 0.6667, 0.0), vec3(0.166675, 0.6667, 0.0), vec3(0.155563, 0.6667, 0.0), vec3(0.144452, 0.6667, 0.0),
794 vec3(0.13334, 0.6667, 0.0), vec3(0.122228, 0.6667, 0.0), vec3(0.111117, 0.6667, 0.0), vec3(0.100005, 0.6667, 0.0),
795 vec3(0.088893, 0.6667, 0.0), vec3(0.077782, 0.6667, 0.0), vec3(0.06667, 0.6667, 0.0), vec3(0.055558, 0.6667, 0.0),
796 vec3(0.044447, 0.6667, 0.0), vec3(0.033335, 0.6667, 0.0), vec3(0.022223, 0.6667, 0.0), vec3(0.011112, 0.6667, 0.0),
797 vec3(0.0, 0.6667, 0.0), vec3(0.0, 0.6667, 0.011112), vec3(0.0, 0.6667, 0.022223), vec3(0.0, 0.6667, 0.033335),
798 vec3(0.0, 0.6667, 0.044447), vec3(0.0, 0.6667, 0.055558), vec3(0.0, 0.6667, 0.06667), vec3(0.0, 0.6667, 0.077782),
799 vec3(0.0, 0.6667, 0.088893), vec3(0.0, 0.6667, 0.100005), vec3(0.0, 0.6667, 0.111117), vec3(0.0, 0.6667, 0.122228),
800 vec3(0.0, 0.6667, 0.13334), vec3(0.0, 0.6667, 0.144452), vec3(0.0, 0.6667, 0.155563), vec3(0.0, 0.6667, 0.166675),
801 vec3(0.0, 0.6667, 0.177787), vec3(0.0, 0.6667, 0.188898), vec3(0.0, 0.6667, 0.20001), vec3(0.0, 0.6667, 0.211122),
802 vec3(0.0, 0.6667, 0.222233), vec3(0.0, 0.6667, 0.233345), vec3(0.0, 0.6667, 0.244457), vec3(0.0, 0.6667, 0.255568),
803 vec3(0.0, 0.6667, 0.26668), vec3(0.0, 0.6667, 0.277792), vec3(0.0, 0.6667, 0.288903), vec3(0.0, 0.6667, 0.300015),
804 vec3(0.0, 0.6667, 0.311127), vec3(0.0, 0.6667, 0.322238), vec3(0.0, 0.6667, 0.33335), vec3(0.0, 0.6667, 0.344462),
805 vec3(0.0, 0.6667, 0.355573), vec3(0.0, 0.6667, 0.366685), vec3(0.0, 0.6667, 0.377797), vec3(0.0, 0.6667, 0.388908),
806 vec3(0.0, 0.6667, 0.40002), vec3(0.0, 0.6667, 0.411132), vec3(0.0, 0.6667, 0.422243), vec3(0.0, 0.6667, 0.433355),
807 vec3(0.0, 0.6667, 0.444467), vec3(0.0, 0.6667, 0.455578), vec3(0.0, 0.6667, 0.46669), vec3(0.0, 0.6667, 0.477802),
808 vec3(0.0, 0.6667, 0.488913), vec3(0.0, 0.6667, 0.500025), vec3(0.0, 0.6667, 0.511137), vec3(0.0, 0.6667, 0.522248),
809 vec3(0.0, 0.6667, 0.53336), vec3(0.0, 0.6667, 0.544472), vec3(0.0, 0.6667, 0.555583), vec3(0.0, 0.6667, 0.566695),
810 vec3(0.0, 0.6667, 0.577807), vec3(0.0, 0.6667, 0.588918), vec3(0.0, 0.6667, 0.60003), vec3(0.0, 0.6667, 0.611142),
811 vec3(0.0, 0.6667, 0.622253), vec3(0.0, 0.6667, 0.633365), vec3(0.0, 0.6667, 0.644477), vec3(0.0, 0.6667, 0.655588),
812 vec3(0.0, 0.6667, 0.6667), vec3(0.0, 0.655588, 0.6667), vec3(0.0, 0.644477, 0.6667), vec3(0.0, 0.633365, 0.6667),
813 vec3(0.0, 0.622253, 0.6667), vec3(0.0, 0.611142, 0.6667), vec3(0.0, 0.60003, 0.6667), vec3(0.0, 0.588918, 0.6667),
814 vec3(0.0, 0.577807, 0.6667), vec3(0.0, 0.566695, 0.6667), vec3(0.0, 0.555583, 0.6667), vec3(0.0, 0.544472, 0.6667),
815 vec3(0.0, 0.53336, 0.6667), vec3(0.0, 0.522248, 0.6667), vec3(0.0, 0.511137, 0.6667), vec3(0.0, 0.500025, 0.6667),
816 vec3(0.0, 0.488913, 0.6667), vec3(0.0, 0.477802, 0.6667), vec3(0.0, 0.46669, 0.6667), vec3(0.0, 0.455578, 0.6667),
817 vec3(0.0, 0.444467, 0.6667), vec3(0.0, 0.433355, 0.6667), vec3(0.0, 0.422243, 0.6667), vec3(0.0, 0.411132, 0.6667),
818 vec3(0.0, 0.40002, 0.6667), vec3(0.0, 0.388908, 0.6667), vec3(0.0, 0.377797, 0.6667), vec3(0.0, 0.366685, 0.6667),
819 vec3(0.0, 0.355573, 0.6667), vec3(0.0, 0.344462, 0.6667), vec3(0.0, 0.33335, 0.6667), vec3(0.0, 0.322238, 0.6667),
820 vec3(0.0, 0.311127, 0.6667), vec3(0.0, 0.300015, 0.6667), vec3(0.0, 0.288903, 0.6667), vec3(0.0, 0.277792, 0.6667),
821 vec3(0.0, 0.26668, 0.6667), vec3(0.0, 0.255568, 0.6667), vec3(0.0, 0.244457, 0.6667), vec3(0.0, 0.233345, 0.6667),
822 vec3(0.0, 0.222233, 0.6667), vec3(0.0, 0.211122, 0.6667), vec3(0.0, 0.20001, 0.6667), vec3(0.0, 0.188898, 0.6667),
823 vec3(0.0, 0.177787, 0.6667), vec3(0.0, 0.166675, 0.6667), vec3(0.0, 0.155563, 0.6667), vec3(0.0, 0.144452, 0.6667),
824 vec3(0.0, 0.13334, 0.6667), vec3(0.0, 0.122228, 0.6667), vec3(0.0, 0.111117, 0.6667), vec3(0.0, 0.100005, 0.6667),
825 vec3(0.0, 0.088893, 0.6667), vec3(0.0, 0.077782, 0.6667), vec3(0.0, 0.06667, 0.6667), vec3(0.0, 0.055558, 0.6667),
826 vec3(0.0, 0.044447, 0.6667), vec3(0.0, 0.033335, 0.6667), vec3(0.0, 0.022223, 0.6667), vec3(0.0, 0.011112, 0.6667),
827 vec3(0.0, 0.0, 0.6667), vec3(0.011112, 0.0, 0.6667), vec3(0.022223, 0.0, 0.6667), vec3(0.033335, 0.0, 0.6667),
828 vec3(0.044447, 0.0, 0.6667), vec3(0.055558, 0.0, 0.6667), vec3(0.06667, 0.0, 0.6667), vec3(0.077782, 0.0, 0.6667),
829 vec3(0.088893, 0.0, 0.6667), vec3(0.100005, 0.0, 0.6667), vec3(0.111117, 0.0, 0.6667), vec3(0.122228, 0.0, 0.6667),
830 vec3(0.13334, 0.0, 0.6667), vec3(0.144452, 0.0, 0.6667), vec3(0.155563, 0.0, 0.6667), vec3(0.166675, 0.0, 0.6667),
831 vec3(0.177787, 0.0, 0.6667), vec3(0.188898, 0.0, 0.6667), vec3(0.20001, 0.0, 0.6667), vec3(0.211122, 0.0, 0.6667),
832 vec3(0.222233, 0.0, 0.6667), vec3(0.233345, 0.0, 0.6667), vec3(0.244457, 0.0, 0.6667), vec3(0.255568, 0.0, 0.6667),
833 vec3(0.26668, 0.0, 0.6667), vec3(0.277792, 0.0, 0.6667), vec3(0.288903, 0.0, 0.6667), vec3(0.300015, 0.0, 0.6667),
834 vec3(0.311127, 0.0, 0.6667), vec3(0.322238, 0.0, 0.6667), vec3(0.33335, 0.0, 0.6667), vec3(0.344462, 0.0, 0.6667),
835 vec3(0.355573, 0.0, 0.6667), vec3(0.366685, 0.0, 0.6667), vec3(0.377797, 0.0, 0.6667), vec3(0.388908, 0.0, 0.6667),
836 vec3(0.40002, 0.0, 0.6667), vec3(0.411132, 0.0, 0.6667), vec3(0.422243, 0.0, 0.6667), vec3(0.433355, 0.0, 0.6667),
837 vec3(0.444467, 0.0, 0.6667), vec3(0.455578, 0.0, 0.6667), vec3(0.46669, 0.0, 0.6667), vec3(0.477802, 0.0, 0.6667),
838 vec3(0.488913, 0.0, 0.6667), vec3(0.500025, 0.0, 0.6667), vec3(0.511137, 0.0, 0.6667), vec3(0.522248, 0.0, 0.6667),
839 vec3(0.53336, 0.0, 0.6667), vec3(0.544472, 0.0, 0.6667), vec3(0.555583, 0.0, 0.6667), vec3(0.566695, 0.0, 0.6667),
840 vec3(0.577807, 0.0, 0.6667), vec3(0.588918, 0.0, 0.6667), vec3(0.60003, 0.0, 0.6667), vec3(0.611142, 0.0, 0.6667),
841 vec3(0.622253, 0.0, 0.6667), vec3(0.633365, 0.0, 0.6667), vec3(0.644477, 0.0, 0.6667), vec3(0.655588, 0.0, 0.6667),
842 vec3(0.6667, 0.0, 0.6667), vec3(0.6667, 0.0, 0.655588), vec3(0.6667, 0.0, 0.644477), vec3(0.6667, 0.0, 0.633365),
843 vec3(0.6667, 0.0, 0.622253), vec3(0.6667, 0.0, 0.611142), vec3(0.6667, 0.0, 0.60003), vec3(0.6667, 0.0, 0.588918),
844 vec3(0.6667, 0.0, 0.577807), vec3(0.6667, 0.0, 0.566695), vec3(0.6667, 0.0, 0.555583), vec3(0.6667, 0.0, 0.544472),
845 vec3(0.6667, 0.0, 0.53336), vec3(0.6667, 0.0, 0.522248), vec3(0.6667, 0.0, 0.511137), vec3(0.6667, 0.0, 0.500025),
846 vec3(0.6667, 0.0, 0.488913), vec3(0.6667, 0.0, 0.477802), vec3(0.6667, 0.0, 0.46669), vec3(0.6667, 0.0, 0.455578),
847 vec3(0.6667, 0.0, 0.444467), vec3(0.6667, 0.0, 0.433355), vec3(0.6667, 0.0, 0.422243), vec3(0.6667, 0.0, 0.411132),
848 vec3(0.6667, 0.0, 0.40002), vec3(0.6667, 0.0, 0.388908), vec3(0.6667, 0.0, 0.377797), vec3(0.6667, 0.0, 0.366685),
849 vec3(0.6667, 0.0, 0.355573), vec3(0.6667, 0.0, 0.344462), vec3(0.6667, 0.0, 0.33335), vec3(0.6667, 0.0, 0.322238),
850 vec3(0.6667, 0.0, 0.311127), vec3(0.6667, 0.0, 0.300015), vec3(0.6667, 0.0, 0.288903), vec3(0.6667, 0.0, 0.277792),
851 vec3(0.6667, 0.0, 0.26668), vec3(0.6667, 0.0, 0.255568), vec3(0.6667, 0.0, 0.244457), vec3(0.6667, 0.0, 0.233345),
852 vec3(0.6667, 0.0, 0.222233), vec3(0.6667, 0.0, 0.211122), vec3(0.6667, 0.0, 0.20001), vec3(0.6667, 0.0, 0.188898),
853 vec3(0.6667, 0.0, 0.177787), vec3(0.6667, 0.0, 0.166675), vec3(0.6667, 0.0, 0.155563), vec3(0.6667, 0.0, 0.144452),
854 vec3(0.6667, 0.0, 0.13334), vec3(0.6667, 0.0, 0.122228), vec3(0.6667, 0.0, 0.111117), vec3(0.6667, 0.0, 0.100005),
855 vec3(0.6667, 0.0, 0.088893), vec3(0.6667, 0.0, 0.077782), vec3(0.6667, 0.0, 0.06667), vec3(0.6667, 0.0, 0.055558),
856 vec3(0.6667, 0.0, 0.044447), vec3(0.6667, 0.0, 0.033335), vec3(0.6667, 0.0, 0.022223), vec3(0.6667, 0.0, 0.011112)
857 );
761 vec3 tint;
858 vec3 tint;
762 if (tk >= 999.5) {
859 if (tk >= 999.5) {
763 float h = clamp(tk - 1000.0, 0.0, 359.0);
860 int hi = int(clamp(tk - 1000.0, 0.0, 359.0));
764 float s = 1.0, v = 0.6667;
861 tint = HUE_RGB[hi];
765 float ch = v * s;
766 float x = ch * (1.0 - abs(mod(h / 60.0, 2.0) - 1.0));
767 float m = v - ch;
768 vec3 rgb = h < 60.0 ? vec3(ch, x, 0.0) : h < 120.0 ? vec3(x, ch, 0.0)
769 : h < 180.0 ? vec3(0.0, ch, x) : h < 240.0 ? vec3(0.0, x, ch)
770 : h < 300.0 ? vec3(x, 0.0, ch) : vec3(ch, 0.0, x);
771 tint = rgb + vec3(m);
772 } else {
862 } else {
773 tint = tk < 0.5 ? vec3(0.0) : tk < 1.5 ? vec3(0.0, 0.0, 0.6667) : tk < 2.5 ? vec3(0.6667, 0.0, 0.0)
863 tint = tk < 0.5 ? vec3(0.0) : tk < 1.5 ? vec3(0.0, 0.0, 0.6667) : tk < 2.5 ? vec3(0.6667, 0.0, 0.0)
774 : tk < 3.5 ? vec3(0.0, 0.6667, 0.0) : tk < 4.5 ? vec3(0.4, 0.0, 0.6667) : tk < 5.5 ? vec3(0.6667, 0.6667, 0.0)
864 : tk < 3.5 ? vec3(0.0, 0.6667, 0.0) : tk < 4.5 ? vec3(0.4, 0.0, 0.6667) : tk < 5.5 ? vec3(0.6667, 0.6667, 0.0)
kwin6_effect_marble_minimize/contents/ui/config.ui +1 −1
@@ -14,7 +14,7 @@
14 14 <item row="4" column="0"><widget class="QLabel" name="l5"><property name="text"><string>Black mix center (%)</string></property></widget></item>
15 15 <item row="4" column="1"><widget class="QSpinBox" name="kcfg_BlackMixCenter"><property name="maximum"><number>100</number></property></widget></item>
16 16 <item row="5" column="0"><widget class="QLabel" name="l6"><property name="text"><string>Mix colour</string></property><property name="toolTip"><string>Zwart–Bruin: vaste mixkleur. Willekeurig: nieuwe kleur per volgend venster. Semiwillekeurig: vaste kleur per programma (windowClass).</string></property></widget></item>
17 <item row="5" column="1"><widget class="QComboBox" name="kcfg_MixColor"><item><property name="text"><string>Zwart (#000000)</string></property></item><item><property name="text"><string>Blauw (#0000aa)</string></property></item><item><property name="text"><string>Rood (#aa0000)</string></property></item><item><property name="text"><string>Groen (#00aa00)</string></property></item><item><property name="text"><string>Paars (#6600aa)</string></property></item><item><property name="text"><string>Geel (#aaaa00)</string></property></item><item><property name="text"><string>Oranje (#aa5500)</string></property></item><item><property name="text"><string>Cyaan (#00aaaa)</string></property></item><item><property name="text"><string>Roze (#aa0066)</string></property></item><item><property name="text"><string>Grijs (#555555)</string></property></item><item><property name="text"><string>Bruin (#553300)</string></property></item><item><property name="text"><string>Willekeurig</string></property></item><item><property name="text"><string>Semiwillekeurig</string></property></item></widget><property name="toolTip"><string>Zwart–Bruin: vaste mixkleur.&#10;Willekeurig: elk volgend venster een nieuwe kleur (teller → kleurtoon), vaste saturatie/helderheid.&#10;Semiwillekeurig: vaste kleur per programma uit windowClass (hash → kleurtoon); Dolphin blijft dezelfde tint.</string></property></item>
17 <item row="5" column="1"><widget class="QComboBox" name="kcfg_MixColor"><item><property name="text"><string>Zwart (#000000)</string></property></item><item><property name="text"><string>Blauw (#0000aa)</string></property></item><item><property name="text"><string>Rood (#aa0000)</string></property></item><item><property name="text"><string>Groen (#00aa00)</string></property></item><item><property name="text"><string>Paars (#6600aa)</string></property></item><item><property name="text"><string>Geel (#aaaa00)</string></property></item><item><property name="text"><string>Oranje (#aa5500)</string></property></item><item><property name="text"><string>Cyaan (#00aaaa)</string></property></item><item><property name="text"><string>Roze (#aa0066)</string></property></item><item><property name="text"><string>Grijs (#555555)</string></property></item><item><property name="text"><string>Bruin (#553300)</string></property></item><item><property name="text"><string>Willekeurig</string></property></item><item><property name="text"><string>Semiwillekeurig</string></property></item><property name="toolTip"><string>Zwart–Bruin: vaste mixkleur.&#10;Willekeurig: elk volgend venster een nieuwe kleur (teller → kleurtoon), vaste saturatie/helderheid.&#10;Semiwillekeurig: vaste kleur per programma uit windowClass (hash → kleurtoon); Dolphin blijft dezelfde tint.</string></property></widget></item>
18 18 <item row="6" column="0"><widget class="QLabel" name="l7"><property name="text"><string>Marble size (px)</string></property></widget></item>
19 19 <item row="6" column="1"><widget class="QSpinBox" name="kcfg_MarbleSize"><property name="minimum"><number>4</number></property><property name="maximum"><number>1000</number></property></widget></item>
20 20 </layout>
@@ -14,7 +14,7 @@
14 <item row="4" column="0"><widget class="QLabel" name="l5"><property name="text"><string>Black mix center (%)</string></property></widget></item>
14 <item row="4" column="0"><widget class="QLabel" name="l5"><property name="text"><string>Black mix center (%)</string></property></widget></item>
15 <item row="4" column="1"><widget class="QSpinBox" name="kcfg_BlackMixCenter"><property name="maximum"><number>100</number></property></widget></item>
15 <item row="4" column="1"><widget class="QSpinBox" name="kcfg_BlackMixCenter"><property name="maximum"><number>100</number></property></widget></item>
16 <item row="5" column="0"><widget class="QLabel" name="l6"><property name="text"><string>Mix colour</string></property><property name="toolTip"><string>Zwart–Bruin: vaste mixkleur. Willekeurig: nieuwe kleur per volgend venster. Semiwillekeurig: vaste kleur per programma (windowClass).</string></property></widget></item>
16 <item row="5" column="0"><widget class="QLabel" name="l6"><property name="text"><string>Mix colour</string></property><property name="toolTip"><string>Zwart–Bruin: vaste mixkleur. Willekeurig: nieuwe kleur per volgend venster. Semiwillekeurig: vaste kleur per programma (windowClass).</string></property></widget></item>
17 <item row="5" column="1"><widget class="QComboBox" name="kcfg_MixColor"><item><property name="text"><string>Zwart (#000000)</string></property></item><item><property name="text"><string>Blauw (#0000aa)</string></property></item><item><property name="text"><string>Rood (#aa0000)</string></property></item><item><property name="text"><string>Groen (#00aa00)</string></property></item><item><property name="text"><string>Paars (#6600aa)</string></property></item><item><property name="text"><string>Geel (#aaaa00)</string></property></item><item><property name="text"><string>Oranje (#aa5500)</string></property></item><item><property name="text"><string>Cyaan (#00aaaa)</string></property></item><item><property name="text"><string>Roze (#aa0066)</string></property></item><item><property name="text"><string>Grijs (#555555)</string></property></item><item><property name="text"><string>Bruin (#553300)</string></property></item><item><property name="text"><string>Willekeurig</string></property></item><item><property name="text"><string>Semiwillekeurig</string></property></item></widget><property name="toolTip"><string>Zwart–Bruin: vaste mixkleur.&#10;Willekeurig: elk volgend venster een nieuwe kleur (teller → kleurtoon), vaste saturatie/helderheid.&#10;Semiwillekeurig: vaste kleur per programma uit windowClass (hash → kleurtoon); Dolphin blijft dezelfde tint.</string></property></item>
17 <item row="5" column="1"><widget class="QComboBox" name="kcfg_MixColor"><item><property name="text"><string>Zwart (#000000)</string></property></item><item><property name="text"><string>Blauw (#0000aa)</string></property></item><item><property name="text"><string>Rood (#aa0000)</string></property></item><item><property name="text"><string>Groen (#00aa00)</string></property></item><item><property name="text"><string>Paars (#6600aa)</string></property></item><item><property name="text"><string>Geel (#aaaa00)</string></property></item><item><property name="text"><string>Oranje (#aa5500)</string></property></item><item><property name="text"><string>Cyaan (#00aaaa)</string></property></item><item><property name="text"><string>Roze (#aa0066)</string></property></item><item><property name="text"><string>Grijs (#555555)</string></property></item><item><property name="text"><string>Bruin (#553300)</string></property></item><item><property name="text"><string>Willekeurig</string></property></item><item><property name="text"><string>Semiwillekeurig</string></property></item><property name="toolTip"><string>Zwart–Bruin: vaste mixkleur.&#10;Willekeurig: elk volgend venster een nieuwe kleur (teller → kleurtoon), vaste saturatie/helderheid.&#10;Semiwillekeurig: vaste kleur per programma uit windowClass (hash → kleurtoon); Dolphin blijft dezelfde tint.</string></property></widget></item>
18 <item row="6" column="0"><widget class="QLabel" name="l7"><property name="text"><string>Marble size (px)</string></property></widget></item>
18 <item row="6" column="0"><widget class="QLabel" name="l7"><property name="text"><string>Marble size (px)</string></property></widget></item>
19 <item row="6" column="1"><widget class="QSpinBox" name="kcfg_MarbleSize"><property name="minimum"><number>4</number></property><property name="maximum"><number>1000</number></property></widget></item>
19 <item row="6" column="1"><widget class="QSpinBox" name="kcfg_MarbleSize"><property name="minimum"><number>4</number></property><property name="maximum"><number>1000</number></property></widget></item>
20 </layout>
20 </layout>