fix(textures): palette-indexed surfaces + alpha cutout shader
Addresses the 'doors, windows, and alpha-keyed parts render bright pink' issue the user observed after the Phase 2a visual checkpoint. SurfaceDecoder gains a second overload taking an optional Palette parameter. When the render surface format is PFID_INDEX16 and a palette is supplied, each 16-bit value in SourceData is treated as an index into Palette.Colors (a List<ColorARGB>) and the corresponding ARGB color's channels are written to the output buffer. The original no-palette overload is preserved so the Task 3 unit tests that confirm INDEX16 -> magenta fallback still describe their behavior correctly (INDEX16 without a palette still returns magenta). TextureCache now resolves the RenderSurface's DefaultPaletteId via the dats and passes the resulting Palette (or null) to the decoder. mesh.frag adds an alpha cutout: fragments with sampled alpha < 0.5 are discarded. Without this, transparent regions of alpha-keyed textures (doors, windows, foliage cutouts) would render as opaque rectangles using the texture's background color. This is the standard alpha-tested approach, simpler than full alpha blending and matches how AC's original client rendered these surfaces. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
parent
4763b973da
commit
dc60405ebc
3 changed files with 51 additions and 3 deletions
|
|
@ -5,5 +5,10 @@ out vec4 fragColor;
|
||||||
uniform sampler2D uDiffuse;
|
uniform sampler2D uDiffuse;
|
||||||
|
|
||||||
void main() {
|
void main() {
|
||||||
fragColor = texture(uDiffuse, vTex);
|
vec4 sampled = texture(uDiffuse, vTex);
|
||||||
|
// Alpha cutout for doors, windows, vegetation, and other alpha-keyed textures.
|
||||||
|
// Without this, zero-alpha pixels in palette-indexed textures render as opaque
|
||||||
|
// rectangles where the transparent parts should be.
|
||||||
|
if (sampled.a < 0.5) discard;
|
||||||
|
fragColor = sampled;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -49,7 +49,14 @@ public sealed unsafe class TextureCache : IDisposable
|
||||||
if (rs is null)
|
if (rs is null)
|
||||||
return DecodedTexture.Magenta;
|
return DecodedTexture.Magenta;
|
||||||
|
|
||||||
return SurfaceDecoder.DecodeRenderSurface(rs);
|
// Palette lookup for indexed formats (doors, windows, alpha-keyed foliage).
|
||||||
|
// If DefaultPaletteId is 0 or unresolvable, SurfaceDecoder falls back to magenta
|
||||||
|
// for PFID_INDEX16 surfaces.
|
||||||
|
Palette? palette = rs.DefaultPaletteId != 0
|
||||||
|
? _dats.Get<Palette>(rs.DefaultPaletteId)
|
||||||
|
: null;
|
||||||
|
|
||||||
|
return SurfaceDecoder.DecodeRenderSurface(rs, palette);
|
||||||
}
|
}
|
||||||
|
|
||||||
private uint UploadRgba8(DecodedTexture decoded)
|
private uint UploadRgba8(DecodedTexture decoded)
|
||||||
|
|
|
||||||
|
|
@ -11,9 +11,19 @@ public static class SurfaceDecoder
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Decode a RenderSurface's pixel bytes into RGBA8. Returns <see cref="DecodedTexture.Magenta"/>
|
/// Decode a RenderSurface's pixel bytes into RGBA8. Returns <see cref="DecodedTexture.Magenta"/>
|
||||||
/// for unsupported formats, null data, or corrupt sizing.
|
/// for unsupported formats, null data, or corrupt sizing. This overload does NOT
|
||||||
|
/// support PFID_INDEX16 — use <see cref="DecodeRenderSurface(RenderSurface, Palette?)"/>
|
||||||
|
/// when a palette is available.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public static DecodedTexture DecodeRenderSurface(RenderSurface rs)
|
public static DecodedTexture DecodeRenderSurface(RenderSurface rs)
|
||||||
|
=> DecodeRenderSurface(rs, palette: null);
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Decode a RenderSurface's pixel bytes into RGBA8 with optional palette support.
|
||||||
|
/// When <paramref name="palette"/> is non-null and the format is PFID_INDEX16, each
|
||||||
|
/// 16-bit value in SourceData is treated as an index into <see cref="Palette.Colors"/>.
|
||||||
|
/// </summary>
|
||||||
|
public static DecodedTexture DecodeRenderSurface(RenderSurface rs, Palette? palette)
|
||||||
{
|
{
|
||||||
if (rs.SourceData is null || rs.Width <= 0 || rs.Height <= 0)
|
if (rs.SourceData is null || rs.Width <= 0 || rs.Height <= 0)
|
||||||
return DecodedTexture.Magenta;
|
return DecodedTexture.Magenta;
|
||||||
|
|
@ -26,6 +36,7 @@ public static class SurfaceDecoder
|
||||||
PixelFormat.PFID_DXT1 => DecodeBc(rs, CompressionFormat.Bc1),
|
PixelFormat.PFID_DXT1 => DecodeBc(rs, CompressionFormat.Bc1),
|
||||||
PixelFormat.PFID_DXT3 => DecodeBc(rs, CompressionFormat.Bc2),
|
PixelFormat.PFID_DXT3 => DecodeBc(rs, CompressionFormat.Bc2),
|
||||||
PixelFormat.PFID_DXT5 => DecodeBc(rs, CompressionFormat.Bc3),
|
PixelFormat.PFID_DXT5 => DecodeBc(rs, CompressionFormat.Bc3),
|
||||||
|
PixelFormat.PFID_INDEX16 when palette is not null => DecodeIndex16(rs, palette),
|
||||||
_ => DecodedTexture.Magenta,
|
_ => DecodedTexture.Magenta,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
@ -35,6 +46,31 @@ public static class SurfaceDecoder
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private static DecodedTexture DecodeIndex16(RenderSurface rs, Palette palette)
|
||||||
|
{
|
||||||
|
int expectedBytes = rs.Width * rs.Height * 2;
|
||||||
|
if (rs.SourceData.Length < expectedBytes || palette.Colors.Count == 0)
|
||||||
|
return DecodedTexture.Magenta;
|
||||||
|
|
||||||
|
var rgba = new byte[rs.Width * rs.Height * 4];
|
||||||
|
int paletteMax = palette.Colors.Count - 1;
|
||||||
|
for (int i = 0; i < rs.Width * rs.Height; i++)
|
||||||
|
{
|
||||||
|
// Read each 16-bit value little-endian as a palette index
|
||||||
|
int src = i * 2;
|
||||||
|
ushort idx = (ushort)(rs.SourceData[src] | (rs.SourceData[src + 1] << 8));
|
||||||
|
if (idx > paletteMax) idx = 0;
|
||||||
|
var c = palette.Colors[idx];
|
||||||
|
|
||||||
|
int dst = i * 4;
|
||||||
|
rgba[dst + 0] = c.Red;
|
||||||
|
rgba[dst + 1] = c.Green;
|
||||||
|
rgba[dst + 2] = c.Blue;
|
||||||
|
rgba[dst + 3] = c.Alpha;
|
||||||
|
}
|
||||||
|
return new DecodedTexture(rgba, rs.Width, rs.Height);
|
||||||
|
}
|
||||||
|
|
||||||
private static DecodedTexture DecodeA8R8G8B8(RenderSurface rs)
|
private static DecodedTexture DecodeA8R8G8B8(RenderSurface rs)
|
||||||
{
|
{
|
||||||
int expected = rs.Width * rs.Height * 4;
|
int expected = rs.Width * rs.Height * 4;
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue