epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Determine pixel-to-texel ratio for each sprite individually.

Browse Source 
This fixes rendering artifacts when sprites are scaled > 1.
This commit is contained in:
Paul Chote
2024-10-29 21:50:47 +00:00
committed by Gustas
parent 42989c74aa
commit 09063d23da
4 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenRA.Game/Graphics/SpriteRenderer.cs
View File

@@ -253,9 +253,9 @@ namespace OpenRA.Graphics
shader.SetVec("DepthPreviewParams", contrast, offset); shader.SetVec("DepthPreviewParams", contrast, offset);
} }
public void SetAntialiasingPixelsPerTexel(float pxPerTx) public void EnablePixelArtScaling(bool enabled)
{ {
shader.SetVec("AntialiasPixelsPerTexel", pxPerTx); shader.SetBool("EnablePixelArtScaling", enabled);
} }
} }
} }

8
OpenRA.Game/Renderer.cs
View File

@@ -294,10 +294,10 @@ namespace OpenRA
(int)(-screenSprite.Bounds.Height / scale) / worldSprite.Size.Y, (int)(-screenSprite.Bounds.Height / scale) / worldSprite.Size.Y,
1f); 1f);
SpriteRenderer.SetAntialiasingPixelsPerTexel(Window.SurfaceSize.Height * 1f / worldSprite.Bounds.Height); SpriteRenderer.EnablePixelArtScaling(true);
RgbaSpriteRenderer.DrawSprite(worldSprite, float3.Zero, bufferScale); RgbaSpriteRenderer.DrawSprite(worldSprite, float3.Zero, bufferScale);
Flush(); Flush();
SpriteRenderer.SetAntialiasingPixelsPerTexel(0); SpriteRenderer.EnablePixelArtScaling(false);
} }
else else
{ {
@@ -499,7 +499,7 @@ namespace OpenRA
throw new InvalidOperationException($"EndFrame called with renderType = {renderType}, expected RenderType.UI."); throw new InvalidOperationException($"EndFrame called with renderType = {renderType}, expected RenderType.UI.");
Flush(); Flush();
SpriteRenderer.SetAntialiasingPixelsPerTexel(Window.EffectiveWindowScale); SpriteRenderer.EnablePixelArtScaling(true);
} }
public void DisableAntialiasingFilter() public void DisableAntialiasingFilter()
@@ -508,7 +508,7 @@ namespace OpenRA
throw new InvalidOperationException($"EndFrame called with renderType = {renderType}, expected RenderType.UI."); throw new InvalidOperationException($"EndFrame called with renderType = {renderType}, expected RenderType.UI.");
Flush(); Flush();
SpriteRenderer.SetAntialiasingPixelsPerTexel(0); SpriteRenderer.EnablePixelArtScaling(false);
} }
public void GrabWindowMouseFocus() public void GrabWindowMouseFocus()

5
OpenRA.Platforms.Default/OpenGL.cs
View File

@@ -674,9 +674,10 @@ namespace OpenRA.Platforms.Default
break; break;
} }
// Core features are defined as the shared feature set of GL 3.2 and (GLES 3 + BGRA extension) // Core features are defined as the shared feature set of GL 3.2 and (GLES 3 + derivatives, BGRA extensions)
var hasBGRA = SDL.SDL_GL_ExtensionSupported("GL_EXT_texture_format_BGRA8888") == SDL.SDL_bool.SDL_TRUE; var hasBGRA = SDL.SDL_GL_ExtensionSupported("GL_EXT_texture_format_BGRA8888") == SDL.SDL_bool.SDL_TRUE;
if (Version.Contains(" ES") && hasBGRA && major >= 3) var hasDerivatives = SDL.SDL_GL_ExtensionSupported("GL_OES_standard_derivatives") == SDL.SDL_bool.SDL_TRUE;
if (Version.Contains(" ES") && hasBGRA && hasDerivatives && major >= 3)
{ {
hasValidConfiguration = true; hasValidConfiguration = true;
Profile = GLProfile.Embedded; Profile = GLProfile.Embedded;

12
glsl/combined.frag
View File

@@ -17,7 +17,7 @@ uniform sampler2D ColorShifts;
uniform bool EnableDepthPreview; uniform bool EnableDepthPreview;
uniform vec2 DepthPreviewParams; uniform vec2 DepthPreviewParams;
uniform float DepthTextureScale; uniform float DepthTextureScale;
uniform float AntialiasPixelsPerTexel; uniform bool EnablePixelArtScaling;
in vec4 vTexCoord; in vec4 vTexCoord;
flat in float vTexPalette; flat in float vTexPalette;
@@ -158,24 +158,26 @@ void main()
bool isColor = vChannelType == 0u; bool isColor = vChannelType == 0u;
vec4 c; vec4 c;
if (AntialiasPixelsPerTexel > 0.0) if (EnablePixelArtScaling)
{ {
vec2 textureSize = vec2(Size(vChannelSampler)); vec2 textureSize = vec2(Size(vChannelSampler));
vec2 offset = fract(coords.st * textureSize); vec2 vUv = coords.st * textureSize;
vec2 offset = fract(vUv);
vec2 pixelsPerTexel = vec2(1.0 / dFdx(vUv.x), 1.0 / dFdy(vUv.y));
// Offset the sampling point to simulate bilinear intepolation in window coordinates instead of texture coordinates // Offset the sampling point to simulate bilinear intepolation in window coordinates instead of texture coordinates
// https://csantosbh.wordpress.com/2014/01/25/manual-texture-filtering-for-pixelated-games-in-webgl/ // https://csantosbh.wordpress.com/2014/01/25/manual-texture-filtering-for-pixelated-games-in-webgl/
// https://csantosbh.wordpress.com/2014/02/05/automatically-detecting-the-texture-filter-threshold-for-pixelated-magnifications/ // https://csantosbh.wordpress.com/2014/02/05/automatically-detecting-the-texture-filter-threshold-for-pixelated-magnifications/
// ik is defined as 1/k from the articles, set to 1/0.7 because it looks good // ik is defined as 1/k from the articles, set to 1/0.7 because it looks good
float ik = 1.43; float ik = 1.43;
vec2 interp = clamp(offset * ik * AntialiasPixelsPerTexel, 0.0, .5) + clamp((offset - 1.0) * ik * AntialiasPixelsPerTexel + .5, 0.0, .5); vec2 interp = clamp(offset * ik * pixelsPerTexel, 0.0, .5) + clamp((offset - 1.0) * ik * pixelsPerTexel + .5, 0.0, .5);
coords = (floor(coords.st * textureSize) + interp) / textureSize; coords = (floor(coords.st * textureSize) + interp) / textureSize;
if (isPaletted) if (isPaletted)
c = SamplePalettedBilinear(vChannelSampler, coords, textureSize); c = SamplePalettedBilinear(vChannelSampler, coords, textureSize);
} }
if (!(AntialiasPixelsPerTexel > 0.0 && isPaletted)) if (!(EnablePixelArtScaling && isPaletted))
{ {
vec4 x = Sample(vChannelSampler, coords); vec4 x = Sample(vChannelSampler, coords);
vec2 p = vec2(dot(x, vChannelMask), vTexPalette); vec2 p = vec2(dot(x, vChannelMask), vTexPalette);