diff --git a/assets/voxygen/voxel/mini_tree.vox b/assets/voxygen/voxel/mini_tree.vox index b8e951cac5..0218162af2 100644 --- a/assets/voxygen/voxel/mini_tree.vox +++ b/assets/voxygen/voxel/mini_tree.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:69ae4969ab87e6c1b6272c6dfb7f87a60dc032550fba4a5bf336107ef76b73cf -size 1816 +oid sha256:7f0caabb76fe9cbd3a79cc3224647a1327635e76e95bcc10a98c207ac8f5d845 +size 2436 diff --git a/client/src/lib.rs b/client/src/lib.rs index 0f651dd8f8..f8be3ff527 100644 --- a/client/src/lib.rs +++ b/client/src/lib.rs @@ -1617,7 +1617,7 @@ impl Client { } pub fn nearby_zones(&self) -> Option>> { - const ZONE_RADIUS: u32 = 1; + const ZONE_RADIUS: u32 = 2; let player_zone = self.position()?.xy().map2(TerrainChunkSize::RECT_SIZE, |e, sz| e as i32 / (sz * LodZone::SIZE) as i32); Some(Spiral2d::new() .take((ZONE_RADIUS * 2 + 1).pow(2) as usize) diff --git a/common/src/lod.rs b/common/src/lod.rs index f70b9d1bc4..3667a04973 100644 --- a/common/src/lod.rs +++ b/common/src/lod.rs @@ -8,7 +8,7 @@ pub struct LodZone { impl LodZone { /// Size in chunks - pub const SIZE: u32 = 64; + pub const SIZE: u32 = 32; } #[derive(Clone, Debug, Serialize, Deserialize)] diff --git a/voxygen/src/scene/lod.rs b/voxygen/src/scene/lod.rs index cbe3e2bd3b..b1d9dfe941 100644 --- a/voxygen/src/scene/lod.rs +++ b/voxygen/src/scene/lod.rs @@ -49,6 +49,7 @@ impl Lod { Segment::from(&DotVoxAsset::load_expect("voxygen.voxel.mini_tree").read().0), (&mut greedy, &mut mesh, false), ); + println!("Tree mesh has {} vertices", mesh.vertices().len()); ( renderer.create_model(&mesh).expect("Failed to upload sprite model data to the GPU!"), ShadowPipeline::create_col_lights(renderer, &greedy.finalize()) diff --git a/world/src/util/structure.rs b/world/src/util/structure.rs index b9a0a57cb2..6f7136b6d8 100644 --- a/world/src/util/structure.rs +++ b/world/src/util/structure.rs @@ -85,8 +85,8 @@ impl StructureGen2d { let freq_offset = Self::freq_offset(freq); assert!(freq_offset * 2 == freq); - let min_index = Self::sample_to_index_internal(freq, min) - 1; - let max_index = Self::sample_to_index_internal(freq, max) + 1; + let min_index = Self::sample_to_index_internal(freq, min - spread) - 1; + let max_index = Self::sample_to_index_internal(freq, max + spread) + 1; assert!(min_index.x < max_index.x); // NOTE: xlen > 0 let xlen = (max_index.x - min_index.x) as u32;