mirror of
https://github.com/italicsjenga/valence.git
synced 2024-12-28 16:41:32 +11:00
ae7eaf15fc
Closes #84 # Changes - Implemented new algorithm for tracking loaded entities and chunks. - The client does not need to maintain a list of loaded chunks and entities anymore, as this information can be inferred using carefully maintained data from the previous tick. - Chunks are used as a spatial partition for entities. Entity visibility is now based on chunk visibility rather than the euclidean distance to clients. - The BVH is no longer strictly necessary, so it has been moved to the new `valence_spatial_index` crate. - The API has been generalized to support things other than entities. The crate does not have a dependency on the main `valence` crate. - Chunk, entity, and player list packets are now aggressively cached to increase performance. - Chunk packets now include some filler light data. This makes the vanilla client lag a lot less. - Entities and chunks must now be marked as deleted before they are removed. - Improved `ChunkPos` interface. - Added function to get the duration per tick. - Added `Index` and `IndexMut` impls to collection types. As a result of the above changes, performance under heavy load has increased significantly. With the rust-mc-bot test on my machine, I went from a max of ~1000 players to ~4000 players.
228 lines
6.9 KiB
Rust
228 lines
6.9 KiB
Rust
use std::borrow::Cow;
|
|
use std::f64::consts::TAU;
|
|
use std::net::SocketAddr;
|
|
use std::sync::atomic::{AtomicUsize, Ordering};
|
|
|
|
use valence::prelude::*;
|
|
|
|
pub fn main() -> ShutdownResult {
|
|
tracing_subscriber::fmt().init();
|
|
|
|
valence::start_server(
|
|
Game {
|
|
player_count: AtomicUsize::new(0),
|
|
},
|
|
ServerState {
|
|
player_list: None,
|
|
cows: vec![],
|
|
},
|
|
)
|
|
}
|
|
|
|
struct Game {
|
|
player_count: AtomicUsize,
|
|
}
|
|
|
|
struct ServerState {
|
|
player_list: Option<PlayerListId>,
|
|
cows: Vec<EntityId>,
|
|
}
|
|
|
|
#[derive(Default)]
|
|
struct ClientState {
|
|
entity_id: EntityId,
|
|
}
|
|
|
|
const MAX_PLAYERS: usize = 10;
|
|
|
|
const SPAWN_POS: BlockPos = BlockPos::new(0, 100, -25);
|
|
|
|
#[async_trait]
|
|
impl Config for Game {
|
|
type ServerState = ServerState;
|
|
type ClientState = ClientState;
|
|
type EntityState = ();
|
|
type WorldState = ();
|
|
type ChunkState = ();
|
|
type PlayerListState = ();
|
|
type InventoryState = ();
|
|
|
|
async fn server_list_ping(
|
|
&self,
|
|
_server: &SharedServer<Self>,
|
|
_remote_addr: SocketAddr,
|
|
_protocol_version: i32,
|
|
) -> ServerListPing {
|
|
const SAMPLE: &[PlayerSampleEntry] = &[
|
|
PlayerSampleEntry {
|
|
name: Cow::Borrowed("§cFirst Entry"),
|
|
id: Uuid::nil(),
|
|
},
|
|
PlayerSampleEntry {
|
|
name: Cow::Borrowed("§6§oSecond Entry"),
|
|
id: Uuid::nil(),
|
|
},
|
|
];
|
|
|
|
ServerListPing::Respond {
|
|
online_players: self.player_count.load(Ordering::SeqCst) as i32,
|
|
max_players: MAX_PLAYERS as i32,
|
|
player_sample: SAMPLE.into(),
|
|
description: "Hello Valence!".color(Color::AQUA),
|
|
favicon_png: Some(include_bytes!("../assets/logo-64x64.png").as_slice().into()),
|
|
}
|
|
}
|
|
|
|
fn init(&self, server: &mut Server<Self>) {
|
|
let (world_id, world) = server.worlds.insert(DimensionId::default(), ());
|
|
server.state.player_list = Some(server.player_lists.insert(()).0);
|
|
|
|
let size = 5;
|
|
for z in -size..size {
|
|
for x in -size..size {
|
|
world.chunks.insert([x, z], UnloadedChunk::default(), ());
|
|
}
|
|
}
|
|
|
|
world.chunks.set_block_state(SPAWN_POS, BlockState::BEDROCK);
|
|
|
|
server.state.cows.extend((0..200).map(|_| {
|
|
let (id, e) = server.entities.insert(EntityKind::Cow, ());
|
|
e.set_world(world_id);
|
|
id
|
|
}));
|
|
}
|
|
|
|
fn update(&self, server: &mut Server<Self>) {
|
|
let current_tick = server.current_tick();
|
|
let (world_id, _) = server.worlds.iter_mut().next().expect("missing world");
|
|
|
|
server.clients.retain(|_, client| {
|
|
if client.created_this_tick() {
|
|
if self
|
|
.player_count
|
|
.fetch_update(Ordering::SeqCst, Ordering::SeqCst, |count| {
|
|
(count < MAX_PLAYERS).then_some(count + 1)
|
|
})
|
|
.is_err()
|
|
{
|
|
client.disconnect("The server is full!".color(Color::RED));
|
|
return false;
|
|
}
|
|
|
|
match server
|
|
.entities
|
|
.insert_with_uuid(EntityKind::Player, client.uuid(), ())
|
|
{
|
|
Some((id, entity)) => {
|
|
entity.set_world(world_id);
|
|
client.entity_id = id
|
|
}
|
|
None => {
|
|
client.disconnect("Conflicting UUID");
|
|
return false;
|
|
}
|
|
}
|
|
|
|
client.respawn(world_id);
|
|
client.set_flat(true);
|
|
client.set_game_mode(GameMode::Creative);
|
|
client.teleport(
|
|
[
|
|
SPAWN_POS.x as f64 + 0.5,
|
|
SPAWN_POS.y as f64 + 1.0,
|
|
SPAWN_POS.z as f64 + 0.5,
|
|
],
|
|
0.0,
|
|
0.0,
|
|
);
|
|
client.set_player_list(server.state.player_list.clone());
|
|
|
|
if let Some(id) = &server.state.player_list {
|
|
server.player_lists[id].insert(
|
|
client.uuid(),
|
|
client.username(),
|
|
client.textures().cloned(),
|
|
client.game_mode(),
|
|
0,
|
|
None,
|
|
);
|
|
}
|
|
}
|
|
|
|
let entity = &mut server.entities[client.entity_id];
|
|
|
|
if client.is_disconnected() {
|
|
self.player_count.fetch_sub(1, Ordering::SeqCst);
|
|
if let Some(id) = &server.state.player_list {
|
|
server.player_lists[id].remove(client.uuid());
|
|
}
|
|
entity.set_deleted(true);
|
|
|
|
return false;
|
|
}
|
|
|
|
while let Some(event) = client.next_event() {
|
|
event.handle_default(client, entity);
|
|
}
|
|
|
|
true
|
|
});
|
|
|
|
let time = current_tick as f64 / server.shared.tick_rate() as f64;
|
|
|
|
let rot = Mat3::rotation_x(time * TAU * 0.1)
|
|
.rotated_y(time * TAU * 0.2)
|
|
.rotated_z(time * TAU * 0.3);
|
|
|
|
let radius = 6.0 + ((time * TAU / 2.5).sin() + 1.0) / 2.0 * 10.0;
|
|
|
|
let player_pos = server
|
|
.clients
|
|
.iter()
|
|
.next()
|
|
.map(|c| c.1.position())
|
|
.unwrap_or_default();
|
|
|
|
// TODO: remove hardcoded eye pos.
|
|
let eye_pos = Vec3::new(player_pos.x, player_pos.y + 1.6, player_pos.z);
|
|
|
|
for (cow_id, p) in server
|
|
.state
|
|
.cows
|
|
.iter()
|
|
.cloned()
|
|
.zip(fibonacci_spiral(server.state.cows.len()))
|
|
{
|
|
let cow = server.entities.get_mut(cow_id).expect("missing cow");
|
|
let rotated = p * rot;
|
|
let transformed = rotated * radius + [0.5, SPAWN_POS.y as f64 + 2.0, 0.5];
|
|
|
|
let yaw = f32::atan2(rotated.z as f32, rotated.x as f32).to_degrees() - 90.0;
|
|
let (looking_yaw, looking_pitch) =
|
|
to_yaw_and_pitch((eye_pos - transformed).normalized());
|
|
|
|
cow.set_position(transformed);
|
|
cow.set_yaw(yaw);
|
|
cow.set_pitch(looking_pitch as f32);
|
|
cow.set_head_yaw(looking_yaw as f32);
|
|
}
|
|
}
|
|
}
|
|
|
|
/// Distributes N points on the surface of a unit sphere.
|
|
fn fibonacci_spiral(n: usize) -> impl Iterator<Item = Vec3<f64>> {
|
|
let golden_ratio = (1.0 + 5_f64.sqrt()) / 2.0;
|
|
|
|
(0..n).map(move |i| {
|
|
// Map to unit square
|
|
let x = i as f64 / golden_ratio % 1.0;
|
|
let y = i as f64 / n as f64;
|
|
|
|
// Map from unit square to unit sphere.
|
|
let theta = x * TAU;
|
|
let phi = (1.0 - 2.0 * y).acos();
|
|
Vec3::new(theta.cos() * phi.sin(), theta.sin() * phi.sin(), phi.cos())
|
|
})
|
|
}
|