Upgrade the chunk example

Cargo.toml

@@ -50,6 +50,7 @@ features = ["rustls-tls", "json"]
 
 [dev-dependencies]
 env_logger = "0.9"
+noise = "0.7"
 
 [build-dependencies]
 anyhow = "1"

examples/chunk.rs

@@ -1,131 +0,0 @@
-use std::net::SocketAddr;
-use std::sync::atomic::{AtomicUsize, Ordering};
-
-use log::LevelFilter;
-use valence::block::BlockState;
-use valence::client::GameMode;
-use valence::config::{Config, ServerListPing};
-use valence::text::Color;
-use valence::{
-    async_trait, ChunkPos, ClientMut, DimensionId, Server, ShutdownResult, Text,
-    TextFormat, WorldId, WorldsMut,
-};
-
-pub fn main() -> ShutdownResult {
-    env_logger::Builder::new()
-        .filter_module("valence", LevelFilter::Trace)
-        .parse_default_env()
-        .init();
-
-    valence::start_server(Game {
-        player_count: AtomicUsize::new(0),
-    })
-}
-
-struct Game {
-    player_count: AtomicUsize,
-}
-
-const MAX_PLAYERS: usize = 10;
-
-#[async_trait]
-impl Config for Game {
-    fn max_connections(&self) -> usize {
-        // We want status pings to be successful even if the server is full.
-        MAX_PLAYERS + 64
-    }
-
-    fn online_mode(&self) -> bool {
-        // You'll want this to be true on real servers.
-        false
-    }
-
-    async fn server_list_ping(&self, _server: &Server, _remote_addr: SocketAddr) -> ServerListPing {
-        ServerListPing::Respond {
-            online_players: self.player_count.load(Ordering::SeqCst) as i32,
-            max_players: MAX_PLAYERS as i32,
-            description: "Hello Valence!".color(Color::AQUA),
-            favicon_png: Some(include_bytes!("favicon.png")),
-        }
-    }
-
-    fn join(
-        &self,
-        _server: &Server,
-        _client: ClientMut,
-        worlds: WorldsMut,
-    ) -> Result<WorldId, Text> {
-        if let Ok(_) = self
-            .player_count
-            .fetch_update(Ordering::SeqCst, Ordering::SeqCst, |count| {
-                (count < MAX_PLAYERS).then(|| count + 1)
-            })
-        {
-            Ok(worlds.iter().next().unwrap().0)
-        } else {
-            Err("The server is full!".into())
-        }
-    }
-
-    fn init(&self, _server: &Server, mut worlds: WorldsMut) {
-        let world_id = worlds.create(DimensionId::default()).0;
-        let mut world = worlds.get_mut(world_id).unwrap();
-
-        let size = 5;
-        for z in -size..size {
-            for x in -size..size {
-                let pos = ChunkPos::new(x, z);
-                world.chunks.create(pos);
-                let mut chunk = world.chunks.get_mut(pos).unwrap();
-
-                // Chunks are only visible to clients if all adjacent chunks are loaded.
-                // This will make the perimiter chunks contain only air.
-                if x != -size && x != size - 1 && z != -size && z != size - 1 {
-                    for z in 0..16 {
-                        for x in 0..16 {
-                            let block_x = pos.x * 16 + x as i32;
-                            let block_z = pos.z * 16 + z as i32;
-
-                            let height = 50.0
-                                + ((block_x as f64 / 10.0).cos() + (block_z as f64 / 10.0).sin())
-                                    * 7.0;
-
-                            for y in 0..height.round() as usize {
-                                let states = [
-                                    BlockState::ACACIA_PLANKS,
-                                    BlockState::SLIME_BLOCK,
-                                    BlockState::IRON_BLOCK,
-                                    BlockState::SEA_LANTERN,
-                                    BlockState::STONE,
-                                    BlockState::DIRT,
-                                    BlockState::PRISMARINE_BRICKS,
-                                    BlockState::DIAMOND_ORE,
-                                ];
-
-                                chunk.set_block_state(x, y, z, states[y % states.len()]);
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    fn update(&self, server: &Server, mut worlds: WorldsMut) {
-        let mut world = worlds.iter_mut().next().unwrap().1;
-
-        world.clients.retain(|_, mut client| {
-            if client.created_tick() == server.current_tick() {
-                client.set_game_mode(GameMode::Creative);
-                client.teleport([0.0, 200.0, 0.0], 0.0, 0.0);
-            }
-
-            if client.is_disconnected() {
-                self.player_count.fetch_sub(1, Ordering::SeqCst);
-                false
-            } else {
-                true
-            }
-        });
-    }
-}

examples/terrain.rs

@@ -0,0 +1,291 @@
+use std::collections::HashSet;
+use std::net::SocketAddr;
+use std::sync::atomic::{AtomicUsize, Ordering};
+
+use log::LevelFilter;
+use noise::{NoiseFn, Seedable, SuperSimplex};
+use rayon::iter::ParallelIterator;
+use valence::block::{BlockState, PropName, PropValue};
+use valence::client::GameMode;
+use valence::config::{Config, ServerListPing};
+use valence::text::Color;
+use valence::util::chunks_in_view_distance;
+use valence::{
+    async_trait, ChunkPos, ClientMut, DimensionId, Server, ShutdownResult, Text, TextFormat,
+    WorldId, WorldsMut,
+};
+use vek::Lerp;
+
+pub fn main() -> ShutdownResult {
+    env_logger::Builder::new()
+        .filter_module("valence", LevelFilter::Trace)
+        .parse_default_env()
+        .init();
+
+    let seed = rand::random();
+
+    valence::start_server(Game {
+        player_count: AtomicUsize::new(0),
+        density_noise: SuperSimplex::new().set_seed(seed),
+        hilly_noise: SuperSimplex::new().set_seed(seed.wrapping_add(1)),
+        stone_noise: SuperSimplex::new().set_seed(seed.wrapping_add(2)),
+        gravel_noise: SuperSimplex::new().set_seed(seed.wrapping_add(3)),
+        grass_noise: SuperSimplex::new().set_seed(seed.wrapping_add(4)),
+    })
+}
+
+struct Game {
+    player_count: AtomicUsize,
+    density_noise: SuperSimplex,
+    hilly_noise: SuperSimplex,
+    stone_noise: SuperSimplex,
+    gravel_noise: SuperSimplex,
+    grass_noise: SuperSimplex,
+}
+
+const MAX_PLAYERS: usize = 10;
+
+#[async_trait]
+impl Config for Game {
+    fn max_connections(&self) -> usize {
+        // We want status pings to be successful even if the server is full.
+        MAX_PLAYERS + 64
+    }
+
+    fn online_mode(&self) -> bool {
+        // You'll want this to be true on real servers.
+        false
+    }
+
+    async fn server_list_ping(&self, _server: &Server, _remote_addr: SocketAddr) -> ServerListPing {
+        ServerListPing::Respond {
+            online_players: self.player_count.load(Ordering::SeqCst) as i32,
+            max_players: MAX_PLAYERS as i32,
+            description: "Hello Valence!".color(Color::AQUA),
+            favicon_png: Some(include_bytes!("favicon.png")),
+        }
+    }
+
+    fn join(
+        &self,
+        _server: &Server,
+        _client: ClientMut,
+        worlds: WorldsMut,
+    ) -> Result<WorldId, Text> {
+        if let Ok(_) = self
+            .player_count
+            .fetch_update(Ordering::SeqCst, Ordering::SeqCst, |count| {
+                (count < MAX_PLAYERS).then(|| count + 1)
+            })
+        {
+            Ok(worlds.iter().next().unwrap().0)
+        } else {
+            Err("The server is full!".into())
+        }
+    }
+
+    fn init(&self, _server: &Server, mut worlds: WorldsMut) {
+        worlds.create(DimensionId::default());
+    }
+
+    fn update(&self, server: &Server, mut worlds: WorldsMut) {
+        let mut world = worlds.iter_mut().next().unwrap().1;
+
+        let mut chunks_to_unload = HashSet::<_>::from_iter(world.chunks.iter().map(|t| t.0));
+
+        world.clients.retain(|_, mut client| {
+            if client.is_disconnected() {
+                self.player_count.fetch_sub(1, Ordering::SeqCst);
+                return false;
+            }
+
+            if client.created_tick() == server.current_tick() {
+                client.set_game_mode(GameMode::Creative);
+                client.teleport([0.0, 200.0, 0.0], 0.0, 0.0);
+            }
+
+            let dist = client.view_distance();
+            let p = client.position();
+
+            for pos in chunks_in_view_distance(ChunkPos::at(p.x, p.z), dist) {
+                chunks_to_unload.remove(&pos);
+                if world.chunks.get(pos).is_none() {
+                    world.chunks.create(pos);
+                }
+            }
+
+            true
+        });
+
+        for pos in chunks_to_unload {
+            world.chunks.delete(pos);
+        }
+
+        world.chunks.par_iter_mut().for_each(|(pos, mut chunk)| {
+            if chunk.created_tick() == server.current_tick() {
+                for z in 0..16 {
+                    for x in 0..16 {
+                        let block_x = x as i64 + pos.x as i64 * 16;
+                        let block_z = z as i64 + pos.z as i64 * 16;
+
+                        let mut in_terrain = false;
+                        let mut depth = 0;
+
+                        for y in (0..chunk.height()).rev() {
+                            let b = terrain_column(
+                                self,
+                                block_x,
+                                y as i64,
+                                block_z,
+                                &mut in_terrain,
+                                &mut depth,
+                            );
+                            chunk.set_block_state(x, y, z, b);
+                        }
+
+                        // Add grass
+                        for y in (0..chunk.height()).rev() {
+                            if chunk.get_block_state(x, y, z).is_air()
+                                && chunk.get_block_state(x, y - 1, z) == BlockState::GRASS_BLOCK
+                            {
+                                let density = fbm(
+                                    &self.grass_noise,
+                                    [block_x, y as i64, block_z].map(|a| a as f64 / 5.0),
+                                    4,
+                                    2.0,
+                                    0.7,
+                                );
+
+                                if density > 0.55 {
+                                    if density > 0.7 && chunk.get_block_state(x, y + 1, z).is_air()
+                                    {
+                                        let upper = BlockState::TALL_GRASS
+                                            .set(PropName::Half, PropValue::Upper);
+                                        let lower = BlockState::TALL_GRASS
+                                            .set(PropName::Half, PropValue::Lower);
+
+                                        chunk.set_block_state(x, y + 1, z, upper);
+                                        chunk.set_block_state(x, y, z, lower);
+                                    } else {
+                                        chunk.set_block_state(x, y, z, BlockState::GRASS);
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        });
+    }
+}
+
+fn terrain_column(
+    g: &Game,
+    x: i64,
+    y: i64,
+    z: i64,
+    in_terrain: &mut bool,
+    depth: &mut u32,
+) -> BlockState {
+    const WATER_HEIGHT: i64 = 55;
+
+    if has_terrain_at(g, x, y, z) {
+        let gravel_height = WATER_HEIGHT
+            - (noise01(&g.gravel_noise, [x, y, z].map(|a| a as f64 / 10.0)) * 6.0).round() as i64;
+
+        if *in_terrain {
+            if *depth > 0 {
+                *depth -= 1;
+                if y < gravel_height {
+                    BlockState::GRAVEL
+                } else {
+                    BlockState::DIRT
+                }
+            } else {
+                BlockState::STONE
+            }
+        } else {
+            *in_terrain = true;
+            let n = noise01(&g.stone_noise, [x, y, z].map(|a| a as f64 / 15.0));
+
+            *depth = (n * 5.0).round() as u32;
+
+            if y < gravel_height {
+                BlockState::GRAVEL
+            } else if y < WATER_HEIGHT - 1 {
+                BlockState::DIRT
+            } else {
+                BlockState::GRASS_BLOCK
+            }
+        }
+    } else {
+        *in_terrain = false;
+        *depth = 0;
+        if y < WATER_HEIGHT {
+            BlockState::WATER
+        } else {
+            BlockState::AIR
+        }
+    }
+}
+
+fn has_terrain_at(g: &Game, x: i64, y: i64, z: i64) -> bool {
+    let hilly = Lerp::lerp_unclamped(
+        0.1,
+        1.0,
+        noise01(&g.hilly_noise, [x, y, z].map(|a| a as f64 / 400.0)).powi(2),
+    );
+
+    let lower = 10.0 + 150.0 * hilly;
+    let upper = lower + 100.0 * hilly;
+
+    if y as f64 <= lower {
+        return true;
+    } else if y as f64 >= upper {
+        return false;
+    }
+
+    let density = 1.0 - lerpstep(lower, upper, y as f64);
+
+    let n = fbm(
+        &g.density_noise,
+        [x, y, z].map(|a| a as f64 / 100.0),
+        4,
+        2.0,
+        0.5,
+    );
+    n < density
+}
+
+fn lerpstep(edge0: f64, edge1: f64, x: f64) -> f64 {
+    if x <= edge0 {
+        0.0
+    } else if x >= edge1 {
+        1.0
+    } else {
+        (x - edge0) / (edge1 - edge0)
+    }
+}
+
+fn fbm(noise: &SuperSimplex, p: [f64; 3], octaves: u32, lacunarity: f64, persistence: f64) -> f64 {
+    let mut freq = 1.0;
+    let mut amp = 1.0;
+    let mut amp_sum = 0.0;
+    let mut sum = 0.0;
+
+    for _ in 0..octaves {
+        let n = noise01(noise, p.map(|a| a * freq));
+        sum += n * amp;
+        amp_sum += amp;
+
+        freq *= lacunarity;
+        amp *= persistence;
+    }
+
+    // Scale the output to [0, 1]
+    sum / amp_sum
+}
+
+fn noise01(noise: &SuperSimplex, xyz: [f64; 3]) -> f64 {
+    (noise.get(xyz) + 1.0) / 2.0
+}

src/chunk.rs

@@ -290,6 +290,10 @@ impl ChunkPos {
     pub const fn new(x: i32, z: i32) -> Self {
         Self { x, z }
     }
+
+    pub fn at(x: f64, z: f64) -> Self {
+        Self::new((x / 16.0) as i32, (z / 16.0) as i32)
+    }
 }
 
 impl From<(i32, i32)> for ChunkPos {

src/client.rs

@@ -248,6 +248,14 @@ impl Client {
         &self.events
     }
 
+    /// The current view distance of this client measured in chunks.
+    pub fn view_distance(&self) -> u8 {
+        self.settings
+            .as_ref()
+            .map_or(2, |s| s.view_distance)
+            .min(self.max_view_distance())
+    }
+
     pub fn max_view_distance(&self) -> u8 {
         self.new_max_view_distance
     }
@@ -424,13 +432,7 @@ impl<'a> ClientMut<'a> {
             }
         }
 
-        // The actual view distance.
+        let view_dist = self.view_distance();
-        let view_dist = self
-            .0
-            .settings
-            .as_ref()
-            .map_or(2, |s| s.view_distance)
-            .min(self.new_max_view_distance);
 
         let center = ChunkPos::new(
             (self.new_position.x / 16.0) as i32,
@@ -610,15 +612,10 @@ impl<'a> ClientMut<'a> {
             });
         }
 
-        
         // Spawn new entities within the view distance.
         let pos = self.position();
         spatial_index.query::<_, _, ()>(
-            |bb| {
+            |bb| bb.projected_point(pos).distance(pos) <= view_dist as f64 * 16.0,
-                bb.projected_point(pos)
-                    .distance(pos)
-                    <= view_dist as f64 * 16.0
-            },
             |id, _| {
                 if self.0.loaded_entities.insert(id) {
                     let entity = entities.get(id).unwrap();
@@ -628,7 +625,7 @@ impl<'a> ClientMut<'a> {
                                 .spawn_packet(id)
                                 .expect("should not be a marker entity"),
                         );
-        
+
                         if let Some(meta) = entity.initial_metadata_packet(id) {
                             self.send_packet(meta);
                         }

src/config.rs

@@ -98,7 +98,7 @@ pub trait Config: Any + Send + Sync + UnwindSafe + RefUnwindSafe {
     /// An unspecified value is returned that should be adequate in most
     /// situations.
     fn outgoing_packet_capacity(&self) -> usize {
-        512
+        2048
     }
 
     /// Called once at startup to get a handle to the tokio runtime the server