lainns-mirror/noctalia-shell
1
0
Fork 0
mirror of https://github.com/noctalia-dev/noctalia-shell.git synced 2026-05-11 17:08:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Wallpaper: new repeat mode for patterns

Browse Source
This commit is contained in:
Lemmy
2026-01-18 00:25:05 -05:00
parent 2735a335f5
commit c8f1cbb79e
24 changed files with 96 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Shaders/frag/wp_disc.frag
+19 -7
View File
@@ -17,7 +17,7 @@ layout(std140, binding = 0) uniform buf {
float aspectRatio; // Width / Height of the screen
// Fill mode parameters
float fillMode; // 0=no(center), 1=crop(fill), 2=fit(contain), 3=stretch
float fillMode; // 0=center, 1=crop, 2=fit, 3=stretch, 4=repeat
float imageWidth1; // Width of source1 image
float imageHeight1; // Height of source1 image
float imageWidth2; // Width of source2 image
@@ -38,7 +38,7 @@ vec2 calculateUV(vec2 uv, float imgWidth, float imgHeight) {
float imageAspect = imgWidth / imgHeight;
float screenAspect = ubuf.screenWidth / ubuf.screenHeight;
vec2 transformedUV = uv;
if (ubuf.fillMode < 0.5) {
// Mode 0: no (center) - No resize, center image at original size
// Convert UV to pixel coordinates, offset, then back to UV in image space
@@ -46,7 +46,7 @@ vec2 calculateUV(vec2 uv, float imgWidth, float imgHeight) {
vec2 imageOffset = (vec2(ubuf.screenWidth, ubuf.screenHeight) - vec2(imgWidth, imgHeight)) * 0.5;
vec2 imagePixel = screenPixel - imageOffset;
transformedUV = imagePixel / vec2(imgWidth, imgHeight);
}
}
else if (ubuf.fillMode < 1.5) {
// Mode 1: crop (fill/cover) - Fill screen, crop excess (default)
float scale = max(ubuf.screenWidth / imgWidth, ubuf.screenHeight / imgHeight);
@@ -59,7 +59,7 @@ vec2 calculateUV(vec2 uv, float imgWidth, float imgHeight) {
float scale = min(ubuf.screenWidth / imgWidth, ubuf.screenHeight / imgHeight);
vec2 scaledImageSize = vec2(imgWidth, imgHeight) * scale;
vec2 offset = (vec2(ubuf.screenWidth, ubuf.screenHeight) - scaledImageSize) * 0.5;
// Convert screen UV to pixel coordinates
vec2 screenPixel = uv * vec2(ubuf.screenWidth, ubuf.screenHeight);
// Adjust for offset and scale
@@ -67,9 +67,16 @@ vec2 calculateUV(vec2 uv, float imgWidth, float imgHeight) {
// Convert back to UV coordinates in image space
transformedUV = imagePixel / vec2(imgWidth, imgHeight);
}
// Mode 3: stretch - Use original UV (stretches to fit)
// No transformation needed for stretch mode
else if (ubuf.fillMode < 3.5) {
// Mode 3: stretch - Use original UV (stretches to fit)
// No transformation needed for stretch mode
}
else {
// Mode 4: repeat (tile) - Tile image at original size
vec2 screenPixel = uv * vec2(ubuf.screenWidth, ubuf.screenHeight);
transformedUV = screenPixel / vec2(imgWidth, imgHeight);
}
return transformedUV;
}
@@ -83,6 +90,11 @@ vec4 sampleWithFillMode(sampler2D tex, vec2 uv, float imgWidth, float imgHeight,
vec2 transformedUV = calculateUV(uv, imgWidth, imgHeight);
// Mode 4 (repeat): use fract() to tile the image
if (ubuf.fillMode > 3.5) {
return texture(tex, fract(transformedUV));
}
// Check if UV is out of bounds
if (transformedUV.x < 0.0 || transformedUV.x > 1.0 ||
transformedUV.y < 0.0 || transformedUV.y > 1.0) {
Shaders/frag/wp_fade.frag
+19 -7
View File
@@ -13,7 +13,7 @@ layout(std140, binding = 0) uniform buf {
float progress;
// Fill mode parameters
float fillMode; // 0=no(center), 1=crop(fill), 2=fit(contain), 3=stretch
float fillMode; // 0=center, 1=crop, 2=fit, 3=stretch, 4=repeat
float imageWidth1; // Width of source1 image
float imageHeight1; // Height of source1 image
float imageWidth2; // Width of source2 image
@@ -34,7 +34,7 @@ vec2 calculateUV(vec2 uv, float imgWidth, float imgHeight) {
float imageAspect = imgWidth / imgHeight;
float screenAspect = ubuf.screenWidth / ubuf.screenHeight;
vec2 transformedUV = uv;
if (ubuf.fillMode < 0.5) {
// Mode 0: no (center) - No resize, center image at original size
// Convert UV to pixel coordinates, offset, then back to UV in image space
@@ -42,7 +42,7 @@ vec2 calculateUV(vec2 uv, float imgWidth, float imgHeight) {
vec2 imageOffset = (vec2(ubuf.screenWidth, ubuf.screenHeight) - vec2(imgWidth, imgHeight)) * 0.5;
vec2 imagePixel = screenPixel - imageOffset;
transformedUV = imagePixel / vec2(imgWidth, imgHeight);
}
}
else if (ubuf.fillMode < 1.5) {
// Mode 1: crop (fill/cover) - Fill screen, crop excess (default)
float scale = max(ubuf.screenWidth / imgWidth, ubuf.screenHeight / imgHeight);
@@ -55,7 +55,7 @@ vec2 calculateUV(vec2 uv, float imgWidth, float imgHeight) {
float scale = min(ubuf.screenWidth / imgWidth, ubuf.screenHeight / imgHeight);
vec2 scaledImageSize = vec2(imgWidth, imgHeight) * scale;
vec2 offset = (vec2(ubuf.screenWidth, ubuf.screenHeight) - scaledImageSize) * 0.5;
// Convert screen UV to pixel coordinates
vec2 screenPixel = uv * vec2(ubuf.screenWidth, ubuf.screenHeight);
// Adjust for offset and scale
@@ -63,9 +63,16 @@ vec2 calculateUV(vec2 uv, float imgWidth, float imgHeight) {
// Convert back to UV coordinates in image space
transformedUV = imagePixel / vec2(imgWidth, imgHeight);
}
// Mode 3: stretch - Use original UV (stretches to fit)
// No transformation needed for stretch mode
else if (ubuf.fillMode < 3.5) {
// Mode 3: stretch - Use original UV (stretches to fit)
// No transformation needed for stretch mode
}
else {
// Mode 4: repeat (tile) - Tile image at original size
vec2 screenPixel = uv * vec2(ubuf.screenWidth, ubuf.screenHeight);
transformedUV = screenPixel / vec2(imgWidth, imgHeight);
}
return transformedUV;
}
@@ -79,6 +86,11 @@ vec4 sampleWithFillMode(sampler2D tex, vec2 uv, float imgWidth, float imgHeight,
vec2 transformedUV = calculateUV(uv, imgWidth, imgHeight);
// Mode 4 (repeat): use fract() to tile the image
if (ubuf.fillMode > 3.5) {
return texture(tex, fract(transformedUV));
}
// Check if UV is out of bounds
if (transformedUV.x < 0.0 || transformedUV.x > 1.0 ||
transformedUV.y < 0.0 || transformedUV.y > 1.0) {
Shaders/frag/wp_stripes.frag
+19 -7
View File
@@ -17,7 +17,7 @@ layout(std140, binding = 0) uniform buf {
float aspectRatio; // Width / Height of the screen
// Fill mode parameters
float fillMode; // 0=no(center), 1=crop(fill), 2=fit(contain), 3=stretch
float fillMode; // 0=center, 1=crop, 2=fit, 3=stretch, 4=repeat
float imageWidth1; // Width of source1 image
float imageHeight1; // Height of source1 image
float imageWidth2; // Width of source2 image
@@ -38,7 +38,7 @@ vec2 calculateUV(vec2 uv, float imgWidth, float imgHeight) {
float imageAspect = imgWidth / imgHeight;
float screenAspect = ubuf.screenWidth / ubuf.screenHeight;
vec2 transformedUV = uv;
if (ubuf.fillMode < 0.5) {
// Mode 0: no (center) - No resize, center image at original size
// Convert UV to pixel coordinates, offset, then back to UV in image space
@@ -46,7 +46,7 @@ vec2 calculateUV(vec2 uv, float imgWidth, float imgHeight) {
vec2 imageOffset = (vec2(ubuf.screenWidth, ubuf.screenHeight) - vec2(imgWidth, imgHeight)) * 0.5;
vec2 imagePixel = screenPixel - imageOffset;
transformedUV = imagePixel / vec2(imgWidth, imgHeight);
}
}
else if (ubuf.fillMode < 1.5) {
// Mode 1: crop (fill/cover) - Fill screen, crop excess (default)
float scale = max(ubuf.screenWidth / imgWidth, ubuf.screenHeight / imgHeight);
@@ -59,7 +59,7 @@ vec2 calculateUV(vec2 uv, float imgWidth, float imgHeight) {
float scale = min(ubuf.screenWidth / imgWidth, ubuf.screenHeight / imgHeight);
vec2 scaledImageSize = vec2(imgWidth, imgHeight) * scale;
vec2 offset = (vec2(ubuf.screenWidth, ubuf.screenHeight) - scaledImageSize) * 0.5;
// Convert screen UV to pixel coordinates
vec2 screenPixel = uv * vec2(ubuf.screenWidth, ubuf.screenHeight);
// Adjust for offset and scale
@@ -67,9 +67,16 @@ vec2 calculateUV(vec2 uv, float imgWidth, float imgHeight) {
// Convert back to UV coordinates in image space
transformedUV = imagePixel / vec2(imgWidth, imgHeight);
}
// Mode 3: stretch - Use original UV (stretches to fit)
// No transformation needed for stretch mode
else if (ubuf.fillMode < 3.5) {
// Mode 3: stretch - Use original UV (stretches to fit)
// No transformation needed for stretch mode
}
else {
// Mode 4: repeat (tile) - Tile image at original size
vec2 screenPixel = uv * vec2(ubuf.screenWidth, ubuf.screenHeight);
transformedUV = screenPixel / vec2(imgWidth, imgHeight);
}
return transformedUV;
}
@@ -83,6 +90,11 @@ vec4 sampleWithFillMode(sampler2D tex, vec2 uv, float imgWidth, float imgHeight,
vec2 transformedUV = calculateUV(uv, imgWidth, imgHeight);
// Mode 4 (repeat): use fract() to tile the image
if (ubuf.fillMode > 3.5) {
return texture(tex, fract(transformedUV));
}
// Check if UV is out of bounds
if (transformedUV.x < 0.0 || transformedUV.x > 1.0 ||
transformedUV.y < 0.0 || transformedUV.y > 1.0) {
Shaders/frag/wp_wipe.frag
+19 -7
View File
@@ -15,7 +15,7 @@ layout(std140, binding = 0) uniform buf {
float smoothness; // Edge smoothness (0.0 to 1.0, 0=sharp, 1=very smooth)
// Fill mode parameters
float fillMode; // 0=no(center), 1=crop(fill), 2=fit(contain), 3=stretch
float fillMode; // 0=center, 1=crop, 2=fit, 3=stretch, 4=repeat
float imageWidth1; // Width of source1 image
float imageHeight1; // Height of source1 image
float imageWidth2; // Width of source2 image
@@ -36,7 +36,7 @@ vec2 calculateUV(vec2 uv, float imgWidth, float imgHeight) {
float imageAspect = imgWidth / imgHeight;
float screenAspect = ubuf.screenWidth / ubuf.screenHeight;
vec2 transformedUV = uv;
if (ubuf.fillMode < 0.5) {
// Mode 0: no (center) - No resize, center image at original size
// Convert UV to pixel coordinates, offset, then back to UV in image space
@@ -44,7 +44,7 @@ vec2 calculateUV(vec2 uv, float imgWidth, float imgHeight) {
vec2 imageOffset = (vec2(ubuf.screenWidth, ubuf.screenHeight) - vec2(imgWidth, imgHeight)) * 0.5;
vec2 imagePixel = screenPixel - imageOffset;
transformedUV = imagePixel / vec2(imgWidth, imgHeight);
}
}
else if (ubuf.fillMode < 1.5) {
// Mode 1: crop (fill/cover) - Fill screen, crop excess (default)
float scale = max(ubuf.screenWidth / imgWidth, ubuf.screenHeight / imgHeight);
@@ -57,7 +57,7 @@ vec2 calculateUV(vec2 uv, float imgWidth, float imgHeight) {
float scale = min(ubuf.screenWidth / imgWidth, ubuf.screenHeight / imgHeight);
vec2 scaledImageSize = vec2(imgWidth, imgHeight) * scale;
vec2 offset = (vec2(ubuf.screenWidth, ubuf.screenHeight) - scaledImageSize) * 0.5;
// Convert screen UV to pixel coordinates
vec2 screenPixel = uv * vec2(ubuf.screenWidth, ubuf.screenHeight);
// Adjust for offset and scale
@@ -65,9 +65,16 @@ vec2 calculateUV(vec2 uv, float imgWidth, float imgHeight) {
// Convert back to UV coordinates in image space
transformedUV = imagePixel / vec2(imgWidth, imgHeight);
}
// Mode 3: stretch - Use original UV (stretches to fit)
// No transformation needed for stretch mode
else if (ubuf.fillMode < 3.5) {
// Mode 3: stretch - Use original UV (stretches to fit)
// No transformation needed for stretch mode
}
else {
// Mode 4: repeat (tile) - Tile image at original size
vec2 screenPixel = uv * vec2(ubuf.screenWidth, ubuf.screenHeight);
transformedUV = screenPixel / vec2(imgWidth, imgHeight);
}
return transformedUV;
}
@@ -81,6 +88,11 @@ vec4 sampleWithFillMode(sampler2D tex, vec2 uv, float imgWidth, float imgHeight,
vec2 transformedUV = calculateUV(uv, imgWidth, imgHeight);
// Mode 4 (repeat): use fract() to tile the image
if (ubuf.fillMode > 3.5) {
return texture(tex, fract(transformedUV));
}
// Check if UV is out of bounds
if (transformedUV.x < 0.0 || transformedUV.x > 1.0 ||
transformedUV.y < 0.0 || transformedUV.y > 1.0) {
Shaders/qsb/wp_disc.frag.qsb
BIN
View File
Binary file not shown.
Shaders/qsb/wp_fade.frag.qsb
BIN
View File
Binary file not shown.
Shaders/qsb/wp_stripes.frag.qsb
BIN
View File
Binary file not shown.
Shaders/qsb/wp_wipe.frag.qsb
BIN
View File
Binary file not shown.