Make Pixelate a replacement for Mosaic

InventiveRhythm · Oct 28, 2024 · 2545359 · 2545359
1 parent b817644
commit 2545359
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 118 deletions.
diff --git a/fluXis.Game/Graphics/Shaders/Pixelate/PixelateContainer.cs b/fluXis.Game/Graphics/Shaders/Pixelate/PixelateContainer.cs
diff --git a/fluXis.Game/Graphics/Shaders/Pixelate/PixelateDrawNode.cs b/fluXis.Game/Graphics/Shaders/Pixelate/PixelateDrawNode.cs
diff --git a/fluXis.Game/Map/Structures/Events/ShaderEvent.cs b/fluXis.Game/Map/Structures/Events/ShaderEvent.cs
@@ -70,6 +70,5 @@ public enum ShaderType
     Vignette,
     Retro,
     HueShift,
-    Pixelate,
     Glitch
 }
diff --git a/fluXis.Game/Screens/Edit/Tabs/Design/DesignContainer.cs b/fluXis.Game/Screens/Edit/Tabs/Design/DesignContainer.cs
@@ -12,7 +12,6 @@
 using fluXis.Game.Graphics.Shaders.Retro;
 using fluXis.Game.Graphics.Shaders.Vignette;
 using fluXis.Game.Graphics.Shaders.HueShift;
-using fluXis.Game.Graphics.Shaders.Pixelate;
 using fluXis.Game.Graphics.Sprites;
 using fluXis.Game.Map.Structures.Events;
 using fluXis.Game.Screens.Edit.Tabs.Design.Effects;
@@ -112,7 +111,6 @@ private ShaderStackContainer createShaderStack()
                 ShaderType.Vignette => new VignetteContainer(),
                 ShaderType.Retro => new RetroContainer(),
                 ShaderType.HueShift => new HueShiftContainer(),
-                ShaderType.Pixelate => new PixelateContainer(),
                 ShaderType.Glitch => new GlitchContainer(),
                 _ => null
             };

diff --git a/fluXis.Game/Screens/Edit/Tabs/Design/Points/Entries/ShaderEntry.cs b/fluXis.Game/Screens/Edit/Tabs/Design/Points/Entries/ShaderEntry.cs
@@ -242,7 +242,6 @@ protected override IEnumerable<Drawable> CreateSettings()
             case ShaderType.Vignette:
             case ShaderType.Retro:
             case ShaderType.HueShift:
-            case ShaderType.Pixelate:
             default: // default shader settings
                 settings.AddRange(new Drawable[]
                 {

diff --git a/fluXis.Game/Screens/Gameplay/GameplayScreen.cs b/fluXis.Game/Screens/Gameplay/GameplayScreen.cs
@@ -21,7 +21,6 @@
 using fluXis.Game.Graphics.Shaders.Retro;
 using fluXis.Game.Graphics.Shaders.Vignette;
 using fluXis.Game.Graphics.Shaders.HueShift;
-using fluXis.Game.Graphics.Shaders.Pixelate;
 using fluXis.Game.Graphics.Shaders.Glitch;
 using fluXis.Game.Input;
 using fluXis.Game.Map;
@@ -333,7 +332,6 @@ private ShaderStackContainer buildShaders()
                 ShaderType.Vignette => new VignetteContainer(),
                 ShaderType.Retro => new RetroContainer(),
                 ShaderType.HueShift => new HueShiftContainer(),
-                ShaderType.Pixelate => new PixelateContainer(),
                 ShaderType.Glitch => new GlitchContainer(),
                 _ => null
             };

diff --git a/fluXis.Resources/Shaders/sh_Mosaic.fs b/fluXis.Resources/Shaders/sh_Mosaic.fs
@@ -1,7 +1,7 @@
-layout(std140, set = 0, binding = 0) uniform m_MosaicParameters
+layout(std140, set = 0, binding = 0) uniform m_PixelateParameters
 {
     vec2 g_TexSize;
-    float g_Strength; // 0 means no effect, 1 means 1x1 pixel blocks
+    float g_Strength;
 };
 
 layout(set = 1, binding = 0) uniform texture2D m_Texture;
@@ -11,7 +11,10 @@ layout(location = 0) out vec4 o_Colour;
 
 void main(void) {
     vec2 uv = gl_FragCoord.xy / g_TexSize;
-    float blockSize = g_TexSize.x * (1.0 - g_Strength);
-    vec2 blockPos = floor(uv * blockSize) / blockSize;
-    o_Colour = texture(sampler2D(m_Texture, m_Sampler), blockPos);
+
+    float pixelSizeFactor = mix(1.0, min(g_TexSize.x, g_TexSize.y), 1.0 - g_Strength);
+    vec2 pixelSize = vec2(pixelSizeFactor, pixelSizeFactor * (g_TexSize.y / g_TexSize.x));
+    vec2 pixelatedUV = (floor(uv * pixelSize) + 0.5) / pixelSize;
+
+    o_Colour = textureLod(sampler2D(m_Texture, m_Sampler), pixelatedUV, 0.0);
 }
diff --git a/fluXis.Resources/Shaders/sh_Pixelate.fs b/fluXis.Resources/Shaders/sh_Pixelate.fs