BlueGit

timfa kwin-marble

Lower KVT logo on marble and strengthen shadow fade

Nudge the Energise SDF mark down and slightly smaller in q-space so
the three top dots stay on the disk, and fall off logo contribution
with pow(lit) so it dissolves into marble shadow instead of sitting
as a flat grey overlay.

timfa Tim Falken · pushed by timfa

Authored 2026-11-06 · 11 days ago

Hash
3be64bc276f79f10f77cd0c32e0946818a5066ef
Parent
4b6a5054
4 files changed +44 −28
kwin6_effect_marble/contents/shaders/marble.frag +11 −7
@@ -1018,17 +1018,21 @@ void main() {
1018 1018 float bottom = 1.0 - 0.55 * clamp(q.y * 0.9 + 0.2, 0.0, 1.0) * (1.0 - z * 0.5);
1019 1019 float lit = mix(1.0, (0.45 + 0.65 * diff) * bottom, e);
1020 1020 col.rgb = col.rgb * lit + e * (vec3(glow) + fres * vec3(0.18, 0.2, 0.24));
1021 // Procedural KVT logo (Energise SDF): white, shaded by the same marble lighting so it
1022 // softens into the sphere shadow — not a flat sticker / no extra texture sample.
1021 // Procedural KVT logo (Energise SDF): white; contribution falls off strongly with marble
1022 // lighting so the mark dissolves into sphere shadow (not a flat grey sticker).
1023 1023 {
1024 vec2 logoUV = 0.5 + q * 0.46; // centered on the marble face; fits inside the disk
1024 // Larger scale => smaller on-marble mark; y offset lowers it so top dots stay inside.
1025 // q.y > 0 is marble bottom (Energise SVG y-down); subtracting logoUV.y moves the mark down.
1026 vec2 logoUV = 0.5 + q * 0.50 - vec2(0.0, 0.075);
1025 1027 float logoMask = 0.0;
1026 if (logoUV.x > 0.18 && logoUV.x < 0.82 && logoUV.y > 0.04 && logoUV.y < 0.98) {
1027 float aa = 2.5 / max(min(b.x, b.y), 1.0); // ~pixel AA in logo UV
1028 if (logoUV.x > 0.16 && logoUV.x < 0.84 && logoUV.y > 0.02 && logoUV.y < 0.99) {
1029 float aa = 2.5 / max(min(b.x, b.y), 1.0);
1028 1030 logoMask = smoothstep(aa, -aa, logoSD(logoUV));
1029 1031 }
1030 vec3 logoCol = vec3(lit); // pure white * marble light → fades in shadow
1031 col.rgb = mix(col.rgb, logoCol, e * logoMask);
1032 // Stronger than lit-only: mask itself shrinks in shadow so marble material shows through.
1033 float logoAmt = e * logoMask * pow(clamp(lit / 0.92, 0.0, 1.0), 2.4);
1034 vec3 logoCol = vec3(1.0) * lit;
1035 col.rgb = mix(col.rgb, logoCol, logoAmt);
1032 1036 }
1033 1037 col.rgb = mix(col.rgb, vec3(1.0), e * spot); // opaque, strong shine
1034 1038 col.rgb = min(col.rgb, vec3(1.0));
@@ -1018,17 +1018,21 @@ void main() {
1018 float bottom = 1.0 - 0.55 * clamp(q.y * 0.9 + 0.2, 0.0, 1.0) * (1.0 - z * 0.5);
1018 float bottom = 1.0 - 0.55 * clamp(q.y * 0.9 + 0.2, 0.0, 1.0) * (1.0 - z * 0.5);
1019 float lit = mix(1.0, (0.45 + 0.65 * diff) * bottom, e);
1019 float lit = mix(1.0, (0.45 + 0.65 * diff) * bottom, e);
1020 col.rgb = col.rgb * lit + e * (vec3(glow) + fres * vec3(0.18, 0.2, 0.24));
1020 col.rgb = col.rgb * lit + e * (vec3(glow) + fres * vec3(0.18, 0.2, 0.24));
1021 // Procedural KVT logo (Energise SDF): white, shaded by the same marble lighting so it
1021 // Procedural KVT logo (Energise SDF): white; contribution falls off strongly with marble
1022 // softens into the sphere shadow — not a flat sticker / no extra texture sample.
1022 // lighting so the mark dissolves into sphere shadow (not a flat grey sticker).
1023 {
1023 {
1024 vec2 logoUV = 0.5 + q * 0.46; // centered on the marble face; fits inside the disk
1024 // Larger scale => smaller on-marble mark; y offset lowers it so top dots stay inside.
1025 // q.y > 0 is marble bottom (Energise SVG y-down); subtracting logoUV.y moves the mark down.
1026 vec2 logoUV = 0.5 + q * 0.50 - vec2(0.0, 0.075);
1025 float logoMask = 0.0;
1027 float logoMask = 0.0;
1026 if (logoUV.x > 0.18 && logoUV.x < 0.82 && logoUV.y > 0.04 && logoUV.y < 0.98) {
1028 if (logoUV.x > 0.16 && logoUV.x < 0.84 && logoUV.y > 0.02 && logoUV.y < 0.99) {
1027 float aa = 2.5 / max(min(b.x, b.y), 1.0); // ~pixel AA in logo UV
1029 float aa = 2.5 / max(min(b.x, b.y), 1.0);
1028 logoMask = smoothstep(aa, -aa, logoSD(logoUV));
1030 logoMask = smoothstep(aa, -aa, logoSD(logoUV));
1029 }
1031 }
1030 vec3 logoCol = vec3(lit); // pure white * marble light → fades in shadow
1032 // Stronger than lit-only: mask itself shrinks in shadow so marble material shows through.
1031 col.rgb = mix(col.rgb, logoCol, e * logoMask);
1033 float logoAmt = e * logoMask * pow(clamp(lit / 0.92, 0.0, 1.0), 2.4);
1034 vec3 logoCol = vec3(1.0) * lit;
1035 col.rgb = mix(col.rgb, logoCol, logoAmt);
1032 }
1036 }
1033 col.rgb = mix(col.rgb, vec3(1.0), e * spot); // opaque, strong shine
1037 col.rgb = mix(col.rgb, vec3(1.0), e * spot); // opaque, strong shine
1034 col.rgb = min(col.rgb, vec3(1.0));
1038 col.rgb = min(col.rgb, vec3(1.0));
kwin6_effect_marble/contents/shaders/marble_core.frag +11 −7
@@ -1019,17 +1019,21 @@ void main() {
1019 1019 float bottom = 1.0 - 0.55 * clamp(q.y * 0.9 + 0.2, 0.0, 1.0) * (1.0 - z * 0.5);
1020 1020 float lit = mix(1.0, (0.45 + 0.65 * diff) * bottom, e);
1021 1021 col.rgb = col.rgb * lit + e * (vec3(glow) + fres * vec3(0.18, 0.2, 0.24));
1022 // Procedural KVT logo (Energise SDF): white, shaded by the same marble lighting so it
1023 // softens into the sphere shadow — not a flat sticker / no extra texture sample.
1022 // Procedural KVT logo (Energise SDF): white; contribution falls off strongly with marble
1023 // lighting so the mark dissolves into sphere shadow (not a flat grey sticker).
1024 1024 {
1025 vec2 logoUV = 0.5 + q * 0.46; // centered on the marble face; fits inside the disk
1025 // Larger scale => smaller on-marble mark; y offset lowers it so top dots stay inside.
1026 // q.y > 0 is marble bottom (Energise SVG y-down); subtracting logoUV.y moves the mark down.
1027 vec2 logoUV = 0.5 + q * 0.50 - vec2(0.0, 0.075);
1026 1028 float logoMask = 0.0;
1027 if (logoUV.x > 0.18 && logoUV.x < 0.82 && logoUV.y > 0.04 && logoUV.y < 0.98) {
1028 float aa = 2.5 / max(min(b.x, b.y), 1.0); // ~pixel AA in logo UV
1029 if (logoUV.x > 0.16 && logoUV.x < 0.84 && logoUV.y > 0.02 && logoUV.y < 0.99) {
1030 float aa = 2.5 / max(min(b.x, b.y), 1.0);
1029 1031 logoMask = smoothstep(aa, -aa, logoSD(logoUV));
1030 1032 }
1031 vec3 logoCol = vec3(lit); // pure white * marble light → fades in shadow
1032 col.rgb = mix(col.rgb, logoCol, e * logoMask);
1033 // Stronger than lit-only: mask itself shrinks in shadow so marble material shows through.
1034 float logoAmt = e * logoMask * pow(clamp(lit / 0.92, 0.0, 1.0), 2.4);
1035 vec3 logoCol = vec3(1.0) * lit;
1036 col.rgb = mix(col.rgb, logoCol, logoAmt);
1033 1037 }
1034 1038 col.rgb = mix(col.rgb, vec3(1.0), e * spot); // opaque, strong shine
1035 1039 col.rgb = min(col.rgb, vec3(1.0));
@@ -1019,17 +1019,21 @@ void main() {
1019 float bottom = 1.0 - 0.55 * clamp(q.y * 0.9 + 0.2, 0.0, 1.0) * (1.0 - z * 0.5);
1019 float bottom = 1.0 - 0.55 * clamp(q.y * 0.9 + 0.2, 0.0, 1.0) * (1.0 - z * 0.5);
1020 float lit = mix(1.0, (0.45 + 0.65 * diff) * bottom, e);
1020 float lit = mix(1.0, (0.45 + 0.65 * diff) * bottom, e);
1021 col.rgb = col.rgb * lit + e * (vec3(glow) + fres * vec3(0.18, 0.2, 0.24));
1021 col.rgb = col.rgb * lit + e * (vec3(glow) + fres * vec3(0.18, 0.2, 0.24));
1022 // Procedural KVT logo (Energise SDF): white, shaded by the same marble lighting so it
1022 // Procedural KVT logo (Energise SDF): white; contribution falls off strongly with marble
1023 // softens into the sphere shadow — not a flat sticker / no extra texture sample.
1023 // lighting so the mark dissolves into sphere shadow (not a flat grey sticker).
1024 {
1024 {
1025 vec2 logoUV = 0.5 + q * 0.46; // centered on the marble face; fits inside the disk
1025 // Larger scale => smaller on-marble mark; y offset lowers it so top dots stay inside.
1026 // q.y > 0 is marble bottom (Energise SVG y-down); subtracting logoUV.y moves the mark down.
1027 vec2 logoUV = 0.5 + q * 0.50 - vec2(0.0, 0.075);
1026 float logoMask = 0.0;
1028 float logoMask = 0.0;
1027 if (logoUV.x > 0.18 && logoUV.x < 0.82 && logoUV.y > 0.04 && logoUV.y < 0.98) {
1029 if (logoUV.x > 0.16 && logoUV.x < 0.84 && logoUV.y > 0.02 && logoUV.y < 0.99) {
1028 float aa = 2.5 / max(min(b.x, b.y), 1.0); // ~pixel AA in logo UV
1030 float aa = 2.5 / max(min(b.x, b.y), 1.0);
1029 logoMask = smoothstep(aa, -aa, logoSD(logoUV));
1031 logoMask = smoothstep(aa, -aa, logoSD(logoUV));
1030 }
1032 }
1031 vec3 logoCol = vec3(lit); // pure white * marble light → fades in shadow
1033 // Stronger than lit-only: mask itself shrinks in shadow so marble material shows through.
1032 col.rgb = mix(col.rgb, logoCol, e * logoMask);
1034 float logoAmt = e * logoMask * pow(clamp(lit / 0.92, 0.0, 1.0), 2.4);
1035 vec3 logoCol = vec3(1.0) * lit;
1036 col.rgb = mix(col.rgb, logoCol, logoAmt);
1033 }
1037 }
1034 col.rgb = mix(col.rgb, vec3(1.0), e * spot); // opaque, strong shine
1038 col.rgb = mix(col.rgb, vec3(1.0), e * spot); // opaque, strong shine
1035 col.rgb = min(col.rgb, vec3(1.0));
1039 col.rgb = min(col.rgb, vec3(1.0));
kwin6_effect_marble_minimize/contents/shaders/marble.frag +11 −7
@@ -1018,17 +1018,21 @@ void main() {
1018 1018 float bottom = 1.0 - 0.55 * clamp(q.y * 0.9 + 0.2, 0.0, 1.0) * (1.0 - z * 0.5);
1019 1019 float lit = mix(1.0, (0.45 + 0.65 * diff) * bottom, e);
1020 1020 col.rgb = col.rgb * lit + e * (vec3(glow) + fres * vec3(0.18, 0.2, 0.24));
1021 // Procedural KVT logo (Energise SDF): white, shaded by the same marble lighting so it
1022 // softens into the sphere shadow — not a flat sticker / no extra texture sample.
1021 // Procedural KVT logo (Energise SDF): white; contribution falls off strongly with marble
1022 // lighting so the mark dissolves into sphere shadow (not a flat grey sticker).
1023 1023 {
1024 vec2 logoUV = 0.5 + q * 0.46; // centered on the marble face; fits inside the disk
1024 // Larger scale => smaller on-marble mark; y offset lowers it so top dots stay inside.
1025 // q.y > 0 is marble bottom (Energise SVG y-down); subtracting logoUV.y moves the mark down.
1026 vec2 logoUV = 0.5 + q * 0.50 - vec2(0.0, 0.075);
1025 1027 float logoMask = 0.0;
1026 if (logoUV.x > 0.18 && logoUV.x < 0.82 && logoUV.y > 0.04 && logoUV.y < 0.98) {
1027 float aa = 2.5 / max(min(b.x, b.y), 1.0); // ~pixel AA in logo UV
1028 if (logoUV.x > 0.16 && logoUV.x < 0.84 && logoUV.y > 0.02 && logoUV.y < 0.99) {
1029 float aa = 2.5 / max(min(b.x, b.y), 1.0);
1028 1030 logoMask = smoothstep(aa, -aa, logoSD(logoUV));
1029 1031 }
1030 vec3 logoCol = vec3(lit); // pure white * marble light → fades in shadow
1031 col.rgb = mix(col.rgb, logoCol, e * logoMask);
1032 // Stronger than lit-only: mask itself shrinks in shadow so marble material shows through.
1033 float logoAmt = e * logoMask * pow(clamp(lit / 0.92, 0.0, 1.0), 2.4);
1034 vec3 logoCol = vec3(1.0) * lit;
1035 col.rgb = mix(col.rgb, logoCol, logoAmt);
1032 1036 }
1033 1037 col.rgb = mix(col.rgb, vec3(1.0), e * spot); // opaque, strong shine
1034 1038 col.rgb = min(col.rgb, vec3(1.0));
@@ -1018,17 +1018,21 @@ void main() {
1018 float bottom = 1.0 - 0.55 * clamp(q.y * 0.9 + 0.2, 0.0, 1.0) * (1.0 - z * 0.5);
1018 float bottom = 1.0 - 0.55 * clamp(q.y * 0.9 + 0.2, 0.0, 1.0) * (1.0 - z * 0.5);
1019 float lit = mix(1.0, (0.45 + 0.65 * diff) * bottom, e);
1019 float lit = mix(1.0, (0.45 + 0.65 * diff) * bottom, e);
1020 col.rgb = col.rgb * lit + e * (vec3(glow) + fres * vec3(0.18, 0.2, 0.24));
1020 col.rgb = col.rgb * lit + e * (vec3(glow) + fres * vec3(0.18, 0.2, 0.24));
1021 // Procedural KVT logo (Energise SDF): white, shaded by the same marble lighting so it
1021 // Procedural KVT logo (Energise SDF): white; contribution falls off strongly with marble
1022 // softens into the sphere shadow — not a flat sticker / no extra texture sample.
1022 // lighting so the mark dissolves into sphere shadow (not a flat grey sticker).
1023 {
1023 {
1024 vec2 logoUV = 0.5 + q * 0.46; // centered on the marble face; fits inside the disk
1024 // Larger scale => smaller on-marble mark; y offset lowers it so top dots stay inside.
1025 // q.y > 0 is marble bottom (Energise SVG y-down); subtracting logoUV.y moves the mark down.
1026 vec2 logoUV = 0.5 + q * 0.50 - vec2(0.0, 0.075);
1025 float logoMask = 0.0;
1027 float logoMask = 0.0;
1026 if (logoUV.x > 0.18 && logoUV.x < 0.82 && logoUV.y > 0.04 && logoUV.y < 0.98) {
1028 if (logoUV.x > 0.16 && logoUV.x < 0.84 && logoUV.y > 0.02 && logoUV.y < 0.99) {
1027 float aa = 2.5 / max(min(b.x, b.y), 1.0); // ~pixel AA in logo UV
1029 float aa = 2.5 / max(min(b.x, b.y), 1.0);
1028 logoMask = smoothstep(aa, -aa, logoSD(logoUV));
1030 logoMask = smoothstep(aa, -aa, logoSD(logoUV));
1029 }
1031 }
1030 vec3 logoCol = vec3(lit); // pure white * marble light → fades in shadow
1032 // Stronger than lit-only: mask itself shrinks in shadow so marble material shows through.
1031 col.rgb = mix(col.rgb, logoCol, e * logoMask);
1033 float logoAmt = e * logoMask * pow(clamp(lit / 0.92, 0.0, 1.0), 2.4);
1034 vec3 logoCol = vec3(1.0) * lit;
1035 col.rgb = mix(col.rgb, logoCol, logoAmt);
1032 }
1036 }
1033 col.rgb = mix(col.rgb, vec3(1.0), e * spot); // opaque, strong shine
1037 col.rgb = mix(col.rgb, vec3(1.0), e * spot); // opaque, strong shine
1034 col.rgb = min(col.rgb, vec3(1.0));
1038 col.rgb = min(col.rgb, vec3(1.0));
kwin6_effect_marble_minimize/contents/shaders/marble_core.frag +11 −7
@@ -1019,17 +1019,21 @@ void main() {
1019 1019 float bottom = 1.0 - 0.55 * clamp(q.y * 0.9 + 0.2, 0.0, 1.0) * (1.0 - z * 0.5);
1020 1020 float lit = mix(1.0, (0.45 + 0.65 * diff) * bottom, e);
1021 1021 col.rgb = col.rgb * lit + e * (vec3(glow) + fres * vec3(0.18, 0.2, 0.24));
1022 // Procedural KVT logo (Energise SDF): white, shaded by the same marble lighting so it
1023 // softens into the sphere shadow — not a flat sticker / no extra texture sample.
1022 // Procedural KVT logo (Energise SDF): white; contribution falls off strongly with marble
1023 // lighting so the mark dissolves into sphere shadow (not a flat grey sticker).
1024 1024 {
1025 vec2 logoUV = 0.5 + q * 0.46; // centered on the marble face; fits inside the disk
1025 // Larger scale => smaller on-marble mark; y offset lowers it so top dots stay inside.
1026 // q.y > 0 is marble bottom (Energise SVG y-down); subtracting logoUV.y moves the mark down.
1027 vec2 logoUV = 0.5 + q * 0.50 - vec2(0.0, 0.075);
1026 1028 float logoMask = 0.0;
1027 if (logoUV.x > 0.18 && logoUV.x < 0.82 && logoUV.y > 0.04 && logoUV.y < 0.98) {
1028 float aa = 2.5 / max(min(b.x, b.y), 1.0); // ~pixel AA in logo UV
1029 if (logoUV.x > 0.16 && logoUV.x < 0.84 && logoUV.y > 0.02 && logoUV.y < 0.99) {
1030 float aa = 2.5 / max(min(b.x, b.y), 1.0);
1029 1031 logoMask = smoothstep(aa, -aa, logoSD(logoUV));
1030 1032 }
1031 vec3 logoCol = vec3(lit); // pure white * marble light → fades in shadow
1032 col.rgb = mix(col.rgb, logoCol, e * logoMask);
1033 // Stronger than lit-only: mask itself shrinks in shadow so marble material shows through.
1034 float logoAmt = e * logoMask * pow(clamp(lit / 0.92, 0.0, 1.0), 2.4);
1035 vec3 logoCol = vec3(1.0) * lit;
1036 col.rgb = mix(col.rgb, logoCol, logoAmt);
1033 1037 }
1034 1038 col.rgb = mix(col.rgb, vec3(1.0), e * spot); // opaque, strong shine
1035 1039 col.rgb = min(col.rgb, vec3(1.0));
@@ -1019,17 +1019,21 @@ void main() {
1019 float bottom = 1.0 - 0.55 * clamp(q.y * 0.9 + 0.2, 0.0, 1.0) * (1.0 - z * 0.5);
1019 float bottom = 1.0 - 0.55 * clamp(q.y * 0.9 + 0.2, 0.0, 1.0) * (1.0 - z * 0.5);
1020 float lit = mix(1.0, (0.45 + 0.65 * diff) * bottom, e);
1020 float lit = mix(1.0, (0.45 + 0.65 * diff) * bottom, e);
1021 col.rgb = col.rgb * lit + e * (vec3(glow) + fres * vec3(0.18, 0.2, 0.24));
1021 col.rgb = col.rgb * lit + e * (vec3(glow) + fres * vec3(0.18, 0.2, 0.24));
1022 // Procedural KVT logo (Energise SDF): white, shaded by the same marble lighting so it
1022 // Procedural KVT logo (Energise SDF): white; contribution falls off strongly with marble
1023 // softens into the sphere shadow — not a flat sticker / no extra texture sample.
1023 // lighting so the mark dissolves into sphere shadow (not a flat grey sticker).
1024 {
1024 {
1025 vec2 logoUV = 0.5 + q * 0.46; // centered on the marble face; fits inside the disk
1025 // Larger scale => smaller on-marble mark; y offset lowers it so top dots stay inside.
1026 // q.y > 0 is marble bottom (Energise SVG y-down); subtracting logoUV.y moves the mark down.
1027 vec2 logoUV = 0.5 + q * 0.50 - vec2(0.0, 0.075);
1026 float logoMask = 0.0;
1028 float logoMask = 0.0;
1027 if (logoUV.x > 0.18 && logoUV.x < 0.82 && logoUV.y > 0.04 && logoUV.y < 0.98) {
1029 if (logoUV.x > 0.16 && logoUV.x < 0.84 && logoUV.y > 0.02 && logoUV.y < 0.99) {
1028 float aa = 2.5 / max(min(b.x, b.y), 1.0); // ~pixel AA in logo UV
1030 float aa = 2.5 / max(min(b.x, b.y), 1.0);
1029 logoMask = smoothstep(aa, -aa, logoSD(logoUV));
1031 logoMask = smoothstep(aa, -aa, logoSD(logoUV));
1030 }
1032 }
1031 vec3 logoCol = vec3(lit); // pure white * marble light → fades in shadow
1033 // Stronger than lit-only: mask itself shrinks in shadow so marble material shows through.
1032 col.rgb = mix(col.rgb, logoCol, e * logoMask);
1034 float logoAmt = e * logoMask * pow(clamp(lit / 0.92, 0.0, 1.0), 2.4);
1035 vec3 logoCol = vec3(1.0) * lit;
1036 col.rgb = mix(col.rgb, logoCol, logoAmt);
1033 }
1037 }
1034 col.rgb = mix(col.rgb, vec3(1.0), e * spot); // opaque, strong shine
1038 col.rgb = mix(col.rgb, vec3(1.0), e * spot); // opaque, strong shine
1035 col.rgb = min(col.rgb, vec3(1.0));
1039 col.rgb = min(col.rgb, vec3(1.0));