Render SDF sharp for the in-game UI

vE5li · Dec 17, 2024 · 080a5b6 · 080a5b6
1 parent 92d3c57
commit 080a5b6
Show file tree

Hide file tree

Showing 11 changed files with 9 additions and 6 deletions.
diff --git a/korangar/archive/data/texture/marker_entity.png b/korangar/archive/data/texture/marker_entity.png
diff --git a/korangar/archive/data/texture/marker_light.png b/korangar/archive/data/texture/marker_light.png
diff --git a/korangar/archive/data/texture/marker_object.png b/korangar/archive/data/texture/marker_object.png
diff --git a/korangar/archive/data/texture/marker_particle.png b/korangar/archive/data/texture/marker_particle.png
diff --git a/korangar/archive/data/texture/marker_shadow.png b/korangar/archive/data/texture/marker_shadow.png
diff --git a/korangar/archive/data/texture/marker_sound.png b/korangar/archive/data/texture/marker_sound.png
diff --git a/korangar/src/graphics/passes/interface/shader/rectangle.wgsl b/korangar/src/graphics/passes/interface/shader/rectangle.wgsl
@@ -90,7 +90,8 @@ fn fs_main(input: VertexOutput) -> @location(0) vec4<f32> {
         case 1u: {
             // SDF
             let pixel = textureSample(texture, linear_sampler, input.texture_coordinates);
-            color *= vec4(pixel.rgb, saturate((pixel.a - 0.5) * 2.0 / fwidth(pixel.a)));
+            let alpha = saturate((pixel.a - 0.5) * 2.0 / fwidth(pixel.a));
+            color *= vec4(pixel.rgb * alpha, alpha);
         }
         case 2u: {
             // Sprite (linear filtering)

diff --git a/korangar/src/graphics/passes/interface/shader/rectangle_bindless.wgsl b/korangar/src/graphics/passes/interface/shader/rectangle_bindless.wgsl
@@ -90,7 +90,8 @@ fn fs_main(input: VertexOutput) -> @location(0) vec4<f32> {
         case 1u: {
             // SDF
             let pixel = textureSample(textures[instance.texture_index], linear_sampler, input.texture_coordinates);
-            color *= vec4(pixel.rgb, saturate((pixel.a - 0.5) * 2.0 / fwidth(pixel.a)));
+            let alpha = saturate((pixel.a - 0.5) * 2.0 / fwidth(pixel.a));
+            color *= vec4(pixel.rgb * alpha, alpha);
         }
         case 2u: {
             // Sprite (linear filtering)

diff --git a/korangar/src/graphics/passes/postprocessing/shader/rectangle.wgsl b/korangar/src/graphics/passes/postprocessing/shader/rectangle.wgsl
@@ -46,7 +46,8 @@ fn fs_main(input: VertexOutput) -> @location(0) vec4<f32> {
         case 1u: {
             // SDF
             let pixel = textureSample(texture, linear_sampler, input.texture_coordinates);
-            return vec4(pixel.rgb, saturate((pixel.a - 0.5) * 2.0 / fwidth(pixel.a))) * instance.color;
+            let alpha = step(0.5, pixel.a);
+            return vec4(pixel.rgb * alpha, alpha) * instance.color;
         }
         case 2u: {
             // Sprite (linear filtering)

diff --git a/korangar/src/graphics/passes/postprocessing/shader/rectangle_bindless.wgsl b/korangar/src/graphics/passes/postprocessing/shader/rectangle_bindless.wgsl
@@ -46,7 +46,8 @@ fn fs_main(input: VertexOutput) -> @location(0) vec4<f32> {
         case 1u: {
             // SDF
             let pixel = textureSample(textures[instance.texture_index], linear_sampler, input.texture_coordinates);
-            return vec4(pixel.rgb, saturate((pixel.a - 0.5) * 2.0 / fwidth(pixel.a))) * instance.color;
+            let alpha = step(0.5, pixel.a);
+            return vec4(pixel.rgb * alpha, alpha) * instance.color;
         }
         case 2u: {
             // Sprite (linear filtering)

diff --git a/korangar/src/renderer/game_interface.rs b/korangar/src/renderer/game_interface.rs
@@ -266,13 +266,12 @@ impl MarkerRenderer for GameInterfaceRenderer {
                 MarkerIdentifier::Shadow(..) => (&self.shadow_marker_texture, Color::rgb_u8(170, 170, 170)),
             };
 
-            self.instructions.borrow_mut().push(RectangleInstruction::Sprite {
+            self.instructions.borrow_mut().push(RectangleInstruction::Sdf {
                 screen_position,
                 screen_size,
                 color,
                 texture_position: Vector2::new(0.0, 0.0),
                 texture_size: Vector2::new(1.0, 1.0),
-                linear_filtering: true,
                 texture: texture.clone(),
             });
         }