Close: same colour list cleanup and MarbleSize default 42, no per-window uniforms
@@ -87,18 +87,21 @@ class BurnMyWindowsMarbleEffect {
87
87
// free fall from rest: d = 0.5 g t^2 -> t = sqrt(2d/g); scaled by the global speed factor
88
88
this.fallDuration = animationTime(Math.round(1000 * Math.sqrt(2 * this.fallDistance / this.gravity)));
89
89
effect.setUniform(this.shader, 'uDuration', (this.duration + this.pause + this.fallDuration) * 0.001);
90
this.tintMode = Math.max(0, Math.min(12, Number(effect.readConfig('MixColor', 0)) | 0));
90
// 0..10 colours, 11 = random. Values saved by v0.3.0 (10 = white, 12 = random) fall back safely.
91
let mc = Math.floor(Number(effect.readConfig('MixColor', 0)));
92
if (!(mc >= 0)) mc = 0; else if (mc > 11) mc = 11;
93
this.tintMode = mc;
91
94
this.applyTint(null, false);
92
effect.setUniform(this.shader, 'uMarbleSize', Math.max(4, Number(effect.readConfig('MarbleSize', 56))));
95
effect.setUniform(this.shader, 'uMarbleSize', Math.max(4, Number(effect.readConfig('MarbleSize', 42))));
93
96
effect.setUniform(this.shader, 'uMixOuter', Math.min(100, Math.max(0, Number(effect.readConfig('BlackMixOuter', 80)))) / 100);
94
97
effect.setUniform(this.shader, 'uMixCenter', Math.min(100, Math.max(0, Number(effect.readConfig('BlackMixCenter', 5)))) / 100);
95
98
effect.setUniform(this.shader, 'uCrumpleEnd', this.duration / Math.max(1, this.duration + this.pause + this.fallDuration));
96
99
}
97
100
98
// Mix target colour. tintMode 12 = random; with reuse, a random colour picked for this
101
// Mix target colour. tintMode 11 = random; with reuse, a random colour picked for this
99
102
// window (e.g. at minimize) is used again (e.g. at unminimize) and then forgotten.
100
103
applyTint(window, reuse) {
101
const C = [[0.0000,0.0000,0.0000],[0.0000,0.0000,0.6667],[0.6667,0.0000,0.0000],[0.0000,0.6667,0.0000],[0.4000,0.0000,0.6667],[0.6667,0.6667,0.0000],[0.6667,0.3333,0.0000],[0.0000,0.6667,0.6667],[0.6667,0.0000,0.4000],[0.3333,0.3333,0.3333],[1.0000,1.0000,1.0000],[0.3333,0.2000,0.0000]];
104
const C = [[0.0000,0.0000,0.0000],[0.0000,0.0000,0.6667],[0.6667,0.0000,0.0000],[0.0000,0.6667,0.0000],[0.4000,0.0000,0.6667],[0.6667,0.6667,0.0000],[0.6667,0.3333,0.0000],[0.0000,0.6667,0.6667],[0.6667,0.0000,0.4000],[0.3333,0.3333,0.3333],[0.3333,0.2000,0.0000]];
102
105
let c;
103
106
if (this.tintMode < C.length) c = C[this.tintMode];
104
107
else if (window && reuse && window.bmwTint) { c = window.bmwTint; window.bmwTint = null; }
@@ -87,18 +87,21 @@ class BurnMyWindowsMarbleEffect {87
// free fall from rest: d = 0.5 g t^2 -> t = sqrt(2d/g); scaled by the global speed factor87
// free fall from rest: d = 0.5 g t^2 -> t = sqrt(2d/g); scaled by the global speed factor88
this.fallDuration = animationTime(Math.round(1000 * Math.sqrt(2 * this.fallDistance / this.gravity)));88
this.fallDuration = animationTime(Math.round(1000 * Math.sqrt(2 * this.fallDistance / this.gravity)));89
effect.setUniform(this.shader, 'uDuration', (this.duration + this.pause + this.fallDuration) * 0.001);89
effect.setUniform(this.shader, 'uDuration', (this.duration + this.pause + this.fallDuration) * 0.001);90
this.tintMode = Math.max(0, Math.min(12, Number(effect.readConfig('MixColor', 0)) | 0));90
// 0..10 colours, 11 = random. Values saved by v0.3.0 (10 = white, 12 = random) fall back safely.91
let mc = Math.floor(Number(effect.readConfig('MixColor', 0)));92
if (!(mc >= 0)) mc = 0; else if (mc > 11) mc = 11;93
this.tintMode = mc;91
this.applyTint(null, false);94
this.applyTint(null, false);92
effect.setUniform(this.shader, 'uMarbleSize', Math.max(4, Number(effect.readConfig('MarbleSize', 56))));95
effect.setUniform(this.shader, 'uMarbleSize', Math.max(4, Number(effect.readConfig('MarbleSize', 42))));93
effect.setUniform(this.shader, 'uMixOuter', Math.min(100, Math.max(0, Number(effect.readConfig('BlackMixOuter', 80)))) / 100);96
effect.setUniform(this.shader, 'uMixOuter', Math.min(100, Math.max(0, Number(effect.readConfig('BlackMixOuter', 80)))) / 100);94
effect.setUniform(this.shader, 'uMixCenter', Math.min(100, Math.max(0, Number(effect.readConfig('BlackMixCenter', 5)))) / 100);97
effect.setUniform(this.shader, 'uMixCenter', Math.min(100, Math.max(0, Number(effect.readConfig('BlackMixCenter', 5)))) / 100);95
effect.setUniform(this.shader, 'uCrumpleEnd', this.duration / Math.max(1, this.duration + this.pause + this.fallDuration));98
effect.setUniform(this.shader, 'uCrumpleEnd', this.duration / Math.max(1, this.duration + this.pause + this.fallDuration));96
}99
}97
100
98
// Mix target colour. tintMode 12 = random; with reuse, a random colour picked for this101
// Mix target colour. tintMode 11 = random; with reuse, a random colour picked for this99
// window (e.g. at minimize) is used again (e.g. at unminimize) and then forgotten.102
// window (e.g. at minimize) is used again (e.g. at unminimize) and then forgotten.100
applyTint(window, reuse) {103
applyTint(window, reuse) {101
const C = [[0.0000,0.0000,0.0000],[0.0000,0.0000,0.6667],[0.6667,0.0000,0.0000],[0.0000,0.6667,0.0000],[0.4000,0.0000,0.6667],[0.6667,0.6667,0.0000],[0.6667,0.3333,0.0000],[0.0000,0.6667,0.6667],[0.6667,0.0000,0.4000],[0.3333,0.3333,0.3333],[1.0000,1.0000,1.0000],[0.3333,0.2000,0.0000]];104
const C = [[0.0000,0.0000,0.0000],[0.0000,0.0000,0.6667],[0.6667,0.0000,0.0000],[0.0000,0.6667,0.0000],[0.4000,0.0000,0.6667],[0.6667,0.6667,0.0000],[0.6667,0.3333,0.0000],[0.0000,0.6667,0.6667],[0.6667,0.0000,0.4000],[0.3333,0.3333,0.3333],[0.3333,0.2000,0.0000]];102
let c;105
let c;103
if (this.tintMode < C.length) c = C[this.tintMode];106
if (this.tintMode < C.length) c = C[this.tintMode];104
else if (window && reuse && window.bmwTint) { c = window.bmwTint; window.bmwTint = null; }107
else if (window && reuse && window.bmwTint) { c = window.bmwTint; window.bmwTint = null; }@@ -8,6 +8,6 @@
8
8
<entry name="BlackMixOuter" type="UInt"><default>80</default></entry>
9
9
<entry name="BlackMixCenter" type="UInt"><default>5</default></entry>
10
10
<entry name="MixColor" type="Int"><default>0</default></entry>
11
<entry name="MarbleSize" type="UInt"><default>56</default></entry>
11
<entry name="MarbleSize" type="UInt"><default>42</default></entry>
12
12
</group>
13
13
</kcfg>
@@ -8,6 +8,6 @@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>0</default></entry>11
<entry name="MarbleSize" type="UInt"><default>56</default></entry>11
<entry name="MarbleSize" type="UInt"><default>42</default></entry>12
</group>12
</group>13
</kcfg>13
</kcfg>@@ -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></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>Wit (#ffffff)</string></property></item><item><property name="text"><string>Bruin (#553300)</string></property></item><item><property name="text"><string>Willekeurig</string></property></item></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></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></widget></item>16
<item row="5" column="0"><widget class="QLabel" name="l6"><property name="text"><string>Mix colour</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>Wit (#ffffff)</string></property></item><item><property name="text"><string>Bruin (#553300)</string></property></item><item><property name="text"><string>Willekeurig</string></property></item></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></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>