Draw a quad over fully opaque texels without the alpha cutout
A dirt path's side faces skip the clear top row of their texture, but the cutout still ran on them: mip filtering blended that row into the top edge and dropped it. Vanilla bakes each quad's layer from the texels under its UVs, so these quads are solid.
This commit is contained in:
@@ -55,7 +55,7 @@ pub struct TerrainVertex {
|
||||
/// UV within the sprite, `UV_STEPS` per unit (`TerrainVertex::new`,
|
||||
/// `terrain.wgsl`'s `terrain_uv`).
|
||||
pub(crate) uv: [u16; 2],
|
||||
/// Sprite array layer, with `OPAQUE_LAYER` for opaque leaves.
|
||||
/// Sprite array layer, with `OPAQUE_LAYER` for opaque leaves and quads over opaque texels.
|
||||
pub layer: u16,
|
||||
/// Smooth light, 16x fixed point: sky in the low byte, block in the high one.
|
||||
pub light: u16,
|
||||
@@ -890,8 +890,9 @@ impl Mesher<'_> {
|
||||
target.push(TerrainVertex::new(
|
||||
[p[0] + origin[0], p[1] + origin[1], p[2] + origin[2]],
|
||||
q.uv[i],
|
||||
// Opaque leaves (forceOpaque) draw in the solid layer: no alpha cutout.
|
||||
if !self.cutout_leaves && state.leaves {
|
||||
// Opaque leaves (forceOpaque) and quads over opaque texels draw in the
|
||||
// solid layer: no alpha cutout (a dirt path's side skips its clear top row).
|
||||
if face.opaque && !face.translucent || !self.cutout_leaves && state.leaves {
|
||||
face.layer as u16 | OPAQUE_LAYER
|
||||
} else {
|
||||
face.layer as u16
|
||||
|
||||
@@ -28,6 +28,8 @@ use std::{
|
||||
pub struct BakedFace {
|
||||
pub quad: ModelQuad,
|
||||
pub layer: u32,
|
||||
/// The texels under the quad's UVs are all opaque (`SpriteContents.computeTransparency`):
|
||||
/// drawn in the solid layer without an alpha test.
|
||||
pub opaque: bool,
|
||||
/// Fractional alpha: drawn in the sorted translucent pass.
|
||||
pub translucent: bool,
|
||||
@@ -230,9 +232,9 @@ impl StateModels {
|
||||
Ok(BakedFace {
|
||||
translucent: quad.material.force_translucent
|
||||
|| sprites.translucent[layer as usize],
|
||||
opaque: sprites.region_opaque(layer, &quad.uv),
|
||||
quad,
|
||||
layer,
|
||||
opaque: sprites.opaque[layer as usize],
|
||||
})
|
||||
})
|
||||
.collect::<Result<_>>()?;
|
||||
|
||||
@@ -115,6 +115,29 @@ impl Sprites {
|
||||
pub fn count(&self) -> usize {
|
||||
self.native.len()
|
||||
}
|
||||
/// `SpriteContents.computeTransparency(u0, v0, u1, v1)` is NONE: every texel under
|
||||
/// the quad's UV box is fully opaque in every frame, so the quad needs no alpha test.
|
||||
pub fn region_opaque(&self, layer: u32, uv: &[[f32; 2]; 4]) -> bool {
|
||||
if self.opaque[layer as usize] {
|
||||
return true;
|
||||
}
|
||||
let (side, frames, _) = &self.native[layer as usize];
|
||||
let side = *side as usize;
|
||||
let range = |axis: usize| {
|
||||
let lo = uv.iter().map(|p| p[axis]).fold(f32::INFINITY, f32::min);
|
||||
let hi = uv.iter().map(|p| p[axis]).fold(f32::NEG_INFINITY, f32::max);
|
||||
let clamp = |v: f32| (v.max(0.0) as usize).min(side);
|
||||
clamp((lo * side as f32).floor())..clamp((hi * side as f32).ceil())
|
||||
};
|
||||
let (columns, rows) = (range(0), range(1));
|
||||
frames.iter().all(|frame| {
|
||||
rows.clone().all(|y| {
|
||||
columns
|
||||
.clone()
|
||||
.all(|x| frame[(y * side + x) * 4 + 3] == 255)
|
||||
})
|
||||
})
|
||||
}
|
||||
/// Lay every layer out at one size: the largest texture's (resource packs
|
||||
/// may ship 32x, 64x... textures, like vanilla's stitched atlas), rounded
|
||||
/// up to a power of two and limited to [`MAX_ARRAY_BYTES`]. Smaller
|
||||
|
||||
Reference in New Issue
Block a user