Test that relit columns keep every mesh current
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
@@ -2,20 +2,23 @@
|
||||
//! load with their light, past the render distance, used to drop their
|
||||
//! sections' mesh requests there, and nothing asked again once the player
|
||||
//! came closer, so they stayed invisible until a block in them changed.
|
||||
//! Relit columns remesh only where their light changed (#270), and every
|
||||
//! mesh still matches the world.
|
||||
use horizon_client::{
|
||||
assets::Assets,
|
||||
biome::Biomes,
|
||||
blocks::BlockFacts,
|
||||
chunk::{Chunk, HEIGHT},
|
||||
light::LightTables,
|
||||
mesher::MeshTables,
|
||||
mesher::{MeshTables, Mesher, Region, SectionMesh, borrow},
|
||||
models,
|
||||
streaming::{ChunkGenerator, Proto, Streaming, WorkerContext},
|
||||
world::World,
|
||||
};
|
||||
use horizon_core::biome::BiomeZoom;
|
||||
use horizon_world::registry::BlockStateId;
|
||||
use std::{
|
||||
collections::HashSet,
|
||||
collections::{HashMap, HashSet},
|
||||
path::Path,
|
||||
sync::Arc,
|
||||
thread,
|
||||
@@ -100,3 +103,135 @@ fn columns_loaded_past_the_render_distance_mesh_when_they_come_in_range() {
|
||||
}
|
||||
assert_eq!(checked, 49);
|
||||
}
|
||||
|
||||
/// A one-block cave under the sky: a stone floor at y 62 with a glowstone,
|
||||
/// and a roof at y 64 with holes, so that every light change in the cave is
|
||||
/// sampled by a face.
|
||||
fn roofed(x: i32, z: i32, stone: u16, glowstone: u16) -> Chunk {
|
||||
let mut chunk = Chunk::empty(x, z);
|
||||
for lz in 0..16 {
|
||||
for lx in 0..16 {
|
||||
chunk.set(lx, 62, lz, stone);
|
||||
if (lx + 3 * lz + x * 5 + z * 7).rem_euclid(11) != 0 {
|
||||
chunk.set(lx, 64, lz, stone);
|
||||
}
|
||||
}
|
||||
}
|
||||
chunk.set(
|
||||
(x * 3).rem_euclid(16),
|
||||
62,
|
||||
(z * 5).rem_euclid(16),
|
||||
glowstone,
|
||||
);
|
||||
chunk
|
||||
}
|
||||
|
||||
/// A column that changes next to lit ones relights them, and remeshes only
|
||||
/// where their light changed (#270): every mesh still matches the world,
|
||||
/// before and after the missing column arrives.
|
||||
#[test]
|
||||
fn relit_columns_keep_every_mesh_current() {
|
||||
let Some(root) = resources() else {
|
||||
return;
|
||||
};
|
||||
let assets = Arc::new(Assets::load(&root).unwrap());
|
||||
let facts = BlockFacts::load(&root, assets.registry).unwrap();
|
||||
let visibility = models::load_visibility(&root, assets.registry).unwrap();
|
||||
let context = Arc::new(WorkerContext {
|
||||
tables: Arc::new(MeshTables::new(&assets, &facts, visibility).unwrap()),
|
||||
light: Arc::new(LightTables::load(&root, assets.registry, &facts).unwrap()),
|
||||
biomes: Arc::new(Biomes::load(&root).unwrap()),
|
||||
assets: assets.clone(),
|
||||
});
|
||||
let state = |name: &str| assets.registry.default_state(name).unwrap().0 as u16;
|
||||
let (stone, glowstone, torch) = (
|
||||
state("minecraft:stone"),
|
||||
state("minecraft:glowstone"),
|
||||
state("minecraft:torch"),
|
||||
);
|
||||
// Columns from a server, one of them never sent: its neighbours stay
|
||||
// unlit, next to lit columns within the render distance.
|
||||
let mut streaming = Streaming::new(Arc::new(Saved), context.clone(), 3);
|
||||
streaming.radius = 4;
|
||||
streaming.remote = true;
|
||||
let mut world = World::new(BlockStateId(0), 0);
|
||||
for x in -5..=5 {
|
||||
for z in -5..=5 {
|
||||
if (x, z) != (2, 0) {
|
||||
streaming.insert_remote(&mut world, roofed(x, z, stone, glowstone));
|
||||
}
|
||||
}
|
||||
}
|
||||
let mut meshes: HashMap<(i32, i32, i32), SectionMesh> = HashMap::new();
|
||||
let mut settle = |streaming: &mut Streaming, world: &mut World| {
|
||||
let deadline = Instant::now() + Duration::from_secs(60);
|
||||
let mut quiet = 0;
|
||||
while quiet < 40 {
|
||||
assert!(Instant::now() < deadline, "streaming never settled");
|
||||
let (uploads, _) = streaming.update(world);
|
||||
let idle = uploads.is_empty() && streaming.pending() == 0;
|
||||
meshes.extend(uploads);
|
||||
thread::sleep(Duration::from_millis(5));
|
||||
quiet = if idle { quiet + 1 } else { 0 };
|
||||
}
|
||||
};
|
||||
settle(&mut streaming, &mut world);
|
||||
assert!(!streaming.is_lit(1, 0) && streaming.is_lit(0, 0));
|
||||
// Open the roof and put torches in the cave on a ring two blocks inside
|
||||
// the unlit (1, 0): its lit neighbours are relit, and their meshes change
|
||||
// only through light (no edit is next to them).
|
||||
for i in 2..14 {
|
||||
for (lx, lz) in [(i, 2), (i, 13), (2, i), (13, i)] {
|
||||
let (bx, bz) = (16 + lx, lz);
|
||||
world.set(bx, 64, bz, BlockStateId(0)).unwrap();
|
||||
if i % 3 == 0 {
|
||||
world
|
||||
.set(bx, 63, bz, BlockStateId(u32::from(torch)))
|
||||
.unwrap();
|
||||
}
|
||||
}
|
||||
}
|
||||
settle(&mut streaming, &mut world);
|
||||
streaming.insert_remote(&mut world, roofed(2, 0, stone, glowstone));
|
||||
settle(&mut streaming, &mut world);
|
||||
let mut checked = 0;
|
||||
for (&(x, sy, z), mesh) in &meshes {
|
||||
let region: Region = std::array::from_fn(|dz| {
|
||||
std::array::from_fn(|dx| {
|
||||
world
|
||||
.chunks
|
||||
.get(&(x + dx as i32 - 1, z + dz as i32 - 1))
|
||||
.cloned()
|
||||
})
|
||||
});
|
||||
let mut mesher = Mesher {
|
||||
nether_shading: false,
|
||||
zoom: BiomeZoom::new(0),
|
||||
blend_radius: 2,
|
||||
smooth_lighting: true,
|
||||
cutout_leaves: true,
|
||||
assets: &context.assets,
|
||||
tables: &context.tables,
|
||||
biomes: &context.biomes,
|
||||
visibility: context.tables.visibility.clone(),
|
||||
};
|
||||
let fresh = mesher.mesh(&borrow(®ion), sy);
|
||||
let bytes = |m: &SectionMesh| {
|
||||
[
|
||||
bytemuck::cast_slice::<_, u8>(&m.solid).to_vec(),
|
||||
bytemuck::cast_slice::<_, u8>(&m.translucent).to_vec(),
|
||||
]
|
||||
};
|
||||
assert!(
|
||||
bytes(mesh) == bytes(&fresh) && mesh.visibility == fresh.visibility,
|
||||
"section {x} {sy} {z} kept a stale mesh"
|
||||
);
|
||||
checked += 1;
|
||||
}
|
||||
assert!(checked >= 45 * 24, "only {checked} sections checked");
|
||||
for x in 0..=3 {
|
||||
for z in -1..=1 {
|
||||
assert!((0..24).all(|sy| meshes.contains_key(&(x, sy, z))));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user