diff --git a/THIRD_PARTY_NOTICES.md b/THIRD_PARTY_NOTICES.md index 88d3197af..63a1f7da3 100644 --- a/THIRD_PARTY_NOTICES.md +++ b/THIRD_PARTY_NOTICES.md @@ -1,35 +1,5 @@ # Third-party notices -## CullLeaves - -The optional leaf and mangrove-root face-culling behavior is adapted from -[CullLeaves](https://github.com/TeamMidnightDust/CullLeaves) by MidnightDust. -Its MIT license is reproduced below. - -```text -MIT License - -Copyright (c) 2020 MidnightDust - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. -``` - ## wgpu-hal `third_party/wgpu-hal` is [wgpu-hal](https://github.com/gfx-rs/wgpu) 30.0.1 by the gfx-rs diff --git a/crates/horizon-client/examples/probe/section_mesh_fixture.rs b/crates/horizon-client/examples/probe/section_mesh_fixture.rs index 98a4fdc34..e212a5268 100644 --- a/crates/horizon-client/examples/probe/section_mesh_fixture.rs +++ b/crates/horizon-client/examples/probe/section_mesh_fixture.rs @@ -136,7 +136,6 @@ fn scene( blend_radius, smooth_lighting, cutout_leaves, - cull_leaves: false, }; let section_y = int(&row["section_y"])?; let started = Instant::now(); diff --git a/crates/horizon-client/src/game.rs b/crates/horizon-client/src/game.rs index bf8327cc1..c46b86032 100644 --- a/crates/horizon-client/src/game.rs +++ b/crates/horizon-client/src/game.rs @@ -9090,21 +9090,11 @@ impl Game<'_> { // Options.biomeBlendRadius, ambientOcclusion and cutoutLeaves: // LevelExtractor.allChanged when they change. let (s, st) = (&self.settings, &self.streaming); - let remesh = ( - s.biome_blend, - s.smooth_lighting, - s.cutout_leaves, - s.horizon.cull_leaves, - ) != ( - st.biome_blend, - st.smooth_lighting, - st.cutout_leaves, - st.cull_leaves, - ); + let remesh = (s.biome_blend, s.smooth_lighting, s.cutout_leaves) + != (st.biome_blend, st.smooth_lighting, st.cutout_leaves); self.streaming.biome_blend = self.settings.biome_blend; self.streaming.smooth_lighting = self.settings.smooth_lighting; self.streaming.cutout_leaves = self.settings.cutout_leaves; - self.streaming.cull_leaves = self.settings.horizon.cull_leaves; if remesh { self.all_sections_changed(); } diff --git a/crates/horizon-client/src/game/world_loading.rs b/crates/horizon-client/src/game/world_loading.rs index ecbee08a8..bd9ae7caa 100644 --- a/crates/horizon-client/src/game/world_loading.rs +++ b/crates/horizon-client/src/game/world_loading.rs @@ -245,7 +245,6 @@ pub(super) fn make_streaming( streaming.biome_blend = settings.biome_blend; streaming.smooth_lighting = settings.smooth_lighting; streaming.cutout_leaves = settings.cutout_leaves; - streaming.cull_leaves = settings.horizon.cull_leaves; streaming.biome_zoom = BiomeZoom::new(obfuscate_seed(seed)); streaming.sky_light = dim != Dim::Nether; streaming.nether_shading = dim == Dim::Nether; diff --git a/crates/horizon-client/src/graphics.rs b/crates/horizon-client/src/graphics.rs index 9eb79a477..3cf1402d2 100644 --- a/crates/horizon-client/src/graphics.rs +++ b/crates/horizon-client/src/graphics.rs @@ -227,8 +227,6 @@ pub struct Graphics { pub far_detail: FarDetail, /// Skip sections hidden behind closed ones (vanilla's occlusion graph). pub cave_culling: bool, - /// Hide shared leaf and mangrove-root faces, reducing foliage density. - pub cull_leaves: bool, /// Skip drawing entities hidden behind opaque terrain. pub entity_culling: bool, /// Meshed sections uploaded per frame; 0 uploads all that are ready. @@ -262,7 +260,6 @@ impl Default for Graphics { lod_distance: 0, far_detail: FarDetail::Full, cave_culling: true, - cull_leaves: false, entity_culling: false, chunk_updates: 0, upload_budget_kib: 0, @@ -308,7 +305,6 @@ impl Graphics { "lodDistance" => g.lod_distance = number(g.lod_distance).min(1024), "farDetail" => g.far_detail = FarDetail::parse(value), "caveCulling" => g.cave_culling = flag(g.cave_culling), - "cullLeaves" => g.cull_leaves = flag(g.cull_leaves), "entityCulling" => g.entity_culling = flag(g.entity_culling), "chunkUpdates" => g.chunk_updates = number(g.chunk_updates).min(512), "uploadBudgetKiB" => g.upload_budget_kib = number(g.upload_budget_kib).min(65536), @@ -343,12 +339,11 @@ impl Graphics { } pub fn serialize(&self) -> String { format!( - "preset:{}\nlodDistance:{}\nfarDetail:{}\ncaveCulling:{}\ncullLeaves:{}\nentityCulling:{}\nchunkUpdates:{}\nuploadBudgetKiB:{}\nsky:{}\nfog:{}\nweather:{}\nanimatedTextures:{}\npresentMode:{}\nframePacing:{}\nworkers:{}\noverlay:{}\nresolutionScale:{}\nfxaa:{}\nbatteryMode:{}\ngraphicsApi:{}\n", + "preset:{}\nlodDistance:{}\nfarDetail:{}\ncaveCulling:{}\nentityCulling:{}\nchunkUpdates:{}\nuploadBudgetKiB:{}\nsky:{}\nfog:{}\nweather:{}\nanimatedTextures:{}\npresentMode:{}\nframePacing:{}\nworkers:{}\noverlay:{}\nresolutionScale:{}\nfxaa:{}\nbatteryMode:{}\ngraphicsApi:{}\n", self.preset.name(), self.lod_distance, self.far_detail.name(), bool_text(self.cave_culling), - bool_text(self.cull_leaves), bool_text(self.entity_culling), self.chunk_updates, self.upload_budget_kib, @@ -448,7 +443,6 @@ mod tests { lod_distance: 256, far_detail: FarDetail::Reduced, cave_culling: false, - cull_leaves: true, entity_culling: true, chunk_updates: 12, upload_budget_kib: 4096, @@ -475,7 +469,7 @@ mod tests { Graphics::default() ); assert_eq!( - Graphics::parse("workers:abc\nsky:maybe\ncullLeaves:maybe\nentityCulling:maybe\n"), + Graphics::parse("workers:abc\nsky:maybe\ncullLeaves:true\nentityCulling:maybe\n"), Graphics::default() ); } diff --git a/crates/horizon-client/src/graphics_ui.rs b/crates/horizon-client/src/graphics_ui.rs index d9ea62c72..ba99f89a8 100644 --- a/crates/horizon-client/src/graphics_ui.rs +++ b/crates/horizon-client/src/graphics_ui.rs @@ -24,7 +24,6 @@ pub enum H { LodDistance, FarDetail, CaveCulling, - CullLeaves, EntityCulling, ChunkUpdates, UploadBudget, @@ -138,11 +137,6 @@ pub fn rows(level: Level) -> Vec { Saves, "Skips terrain hidden behind closed sections. Off costs a lot.", ), - h( - H::CullLeaves, - None, - "Hides shared leaf and mangrove root faces; foliage can look less dense.", - ), h( H::EntityCulling, None, @@ -343,7 +337,6 @@ impl H { }, H::FarDetail => labelled("Far Detail", g.far_detail.label()), H::CaveCulling => labelled("Cave Culling", on_off(g.cave_culling)), - H::CullLeaves => labelled("Cull Leaves", on_off(g.cull_leaves)), H::EntityCulling => labelled("Entity Culling", on_off(g.entity_culling)), H::ChunkUpdates => match g.chunk_updates { 0 => labelled("Chunk Updates", "Unlimited"), @@ -418,7 +411,6 @@ impl H { g.far_detail = step(&[FarDetail::Full, FarDetail::Reduced], g.far_detail, back) } H::CaveCulling => g.cave_culling = !g.cave_culling, - H::CullLeaves => g.cull_leaves = !g.cull_leaves, H::EntityCulling => g.entity_culling = !g.entity_culling, H::Sky => g.sky = !g.sky, H::Fog => g.fog = !g.fog, @@ -455,7 +447,6 @@ impl Item { let g = &s.horizon; Some(match self { Item::Horizon(H::CaveCulling) => g.cave_culling, - Item::Horizon(H::CullLeaves) => g.cull_leaves, Item::Horizon(H::EntityCulling) => g.entity_culling, Item::Horizon(H::Sky) => g.sky, Item::Horizon(H::Fog) => g.fog, @@ -1003,48 +994,6 @@ mod tests { assert_eq!(s.horizon.upload_budget_kib, 0); } - #[test] - fn cull_leaves_is_opt_in_and_toggles_from_advanced_graphics() { - let mut s = Settings::default(); - let item = Item::Horizon(H::CullLeaves); - assert_eq!(item.switch(&s), Some(false)); - assert_eq!(item.label(&s).plain(), "Cull Leaves: Off"); - for enabled in [false, true] { - s.horizon.cull_leaves = enabled; - for preset in Preset::ALL { - crate::graphics::apply_preset(preset, &mut s); - assert_eq!(s.horizon.cull_leaves, enabled); - } - } - - let mut ui = GraphicsUi::default(); - let size = (480.0, 4000.0); - let (widgets, _, _) = ui.layout(Level::Advanced, size.0, size.1); - let switch = widgets - .iter() - .find(|w| matches!(w.target, Target::Item(i) if i == item)) - .unwrap(); - let point = (switch.x + 1.0, switch.y + 1.0); - for enabled in [false, true] { - s.horizon.preset = Preset::Balanced; - assert_eq!( - ui.click( - Level::Advanced, - &mut s, - point, - size, - [854, 480], - false, - false - ), - vec![Action::ButtonClick, Action::Changed] - ); - assert_eq!(item.switch(&s), Some(enabled)); - assert_eq!(s.horizon.preset, Preset::Custom); - } - assert_eq!(item.label(&s).plain(), "Cull Leaves: On"); - } - #[test] fn entity_culling_is_opt_in_and_toggles_from_advanced_graphics() { let mut s = Settings::default(); diff --git a/crates/horizon-client/src/mesher.rs b/crates/horizon-client/src/mesher.rs index a9e9f6823..59140866a 100644 --- a/crates/horizon-client/src/mesher.rs +++ b/crates/horizon-client/src/mesher.rs @@ -230,8 +230,6 @@ fn visibility(pad: &Padded, info: &[Info]) -> u64 { result } #[cfg(test)] -mod leaf_culling_tests; -#[cfg(test)] mod particle_tests; #[cfg(test)] mod visibility_tests; @@ -277,7 +275,6 @@ struct Info { overlay: bool, /// `LeavesBlock`: with opaque leaves the faces between two leaf blocks are skipped. leaves: bool, - mangrove_roots: bool, blocks_flow: bool, ice: bool, sturdy: u8, @@ -440,7 +437,6 @@ impl MeshTables { legacy_solid: s.legacy_solid, overlay: s.has_class("HalfTransparentBlock") || s.has_class("LeavesBlock"), leaves: s.has_class("LeavesBlock"), - mangrove_roots: s.has_class("MangroveRootsBlock"), blocks_flow: assets.blocks_fluid_flow.contains(&*s.name), ice: s.has_class("IceBlock"), sturdy: s.sturdy_full, @@ -692,8 +688,6 @@ pub struct Mesher<'a> { pub smooth_lighting: bool, /// The `cutoutLeaves` option (fancy graphics); off makes leaves opaque. pub cutout_leaves: bool, - /// Cull shared leaf and mangrove-root faces, including transparent leaves. - pub cull_leaves: bool, } impl Mesher<'_> { /// `region[dz][dx]` are the chunks around the meshed column (centre 1,1). @@ -773,12 +767,9 @@ impl Mesher<'_> { let [dx, dy, dz] = d.normal(); let neighbor = pad.blocks[pi(x + dx, y + dy, z + dz)]; let other = &info[neighbor as usize]; - // Adapted from CullLeaves (MIT); see THIRD_PARTY_NOTICES.md. - let shared_foliage = (state.leaves - && other.leaves - && (!self.cutout_leaves || self.cull_leaves)) - || (self.cull_leaves && state.mangrove_roots && other.mangrove_roots); - visible[d as usize] = !shared_foliage + // LeavesBlock.skipRendering with opaque leaves. + let opaque_leaves = !self.cutout_leaves && state.leaves && other.leaves; + visible[d as usize] = !opaque_leaves && self .visibility .should_render_face( diff --git a/crates/horizon-client/src/mesher/leaf_culling_tests.rs b/crates/horizon-client/src/mesher/leaf_culling_tests.rs deleted file mode 100644 index 679b19090..000000000 --- a/crates/horizon-client/src/mesher/leaf_culling_tests.rs +++ /dev/null @@ -1,126 +0,0 @@ -use super::*; -use horizon_assets::model::Direction as ModelDirection; - -#[test] -fn leaf_culling_removes_only_internal_leaf_and_root_faces() { - let root = - std::path::Path::new(env!("CARGO_MANIFEST_DIR")).join("../../.local/horizon-client/26.3"); - if !root.join("horizon-resources.json").exists() { - return; - } - let assets = Assets::load(&root).unwrap(); - let render = assets.reload(&root).unwrap(); - let facts = BlockFacts::load(&root, assets.registry).unwrap(); - let visibility = crate::models::load_visibility(&root, assets.registry).unwrap(); - let tables = MeshTables::new(&assets, &render, &facts, visibility.clone()).unwrap(); - let biomes = Biomes::load(&root).unwrap(); - let state = |name| assets.registry.default_state(name).unwrap().0; - let oak = state("minecraft:oak_leaves"); - let birch = state("minecraft:birch_leaves"); - let roots = state("minecraft:mangrove_roots"); - let stone = state("minecraft:stone"); - let mesh = |blocks: &[([i32; 3], u32)], cull_leaves, cutout_leaves| { - let mut center = Chunk::empty(0, 0); - let mut east = Chunk::empty(1, 0); - for &([x, y, z], state) in blocks { - let chunk = if x < 16 { &mut center } else { &mut east }; - chunk.set(x, y, z, state); - } - let mut region = [[None; 3]; 3]; - region[1][1] = Some(¢er); - region[1][2] = Some(&east); - Mesher { - nether_shading: false, - assets: &assets, - render: &render, - tables: &tables, - biomes: &biomes, - visibility: visibility.clone(), - zoom: BiomeZoom::new(0), - blend_radius: 0, - smooth_lighting: false, - cutout_leaves, - cull_leaves, - } - .tesselate(®ion, (0 - MIN_Y) / 16) - .solid - }; - - // Native leaves can contain unculled interior geometry as well as their - // outer faces. Select the touching cull group from the actual baked model, - // preserving every other quad and its full vertex attributes. - let without_face = |at: [i32; 3], id, direction| { - let vertices = mesh(&[(at, id)], false, true); - let models = render - .model_catalog - .collect(BlockStateId(id), BlockPos::new(at[0], at[1], at[2])) - .unwrap(); - let faces: Vec<_> = models.iter().flat_map(|(_, model)| &model.faces).collect(); - assert_eq!(vertices.len(), faces.len() * 4); - let retained: Vec<_> = vertices - .as_chunks::<4>() - .0 - .iter() - .zip(faces) - .filter(|(_, face)| face.quad.cull != Some(direction)) - .flat_map(|(quad, _)| quad.iter().copied()) - .collect(); - assert!(retained.len() < vertices.len(), "fixture has a cull group"); - retained - }; - - // Same-species leaves, mixed leaves and roots hide only their touching - // model groups. Disabling the option restores the isolated models. - for (a, b) in [(oak, oak), (oak, birch), (roots, roots)] { - let blocks = [([7, 7, 7], a), ([8, 7, 7], b)]; - let off = mesh(&blocks, false, true); - let on = mesh(&blocks, true, true); - assert_eq!( - off.len(), - mesh(&[blocks[0]], false, true).len() + mesh(&[blocks[1]], false, true).len() - ); - let mut retained = without_face(blocks[0].0, a, ModelDirection::East); - retained.extend(without_face(blocks[1].0, b, ModelDirection::West)); - assert_eq!( - bytemuck::cast_slice::<_, u8>(&on), - bytemuck::cast_slice::<_, u8>(&retained) - ); - } - - // Roots do not join leaves into a single culling group. Ordinary opaque - // neighbors also keep their existing occlusion behavior. - for (a, b) in [(oak, roots), (roots, oak), (oak, stone)] { - let blocks = [([7, 7, 7], a), ([8, 7, 7], b)]; - let off = mesh(&blocks, false, true); - let on = mesh(&blocks, true, true); - assert_eq!( - bytemuck::cast_slice::<_, u8>(&on), - bytemuck::cast_slice::<_, u8>(&off) - ); - } - - // Opaque leaves already hide internal leaf faces independently of this - // option, and a leaf beside air retains its complete baked model. - let pair = [([7, 7, 7], oak), ([8, 7, 7], birch)]; - assert_eq!( - mesh(&pair, false, false).len(), - mesh(&pair, true, false).len() - ); - let isolated = [([7, 7, 7], oak)]; - assert_eq!( - bytemuck::cast_slice::<_, u8>(&mesh(&isolated, false, true)), - bytemuck::cast_slice::<_, u8>(&mesh(&isolated, true, true)) - ); - - // The padding read must also remove the center chunk's internal face - // against a different leaf species in the neighboring chunk. - let boundary = [([15, 7, 7], oak), ([16, 7, 7], birch)]; - assert_eq!( - mesh(&boundary, false, true).len(), - mesh(&[boundary[0]], false, true).len() - ); - assert_eq!( - bytemuck::cast_slice::<_, u8>(&mesh(&boundary, true, true)), - bytemuck::cast_slice::<_, u8>(&without_face(boundary[0].0, oak, ModelDirection::East)) - ); -} diff --git a/crates/horizon-client/src/mesher/visibility_tests.rs b/crates/horizon-client/src/mesher/visibility_tests.rs index 32eb4800c..ad76d48f9 100644 --- a/crates/horizon-client/src/mesher/visibility_tests.rs +++ b/crates/horizon-client/src/mesher/visibility_tests.rs @@ -87,7 +87,6 @@ fn info(solid: bool) -> Info { legacy_solid: false, overlay: false, leaves: false, - mangrove_roots: false, blocks_flow: false, ice: false, sturdy: 0, diff --git a/crates/horizon-client/src/streaming.rs b/crates/horizon-client/src/streaming.rs index 15ed1674e..4cad224fd 100644 --- a/crates/horizon-client/src/streaming.rs +++ b/crates/horizon-client/src/streaming.rs @@ -153,7 +153,6 @@ struct MeshSettings { blend_radius: i32, smooth_lighting: bool, cutout_leaves: bool, - cull_leaves: bool, } enum Job { Generate(i32, i32), @@ -258,7 +257,6 @@ pub struct Streaming { /// The `ao` and `cutoutLeaves` options. pub smooth_lighting: bool, pub cutout_leaves: bool, - pub cull_leaves: bool, /// Incremental relighting of block edits on lit chunks (see `light::relight`). light_tables: Arc, /// Applied edits by sequence, replayed onto light jobs snapshotted before them. @@ -500,7 +498,6 @@ impl Streaming { blend_radius: settings.blend_radius, smooth_lighting: settings.smooth_lighting, cutout_leaves: settings.cutout_leaves, - cull_leaves: settings.cull_leaves, assets: &context.assets, render: &context.render, tables: &context.tables, @@ -556,7 +553,6 @@ impl Streaming { biome_blend: 2, smooth_lighting: true, cutout_leaves: true, - cull_leaves: false, light_tables, light_log: Vec::new(), light_edit_sequence: 0, @@ -1177,7 +1173,6 @@ impl Streaming { blend_radius: self.biome_blend, smooth_lighting: self.smooth_lighting, cutout_leaves: self.cutout_leaves, - cull_leaves: self.cull_leaves, }, ), ); diff --git a/crates/horizon-client/tests/streaming_meshes.rs b/crates/horizon-client/tests/streaming_meshes.rs index f0b6fb038..00c233277 100644 --- a/crates/horizon-client/tests/streaming_meshes.rs +++ b/crates/horizon-client/tests/streaming_meshes.rs @@ -215,7 +215,6 @@ fn relit_columns_keep_every_mesh_current() { blend_radius: 2, smooth_lighting: true, cutout_leaves: true, - cull_leaves: false, assets: &context.assets, render: &context.render, tables: &context.tables,