2019-03-03 22:02:38 +00:00
|
|
|
#![feature(drain_filter)]
|
2019-01-02 17:23:31 +00:00
|
|
|
|
2019-03-03 22:02:38 +00:00
|
|
|
pub mod client;
|
|
|
|
pub mod error;
|
|
|
|
pub mod input;
|
2019-04-16 15:38:01 +00:00
|
|
|
pub mod cmd;
|
2019-03-03 22:02:38 +00:00
|
|
|
|
|
|
|
// Reexports
|
2019-04-16 13:06:30 +00:00
|
|
|
pub use crate::{error::Error, input::Input};
|
2019-03-03 22:02:38 +00:00
|
|
|
|
2019-04-19 19:32:47 +00:00
|
|
|
use crate::{client::{Client, Clients}, cmd::CHAT_COMMANDS};
|
2019-03-03 22:02:38 +00:00
|
|
|
use common::{
|
2019-03-04 19:50:26 +00:00
|
|
|
comp,
|
2019-04-19 19:32:47 +00:00
|
|
|
msg::{ClientState, ClientMsg, ServerMsg, RequestStateError},
|
2019-03-03 22:02:38 +00:00
|
|
|
net::PostOffice,
|
2019-04-16 21:06:33 +00:00
|
|
|
state::{State, Uid},
|
2019-04-10 23:16:29 +00:00
|
|
|
terrain::TerrainChunk,
|
2019-04-17 19:22:34 +00:00
|
|
|
comp::character::Animation,
|
2019-03-03 22:02:38 +00:00
|
|
|
};
|
2019-04-16 13:06:30 +00:00
|
|
|
use specs::{
|
|
|
|
join::Join, saveload::MarkedBuilder, world::EntityBuilder as EcsEntityBuilder, Builder,
|
|
|
|
Entity as EcsEntity,
|
2019-03-04 19:50:26 +00:00
|
|
|
};
|
2019-04-16 13:06:30 +00:00
|
|
|
use std::{collections::HashSet, net::SocketAddr, sync::mpsc, time::Duration};
|
|
|
|
use threadpool::ThreadPool;
|
|
|
|
use vek::*;
|
|
|
|
use world::World;
|
|
|
|
|
2019-04-17 14:46:04 +00:00
|
|
|
const CLIENT_TIMEOUT: f64 = 20.0; // Seconds
|
2019-01-02 17:23:31 +00:00
|
|
|
|
2019-03-03 22:02:38 +00:00
|
|
|
pub enum Event {
|
2019-04-16 13:06:30 +00:00
|
|
|
ClientConnected { entity: EcsEntity },
|
|
|
|
ClientDisconnected { entity: EcsEntity },
|
|
|
|
Chat { entity: EcsEntity, msg: String },
|
2019-01-02 17:23:31 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
pub struct Server {
|
2019-01-02 19:22:01 +00:00
|
|
|
state: State,
|
2019-01-15 15:13:11 +00:00
|
|
|
world: World,
|
2019-01-02 17:23:31 +00:00
|
|
|
|
2019-03-03 22:02:38 +00:00
|
|
|
postoffice: PostOffice<ServerMsg, ClientMsg>,
|
2019-03-04 19:50:26 +00:00
|
|
|
clients: Clients,
|
2019-04-10 23:16:29 +00:00
|
|
|
|
|
|
|
thread_pool: ThreadPool,
|
|
|
|
chunk_tx: mpsc::Sender<(Vec3<i32>, TerrainChunk)>,
|
|
|
|
chunk_rx: mpsc::Receiver<(Vec3<i32>, TerrainChunk)>,
|
2019-04-10 23:41:37 +00:00
|
|
|
pending_chunks: HashSet<Vec3<i32>>,
|
2019-01-02 17:23:31 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
impl Server {
|
2019-01-12 15:57:19 +00:00
|
|
|
/// Create a new `Server`.
|
2019-03-03 22:02:38 +00:00
|
|
|
#[allow(dead_code)]
|
|
|
|
pub fn new() -> Result<Self, Error> {
|
2019-04-10 23:16:29 +00:00
|
|
|
let (chunk_tx, chunk_rx) = mpsc::channel();
|
|
|
|
|
2019-04-16 21:06:33 +00:00
|
|
|
let mut state = State::new();
|
2019-04-22 08:20:25 +00:00
|
|
|
state.ecs_mut().register::<comp::phys::ForceUpdate>();
|
2019-04-16 21:06:33 +00:00
|
|
|
|
|
|
|
let mut this = Self {
|
|
|
|
state,
|
2019-01-15 15:13:11 +00:00
|
|
|
world: World::new(),
|
2019-03-03 22:02:38 +00:00
|
|
|
|
2019-03-05 18:39:18 +00:00
|
|
|
postoffice: PostOffice::bind(SocketAddr::from(([0; 4], 59003)))?,
|
2019-03-04 19:50:26 +00:00
|
|
|
clients: Clients::empty(),
|
2019-04-10 23:16:29 +00:00
|
|
|
|
|
|
|
thread_pool: threadpool::Builder::new()
|
|
|
|
.thread_name("veloren-worker".into())
|
|
|
|
.build(),
|
|
|
|
chunk_tx,
|
|
|
|
chunk_rx,
|
2019-04-10 23:41:37 +00:00
|
|
|
pending_chunks: HashSet::new(),
|
2019-04-16 21:06:33 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
for i in 0..4 {
|
2019-04-19 07:35:23 +00:00
|
|
|
this.create_npc(comp::Character::random())
|
2019-04-16 21:06:33 +00:00
|
|
|
.with(comp::Agent::Wanderer(Vec2::zero()))
|
|
|
|
.with(comp::Control::default())
|
|
|
|
.build();
|
|
|
|
}
|
|
|
|
|
|
|
|
Ok(this)
|
2019-01-02 17:23:31 +00:00
|
|
|
}
|
|
|
|
|
2019-01-15 15:13:11 +00:00
|
|
|
/// Get a reference to the server's game state.
|
2019-03-03 22:02:38 +00:00
|
|
|
#[allow(dead_code)]
|
2019-04-16 13:06:30 +00:00
|
|
|
pub fn state(&self) -> &State {
|
|
|
|
&self.state
|
|
|
|
}
|
2019-01-15 15:13:11 +00:00
|
|
|
/// Get a mutable reference to the server's game state.
|
2019-03-03 22:02:38 +00:00
|
|
|
#[allow(dead_code)]
|
2019-04-16 13:06:30 +00:00
|
|
|
pub fn state_mut(&mut self) -> &mut State {
|
|
|
|
&mut self.state
|
|
|
|
}
|
2019-01-12 15:57:19 +00:00
|
|
|
|
2019-01-15 15:13:11 +00:00
|
|
|
/// Get a reference to the server's world.
|
2019-03-03 22:02:38 +00:00
|
|
|
#[allow(dead_code)]
|
2019-04-16 13:06:30 +00:00
|
|
|
pub fn world(&self) -> &World {
|
|
|
|
&self.world
|
|
|
|
}
|
2019-01-15 15:13:11 +00:00
|
|
|
/// Get a mutable reference to the server's world.
|
2019-03-03 22:02:38 +00:00
|
|
|
#[allow(dead_code)]
|
2019-04-16 13:06:30 +00:00
|
|
|
pub fn world_mut(&mut self) -> &mut World {
|
|
|
|
&mut self.world
|
|
|
|
}
|
2019-01-15 15:13:11 +00:00
|
|
|
|
2019-04-16 21:06:33 +00:00
|
|
|
/// Build a non-player character
|
|
|
|
#[allow(dead_code)]
|
2019-04-19 07:35:23 +00:00
|
|
|
pub fn create_npc(&mut self, character: comp::Character) -> EcsEntityBuilder {
|
2019-04-16 21:06:33 +00:00
|
|
|
self.state
|
|
|
|
.ecs_mut()
|
|
|
|
.create_entity_synced()
|
|
|
|
.with(comp::phys::Pos(Vec3::zero()))
|
|
|
|
.with(comp::phys::Vel(Vec3::zero()))
|
2019-04-17 08:59:38 +00:00
|
|
|
.with(comp::phys::Dir(Vec3::unit_y()))
|
2019-04-16 21:06:33 +00:00
|
|
|
.with(character)
|
|
|
|
}
|
|
|
|
|
2019-04-19 19:32:47 +00:00
|
|
|
pub fn create_player_character(state: &mut State, entity: EcsEntity, client: &mut Client, character: comp::Character) {
|
2019-04-19 07:35:23 +00:00
|
|
|
state.write_component(entity, character);
|
|
|
|
state.write_component(entity, comp::phys::Pos(Vec3::zero()));
|
|
|
|
state.write_component(entity, comp::phys::Vel(Vec3::zero()));
|
|
|
|
state.write_component(entity, comp::phys::Dir(Vec3::unit_y()));
|
|
|
|
// Make sure everything is accepted
|
|
|
|
state.write_component(entity, comp::phys::ForceUpdate);
|
|
|
|
|
|
|
|
// Set initial animation
|
|
|
|
state.write_component(entity, comp::AnimationHistory {
|
|
|
|
last: None,
|
|
|
|
current: Animation::Idle
|
|
|
|
});
|
2019-04-19 19:32:47 +00:00
|
|
|
|
|
|
|
// Tell the client his request was successful
|
|
|
|
client.notify(ServerMsg::StateAnswer(Ok(ClientState::Character)));
|
|
|
|
client.client_state = ClientState::Character;
|
2019-04-19 07:35:23 +00:00
|
|
|
}
|
|
|
|
|
2019-01-02 17:23:31 +00:00
|
|
|
/// Execute a single server tick, handle input and update the game state by the given duration
|
2019-03-03 22:02:38 +00:00
|
|
|
#[allow(dead_code)]
|
|
|
|
pub fn tick(&mut self, input: Input, dt: Duration) -> Result<Vec<Event>, Error> {
|
2019-01-02 17:23:31 +00:00
|
|
|
// This tick function is the centre of the Veloren universe. Most server-side things are
|
|
|
|
// managed from here, and as such it's important that it stays organised. Please consult
|
|
|
|
// the core developers before making significant changes to this code. Here is the
|
|
|
|
// approximate order of things. Please update it as this code changes.
|
|
|
|
//
|
|
|
|
// 1) Collect input from the frontend, apply input effects to the state of the game
|
|
|
|
// 2) Go through any events (timer-driven or otherwise) that need handling and apply them
|
|
|
|
// to the state of the game
|
|
|
|
// 3) Go through all incoming client network communications, apply them to the game state
|
|
|
|
// 4) Perform a single LocalState tick (i.e: update the world and entities in the world)
|
|
|
|
// 5) Go through the terrain update queue and apply all changes to the terrain
|
|
|
|
// 6) Send relevant state updates to all clients
|
|
|
|
// 7) Finish the tick, passing control of the main thread back to the frontend
|
|
|
|
|
2019-03-03 22:02:38 +00:00
|
|
|
// Build up a list of events for this frame, to be passed to the frontend
|
|
|
|
let mut frontend_events = Vec::new();
|
|
|
|
|
|
|
|
// If networking has problems, handle them
|
2019-03-05 18:39:18 +00:00
|
|
|
if let Some(err) = self.postoffice.error() {
|
2019-03-03 22:02:38 +00:00
|
|
|
return Err(err.into());
|
|
|
|
}
|
|
|
|
|
|
|
|
// Handle new client connections (step 2)
|
|
|
|
frontend_events.append(&mut self.handle_new_connections()?);
|
|
|
|
|
|
|
|
// Handle new messages from clients
|
|
|
|
frontend_events.append(&mut self.handle_new_messages()?);
|
|
|
|
|
2019-01-02 17:23:31 +00:00
|
|
|
// Tick the client's LocalState (step 3)
|
|
|
|
self.state.tick(dt);
|
|
|
|
|
2019-04-10 23:16:29 +00:00
|
|
|
// Fetch any generated `TerrainChunk`s and insert them into the terrain
|
|
|
|
// Also, send the chunk data to anybody that is close by
|
|
|
|
for (key, chunk) in self.chunk_rx.try_iter() {
|
|
|
|
// Send the chunk to all nearby players
|
|
|
|
for (entity, player, pos) in (
|
2019-04-22 08:20:25 +00:00
|
|
|
&self.state.ecs().entities(),
|
|
|
|
&self.state.ecs().read_storage::<comp::Player>(),
|
2019-04-19 19:32:47 +00:00
|
|
|
&self.state.ecs().read_storage::<comp::phys::Pos>(),
|
2019-04-16 13:06:30 +00:00
|
|
|
)
|
|
|
|
.join()
|
|
|
|
{
|
2019-04-10 23:16:29 +00:00
|
|
|
// TODO: Distance check
|
|
|
|
// if self.state.terrain().key_pos(key)
|
|
|
|
|
2019-04-12 09:10:01 +00:00
|
|
|
/*
|
2019-04-10 23:16:29 +00:00
|
|
|
self.clients.notify(entity, ServerMsg::TerrainChunkUpdate {
|
|
|
|
key,
|
2019-04-11 22:26:43 +00:00
|
|
|
chunk: Box::new(chunk.clone()),
|
2019-04-10 23:16:29 +00:00
|
|
|
});
|
2019-04-12 09:10:01 +00:00
|
|
|
*/
|
2019-04-10 23:16:29 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
self.state.insert_chunk(key, chunk);
|
|
|
|
}
|
|
|
|
|
2019-03-04 19:50:26 +00:00
|
|
|
// Synchronise clients with the new state of the world
|
|
|
|
self.sync_clients();
|
|
|
|
|
2019-01-02 17:23:31 +00:00
|
|
|
// Finish the tick, pass control back to the frontend (step 6)
|
2019-03-03 22:02:38 +00:00
|
|
|
Ok(frontend_events)
|
2019-01-02 17:23:31 +00:00
|
|
|
}
|
2019-01-30 12:11:34 +00:00
|
|
|
|
|
|
|
/// Clean up the server after a tick
|
2019-03-03 22:02:38 +00:00
|
|
|
#[allow(dead_code)]
|
2019-01-30 12:11:34 +00:00
|
|
|
pub fn cleanup(&mut self) {
|
|
|
|
// Cleanup the local state
|
|
|
|
self.state.cleanup();
|
|
|
|
}
|
2019-03-03 22:02:38 +00:00
|
|
|
|
|
|
|
/// Handle new client connections
|
|
|
|
fn handle_new_connections(&mut self) -> Result<Vec<Event>, Error> {
|
|
|
|
let mut frontend_events = Vec::new();
|
|
|
|
|
2019-04-11 22:26:43 +00:00
|
|
|
for mut postbox in self.postoffice.new_postboxes() {
|
2019-04-16 13:06:30 +00:00
|
|
|
let entity = self.state.ecs_mut().create_entity_synced().build();
|
2019-03-05 00:00:11 +00:00
|
|
|
|
2019-04-16 13:06:30 +00:00
|
|
|
self.clients.add(
|
2019-04-10 17:23:27 +00:00
|
|
|
entity,
|
2019-04-16 13:06:30 +00:00
|
|
|
Client {
|
2019-04-19 19:32:47 +00:00
|
|
|
client_state: ClientState::Disconnected,
|
2019-04-16 13:06:30 +00:00
|
|
|
postbox,
|
|
|
|
last_ping: self.state.get_time(),
|
|
|
|
},
|
|
|
|
);
|
|
|
|
|
|
|
|
frontend_events.push(Event::ClientConnected { entity });
|
2019-03-03 22:02:38 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
Ok(frontend_events)
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Handle new client messages
|
|
|
|
fn handle_new_messages(&mut self) -> Result<Vec<Event>, Error> {
|
|
|
|
let mut frontend_events = Vec::new();
|
|
|
|
|
|
|
|
let state = &mut self.state;
|
|
|
|
let mut new_chat_msgs = Vec::new();
|
2019-03-05 00:00:11 +00:00
|
|
|
let mut disconnected_clients = Vec::new();
|
2019-04-10 23:41:37 +00:00
|
|
|
let mut requested_chunks = Vec::new();
|
2019-03-03 22:02:38 +00:00
|
|
|
|
2019-04-10 23:16:29 +00:00
|
|
|
self.clients.remove_if(|entity, client| {
|
2019-04-10 17:23:27 +00:00
|
|
|
let mut disconnect = false;
|
2019-03-03 22:02:38 +00:00
|
|
|
let new_msgs = client.postbox.new_messages();
|
|
|
|
|
|
|
|
// Update client ping
|
|
|
|
if new_msgs.len() > 0 {
|
|
|
|
client.last_ping = state.get_time();
|
|
|
|
|
|
|
|
// Process incoming messages
|
|
|
|
for msg in new_msgs {
|
2019-04-19 19:32:47 +00:00
|
|
|
match msg {
|
|
|
|
ClientMsg::RequestState(requested_state) => match requested_state {
|
|
|
|
ClientState::Spectator => match client.client_state {
|
|
|
|
// Use ClientMsg::Connect instead
|
|
|
|
ClientState::Disconnected => {},
|
|
|
|
ClientState::Spectator => {
|
|
|
|
// Already
|
|
|
|
client.postbox.send_message(ServerMsg::StateAnswer(
|
|
|
|
Err((RequestStateError::Already, ClientState::Spectator))));
|
|
|
|
},
|
|
|
|
ClientState::Character => {
|
|
|
|
// Always allow
|
|
|
|
client.postbox.send_message(ServerMsg::StateAnswer(
|
|
|
|
Ok(ClientState::Spectator)));
|
|
|
|
},
|
|
|
|
},
|
|
|
|
// Use ClientMsg::Character instead
|
|
|
|
ClientState::Character => { unimplemented!("TODO: Check for previously used character"); },
|
|
|
|
ClientState::Disconnected => disconnect = true,
|
|
|
|
},
|
|
|
|
ClientMsg::Connect { player } => match client.client_state {
|
|
|
|
ClientState::Disconnected => Self::initialize_client(state, entity, client, player),
|
|
|
|
_ => {},
|
|
|
|
},
|
|
|
|
ClientMsg::Character(character) => match client.client_state {
|
|
|
|
ClientState::Spectator => Self::create_player_character(state, entity, client, character),
|
|
|
|
// Currently only possible from spectator
|
|
|
|
_ => disconnect = true,
|
|
|
|
},
|
|
|
|
|
|
|
|
// Always possible
|
|
|
|
ClientMsg::Ping => client.postbox.send_message(ServerMsg::Pong),
|
|
|
|
ClientMsg::Pong => {}
|
|
|
|
ClientMsg::Disconnect => disconnect = true,
|
|
|
|
|
|
|
|
ClientMsg::Chat(msg) => match client.client_state {
|
|
|
|
ClientState::Disconnected => {}
|
|
|
|
_ => new_chat_msgs.push((entity, msg)),
|
|
|
|
},
|
|
|
|
|
|
|
|
ClientMsg::PlayerAnimation(animation_history) => match client.client_state {
|
|
|
|
ClientState::Character => {
|
|
|
|
state.write_component(entity, animation_history);
|
2019-04-16 13:06:30 +00:00
|
|
|
}
|
2019-04-10 17:23:27 +00:00
|
|
|
_ => disconnect = true,
|
|
|
|
},
|
2019-04-19 19:32:47 +00:00
|
|
|
ClientMsg::PlayerPhysics { pos, vel, dir } => match client.client_state {
|
|
|
|
ClientState::Character => {
|
2019-04-10 23:16:29 +00:00
|
|
|
state.write_component(entity, pos);
|
|
|
|
state.write_component(entity, vel);
|
|
|
|
state.write_component(entity, dir);
|
2019-04-19 19:32:47 +00:00
|
|
|
},
|
|
|
|
_ => disconnect = true,
|
|
|
|
},
|
|
|
|
ClientMsg::TerrainChunkRequest { key } => match client.client_state {
|
|
|
|
ClientState::Spectator | ClientState::Character => {
|
2019-04-16 13:06:30 +00:00
|
|
|
match state.terrain().get_key(key) {
|
|
|
|
Some(chunk) => {} /*client.postbox.send_message(ServerMsg::TerrainChunkUpdate {
|
2019-04-10 23:41:37 +00:00
|
|
|
key,
|
2019-04-11 22:26:43 +00:00
|
|
|
chunk: Box::new(chunk.clone()),
|
2019-04-16 13:06:30 +00:00
|
|
|
}),*/
|
|
|
|
None => requested_chunks.push(key),
|
|
|
|
}
|
2019-04-19 19:32:47 +00:00
|
|
|
},
|
|
|
|
ClientState::Disconnected => {},
|
|
|
|
}
|
2019-03-03 22:02:38 +00:00
|
|
|
}
|
|
|
|
}
|
2019-04-16 13:06:30 +00:00
|
|
|
} else if state.get_time() - client.last_ping > CLIENT_TIMEOUT || // Timeout
|
|
|
|
client.postbox.error().is_some()
|
|
|
|
// Postbox error
|
2019-03-03 22:02:38 +00:00
|
|
|
{
|
2019-04-10 17:23:27 +00:00
|
|
|
disconnect = true;
|
2019-03-06 13:51:01 +00:00
|
|
|
} else if state.get_time() - client.last_ping > CLIENT_TIMEOUT * 0.5 {
|
|
|
|
// Try pinging the client if the timeout is nearing
|
2019-04-11 22:26:43 +00:00
|
|
|
client.postbox.send_message(ServerMsg::Ping);
|
2019-03-03 22:02:38 +00:00
|
|
|
}
|
|
|
|
|
2019-04-10 17:23:27 +00:00
|
|
|
if disconnect {
|
2019-04-19 19:32:47 +00:00
|
|
|
println!("Someone disconnected!");
|
2019-04-10 23:16:29 +00:00
|
|
|
disconnected_clients.push(entity);
|
2019-04-19 19:32:47 +00:00
|
|
|
client.postbox.send_message(ServerMsg::StateAnswer(
|
|
|
|
Err((RequestStateError::Impossible, ClientState::Disconnected))));
|
2019-03-03 22:02:38 +00:00
|
|
|
true
|
|
|
|
} else {
|
|
|
|
false
|
|
|
|
}
|
|
|
|
});
|
|
|
|
|
|
|
|
// Handle new chat messages
|
2019-04-10 17:23:27 +00:00
|
|
|
for (entity, msg) in new_chat_msgs {
|
2019-04-16 13:06:30 +00:00
|
|
|
// Handle chat commands
|
|
|
|
if msg.starts_with("/") && msg.len() > 1 {
|
|
|
|
let argv = String::from(&msg[1..]);
|
|
|
|
self.process_chat_cmd(entity, argv);
|
|
|
|
} else {
|
|
|
|
self.clients.notify_connected(ServerMsg::Chat(
|
|
|
|
match self
|
|
|
|
.state
|
|
|
|
.ecs()
|
|
|
|
.read_storage::<comp::Player>()
|
|
|
|
.get(entity)
|
|
|
|
{
|
|
|
|
Some(player) => format!("[{}] {}", &player.alias, msg),
|
|
|
|
None => format!("[<anon>] {}", msg),
|
|
|
|
},
|
|
|
|
));
|
|
|
|
|
|
|
|
frontend_events.push(Event::Chat { entity, msg });
|
|
|
|
}
|
2019-03-03 22:02:38 +00:00
|
|
|
}
|
|
|
|
|
2019-03-05 00:00:11 +00:00
|
|
|
// Handle client disconnects
|
2019-04-10 17:23:27 +00:00
|
|
|
for entity in disconnected_clients {
|
2019-04-16 13:06:30 +00:00
|
|
|
self.state.ecs_mut().delete_entity_synced(entity);
|
2019-03-05 00:00:11 +00:00
|
|
|
|
2019-04-16 13:06:30 +00:00
|
|
|
frontend_events.push(Event::ClientDisconnected { entity });
|
2019-03-05 00:00:11 +00:00
|
|
|
}
|
|
|
|
|
2019-04-10 23:41:37 +00:00
|
|
|
// Generate requested chunks
|
|
|
|
for key in requested_chunks {
|
|
|
|
self.generate_chunk(key);
|
|
|
|
}
|
|
|
|
|
2019-03-03 22:02:38 +00:00
|
|
|
Ok(frontend_events)
|
|
|
|
}
|
2019-03-04 19:50:26 +00:00
|
|
|
|
2019-04-17 19:22:34 +00:00
|
|
|
/// Initialize a new client states with important information
|
|
|
|
fn initialize_client(
|
|
|
|
state: &mut State,
|
|
|
|
entity: specs::Entity,
|
|
|
|
client: &mut Client,
|
|
|
|
player: comp::Player,
|
|
|
|
) {
|
|
|
|
// Save player metadata (for example the username)
|
|
|
|
state.write_component(entity, player);
|
|
|
|
|
2019-04-19 19:32:47 +00:00
|
|
|
// Return the state of the current world
|
2019-04-17 19:22:34 +00:00
|
|
|
// (All components Sphynx tracks)
|
2019-04-19 19:32:47 +00:00
|
|
|
client.notify(ServerMsg::InitialSync {
|
2019-04-17 19:22:34 +00:00
|
|
|
ecs_state: state.ecs().gen_state_package(),
|
2019-04-19 19:32:47 +00:00
|
|
|
player_entity_uid: state
|
2019-04-17 19:22:34 +00:00
|
|
|
.ecs()
|
|
|
|
.uid_from_entity(entity)
|
|
|
|
.unwrap()
|
|
|
|
.into(),
|
|
|
|
});
|
|
|
|
|
2019-04-17 20:26:11 +00:00
|
|
|
// Sync logical information other players have authority over, not the server
|
2019-04-17 20:32:36 +00:00
|
|
|
for (other_entity, &uid, &animation_history) in (
|
2019-04-22 08:20:25 +00:00
|
|
|
&state.ecs().entities(),
|
|
|
|
&state.ecs().read_storage::<common::state::Uid>(),
|
|
|
|
&state.ecs().read_storage::<comp::AnimationHistory>(),
|
2019-04-17 20:26:11 +00:00
|
|
|
).join() {
|
|
|
|
// AnimationHistory
|
|
|
|
client.postbox.send_message(ServerMsg::EntityAnimation {
|
|
|
|
entity: uid.into(),
|
2019-04-17 20:32:36 +00:00
|
|
|
animation_history: animation_history,
|
2019-04-17 20:26:11 +00:00
|
|
|
});
|
|
|
|
}
|
2019-04-19 19:32:47 +00:00
|
|
|
|
|
|
|
// Tell the client his request was successful
|
|
|
|
client.notify(ServerMsg::StateAnswer(Ok(ClientState::Spectator)));
|
|
|
|
client.client_state = ClientState::Spectator;
|
2019-04-17 19:22:34 +00:00
|
|
|
}
|
|
|
|
|
2019-03-04 19:50:26 +00:00
|
|
|
/// Sync client states with the most up to date information
|
|
|
|
fn sync_clients(&mut self) {
|
2019-04-14 20:30:27 +00:00
|
|
|
// Sync 'logical' state using Sphynx
|
2019-04-10 17:23:27 +00:00
|
|
|
self.clients.notify_connected(ServerMsg::EcsSync(self.state.ecs_mut().next_sync_package()));
|
2019-04-14 20:30:27 +00:00
|
|
|
|
|
|
|
// Sync 'physical' state
|
|
|
|
for (entity, &uid, &pos, &vel, &dir, force_update) in (
|
2019-04-22 08:20:25 +00:00
|
|
|
&self.state.ecs().entities(),
|
|
|
|
&self.state.ecs().read_storage::<Uid>(),
|
|
|
|
&self.state.ecs().read_storage::<comp::phys::Pos>(),
|
|
|
|
&self.state.ecs().read_storage::<comp::phys::Vel>(),
|
|
|
|
&self.state.ecs().read_storage::<comp::phys::Dir>(),
|
|
|
|
self.state.ecs().read_storage::<comp::phys::ForceUpdate>().maybe(),
|
2019-04-14 20:30:27 +00:00
|
|
|
).join() {
|
|
|
|
let msg = ServerMsg::EntityPhysics {
|
|
|
|
entity: uid.into(),
|
|
|
|
pos,
|
|
|
|
vel,
|
|
|
|
dir,
|
|
|
|
};
|
|
|
|
|
|
|
|
match force_update {
|
|
|
|
Some(_) => self.clients.notify_connected(msg),
|
|
|
|
None => self.clients.notify_connected_except(entity, msg),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-04-16 14:29:44 +00:00
|
|
|
// Sync animation states
|
2019-04-17 20:32:36 +00:00
|
|
|
for (entity, &uid, &animation_history) in (
|
2019-04-22 08:20:25 +00:00
|
|
|
&self.state.ecs().entities(),
|
|
|
|
&self.state.ecs().read_storage::<Uid>(),
|
|
|
|
&self.state.ecs().read_storage::<comp::AnimationHistory>(),
|
2019-04-16 14:29:44 +00:00
|
|
|
).join() {
|
2019-04-17 18:06:06 +00:00
|
|
|
// Check if we need to sync
|
2019-04-17 20:32:36 +00:00
|
|
|
if Some(animation_history.current) == animation_history.last {
|
2019-04-17 18:06:06 +00:00
|
|
|
continue;
|
2019-04-17 17:32:29 +00:00
|
|
|
}
|
2019-04-17 18:06:06 +00:00
|
|
|
|
|
|
|
self.clients.notify_connected_except(entity, ServerMsg::EntityAnimation {
|
|
|
|
entity: uid.into(),
|
2019-04-17 20:32:36 +00:00
|
|
|
animation_history,
|
2019-04-17 18:06:06 +00:00
|
|
|
});
|
2019-04-17 17:32:29 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// Update animation last/current state
|
2019-04-17 20:32:36 +00:00
|
|
|
for (entity, mut animation_history) in (
|
2019-04-22 08:20:25 +00:00
|
|
|
&self.state.ecs().entities(),
|
|
|
|
&mut self.state.ecs().write_storage::<comp::AnimationHistory>()
|
2019-04-17 17:32:29 +00:00
|
|
|
).join() {
|
2019-04-17 20:32:36 +00:00
|
|
|
animation_history.last = Some(animation_history.current);
|
2019-04-16 14:29:44 +00:00
|
|
|
}
|
|
|
|
|
2019-04-14 20:30:27 +00:00
|
|
|
// Remove all force flags
|
2019-04-22 08:20:25 +00:00
|
|
|
self.state.ecs_mut().write_storage::<comp::phys::ForceUpdate>().clear();
|
2019-03-04 19:50:26 +00:00
|
|
|
}
|
2019-04-10 23:41:37 +00:00
|
|
|
|
|
|
|
pub fn generate_chunk(&mut self, key: Vec3<i32>) {
|
|
|
|
if self.pending_chunks.insert(key) {
|
|
|
|
let chunk_tx = self.chunk_tx.clone();
|
2019-04-16 13:06:30 +00:00
|
|
|
self.thread_pool
|
|
|
|
.execute(move || chunk_tx.send((key, World::generate_chunk(key))).unwrap());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-04-16 15:38:01 +00:00
|
|
|
fn process_chat_cmd(&mut self, entity: EcsEntity, cmd: String) {
|
|
|
|
// separate string into keyword and arguments
|
2019-04-16 13:06:30 +00:00
|
|
|
let sep = cmd.find(' ');
|
|
|
|
let (kwd, args) = match sep {
|
|
|
|
Some(i) => (cmd[..i].to_string(), cmd[(i + 1)..].to_string()),
|
|
|
|
None => (cmd, "".to_string()),
|
|
|
|
};
|
2019-04-16 15:38:01 +00:00
|
|
|
|
|
|
|
// find command object and run its handler
|
2019-04-16 13:06:30 +00:00
|
|
|
let action_opt = CHAT_COMMANDS.iter().find(|x| x.keyword == kwd);
|
|
|
|
match action_opt {
|
2019-04-16 15:38:01 +00:00
|
|
|
Some(action) => action.execute(self, entity, args),
|
2019-04-16 13:06:30 +00:00
|
|
|
// unknown command
|
|
|
|
None => {
|
|
|
|
self.clients.notify(
|
|
|
|
entity,
|
|
|
|
ServerMsg::Chat(format!(
|
2019-04-16 15:14:43 +00:00
|
|
|
"Unrecognised command: '/{}'\ntype '/help' for a list of available commands",
|
2019-04-16 13:06:30 +00:00
|
|
|
kwd
|
|
|
|
)),
|
|
|
|
);
|
|
|
|
}
|
2019-04-10 23:41:37 +00:00
|
|
|
}
|
|
|
|
}
|
2019-01-02 17:23:31 +00:00
|
|
|
}
|
2019-03-05 18:39:18 +00:00
|
|
|
|
|
|
|
impl Drop for Server {
|
|
|
|
fn drop(&mut self) {
|
2019-04-10 17:23:27 +00:00
|
|
|
self.clients.notify_connected(ServerMsg::Shutdown);
|
2019-03-05 18:39:18 +00:00
|
|
|
}
|
|
|
|
}
|