2021-03-08 08:36:53 +00:00
|
|
|
use super::sentinel::{DeletedEntities, ReadTrackers, TrackedComps};
|
2019-10-15 04:06:14 +00:00
|
|
|
use crate::{
|
2020-10-30 16:39:53 +00:00
|
|
|
client::Client,
|
|
|
|
presence::{Presence, RegionSubscription},
|
2019-10-15 04:06:14 +00:00
|
|
|
Tick,
|
|
|
|
};
|
|
|
|
use common::{
|
2021-03-16 00:11:02 +00:00
|
|
|
comp::{Collider, ForceUpdate, Inventory, InventoryUpdate, Last, Ori, Pos, Vel},
|
2020-07-31 17:16:20 +00:00
|
|
|
outcome::Outcome,
|
2019-10-15 04:06:14 +00:00
|
|
|
region::{Event as RegionEvent, RegionMap},
|
2020-12-01 00:28:00 +00:00
|
|
|
resources::TimeOfDay,
|
2020-07-31 17:16:20 +00:00
|
|
|
terrain::TerrainChunkSize,
|
2020-12-13 17:40:15 +00:00
|
|
|
uid::Uid,
|
2020-08-06 16:41:43 +00:00
|
|
|
vol::RectVolSize,
|
2019-10-15 04:06:14 +00:00
|
|
|
};
|
2021-03-08 22:40:02 +00:00
|
|
|
use common_ecs::{Job, Origin, Phase, System};
|
2020-12-13 17:11:55 +00:00
|
|
|
use common_net::{msg::ServerGeneral, sync::CompSyncPackage};
|
2021-03-16 02:49:33 +00:00
|
|
|
use specs::{Entities, Join, Read, ReadExpect, ReadStorage, Write, WriteStorage};
|
2020-07-31 17:16:20 +00:00
|
|
|
use vek::*;
|
2019-10-15 04:06:14 +00:00
|
|
|
|
|
|
|
/// This system will send physics updates to the client
|
2021-03-04 14:00:16 +00:00
|
|
|
#[derive(Default)]
|
2019-10-15 04:06:14 +00:00
|
|
|
pub struct Sys;
|
2021-03-08 11:13:59 +00:00
|
|
|
impl<'a> System<'a> for Sys {
|
2021-03-08 08:36:53 +00:00
|
|
|
#[allow(clippy::type_complexity)]
|
2019-10-15 04:06:14 +00:00
|
|
|
type SystemData = (
|
|
|
|
Entities<'a>,
|
|
|
|
Read<'a, Tick>,
|
2019-12-18 05:22:52 +00:00
|
|
|
ReadExpect<'a, TimeOfDay>,
|
2019-10-15 04:06:14 +00:00
|
|
|
ReadExpect<'a, RegionMap>,
|
|
|
|
ReadStorage<'a, Uid>,
|
|
|
|
ReadStorage<'a, Pos>,
|
|
|
|
ReadStorage<'a, Vel>,
|
|
|
|
ReadStorage<'a, Ori>,
|
|
|
|
ReadStorage<'a, Inventory>,
|
|
|
|
ReadStorage<'a, RegionSubscription>,
|
2020-10-30 16:39:53 +00:00
|
|
|
ReadStorage<'a, Presence>,
|
2021-03-16 00:11:02 +00:00
|
|
|
ReadStorage<'a, Collider>,
|
2019-10-15 04:06:14 +00:00
|
|
|
WriteStorage<'a, Last<Pos>>,
|
|
|
|
WriteStorage<'a, Last<Vel>>,
|
|
|
|
WriteStorage<'a, Last<Ori>>,
|
2020-11-02 18:30:56 +00:00
|
|
|
ReadStorage<'a, Client>,
|
2019-10-15 04:06:14 +00:00
|
|
|
WriteStorage<'a, ForceUpdate>,
|
|
|
|
WriteStorage<'a, InventoryUpdate>,
|
2019-11-29 06:04:37 +00:00
|
|
|
Write<'a, DeletedEntities>,
|
2020-07-31 17:16:20 +00:00
|
|
|
Write<'a, Vec<Outcome>>,
|
2019-11-04 00:57:36 +00:00
|
|
|
TrackedComps<'a>,
|
|
|
|
ReadTrackers<'a>,
|
2019-10-15 04:06:14 +00:00
|
|
|
);
|
|
|
|
|
2021-03-04 14:00:16 +00:00
|
|
|
const NAME: &'static str = "entity_sync";
|
|
|
|
const ORIGIN: Origin = Origin::Server;
|
|
|
|
const PHASE: Phase = Phase::Create;
|
|
|
|
|
2019-10-15 04:06:14 +00:00
|
|
|
fn run(
|
2021-03-08 11:13:59 +00:00
|
|
|
_job: &mut Job<Self>,
|
2019-10-15 04:06:14 +00:00
|
|
|
(
|
|
|
|
entities,
|
|
|
|
tick,
|
2019-12-18 05:22:52 +00:00
|
|
|
time_of_day,
|
2019-10-15 04:06:14 +00:00
|
|
|
region_map,
|
|
|
|
uids,
|
|
|
|
positions,
|
|
|
|
velocities,
|
|
|
|
orientations,
|
|
|
|
inventories,
|
|
|
|
subscriptions,
|
2020-10-30 16:39:53 +00:00
|
|
|
presences,
|
2021-03-16 00:11:02 +00:00
|
|
|
colliders,
|
2019-10-15 04:06:14 +00:00
|
|
|
mut last_pos,
|
|
|
|
mut last_vel,
|
|
|
|
mut last_ori,
|
2020-11-02 18:30:56 +00:00
|
|
|
clients,
|
2019-10-15 04:06:14 +00:00
|
|
|
mut force_updates,
|
|
|
|
mut inventory_updates,
|
2019-11-29 06:04:37 +00:00
|
|
|
mut deleted_entities,
|
2020-07-31 17:16:20 +00:00
|
|
|
mut outcomes,
|
2019-11-04 00:57:36 +00:00
|
|
|
tracked_comps,
|
2019-11-29 06:04:37 +00:00
|
|
|
trackers,
|
2019-10-15 04:06:14 +00:00
|
|
|
): Self::SystemData,
|
|
|
|
) {
|
|
|
|
let tick = tick.0;
|
|
|
|
// To send entity updates
|
|
|
|
// 1. Iterate through regions
|
|
|
|
// 2. Iterate through region subscribers (ie clients)
|
2020-02-01 20:39:39 +00:00
|
|
|
// - Collect a list of entity ids for clients who are subscribed to this
|
|
|
|
// region (hash calc to check each)
|
2019-10-15 04:06:14 +00:00
|
|
|
// 3. Iterate through events from that region
|
2020-02-01 20:39:39 +00:00
|
|
|
// - For each entity entered event, iterate through the client list and
|
|
|
|
// check if they are subscribed to the source (hash calc per subscribed
|
|
|
|
// client per entity event), if not subscribed to the source send a entity
|
|
|
|
// creation message to that client
|
|
|
|
// - For each entity left event, iterate through the client list and check
|
|
|
|
// if they are subscribed to the destination (hash calc per subscribed
|
|
|
|
// client per entity event)
|
2019-10-15 04:06:14 +00:00
|
|
|
// 4. Iterate through entities in that region
|
|
|
|
// 5. Inform clients of the component changes for that entity
|
|
|
|
// - Throttle update rate base on distance to each client
|
|
|
|
|
|
|
|
// Sync physics
|
|
|
|
// via iterating through regions
|
|
|
|
for (key, region) in region_map.iter() {
|
2020-02-01 20:39:39 +00:00
|
|
|
// Assemble subscriber list for this region by iterating through clients and
|
|
|
|
// checking if they are subscribed to this region
|
2020-10-16 19:37:28 +00:00
|
|
|
let mut subscribers = (
|
2020-11-02 18:30:56 +00:00
|
|
|
&clients,
|
2020-10-16 19:37:28 +00:00
|
|
|
&entities,
|
2020-10-30 16:39:53 +00:00
|
|
|
presences.maybe(),
|
2020-10-16 19:37:28 +00:00
|
|
|
&subscriptions,
|
|
|
|
&positions,
|
|
|
|
)
|
2019-10-15 04:06:14 +00:00
|
|
|
.join()
|
2020-11-02 18:30:56 +00:00
|
|
|
.filter_map(|(client, entity, presence, subscription, pos)| {
|
|
|
|
if presence.is_some() && subscription.regions.contains(&key) {
|
|
|
|
Some((client, &subscription.regions, entity, *pos))
|
|
|
|
} else {
|
|
|
|
None
|
|
|
|
}
|
|
|
|
})
|
2019-10-15 04:06:14 +00:00
|
|
|
.collect::<Vec<_>>();
|
|
|
|
|
|
|
|
for event in region.events() {
|
|
|
|
match event {
|
2019-10-25 05:35:15 +00:00
|
|
|
RegionEvent::Entered(id, maybe_key) => {
|
2019-11-29 06:04:37 +00:00
|
|
|
// Don't process newly created entities here (redundant network messages)
|
|
|
|
if trackers.uid.inserted().contains(*id) {
|
|
|
|
continue;
|
|
|
|
}
|
2019-10-25 05:35:15 +00:00
|
|
|
let entity = entities.entity(*id);
|
2020-03-20 14:45:36 +00:00
|
|
|
if let Some((_uid, pos, vel, ori)) = uids.get(entity).and_then(|uid| {
|
2020-03-18 21:00:07 +00:00
|
|
|
positions.get(entity).map(|pos| {
|
|
|
|
(uid, pos, velocities.get(entity), orientations.get(entity))
|
2019-10-25 05:35:15 +00:00
|
|
|
})
|
2020-03-18 21:00:07 +00:00
|
|
|
}) {
|
2020-10-07 10:31:49 +00:00
|
|
|
let create_msg =
|
|
|
|
ServerGeneral::CreateEntity(tracked_comps.create_entity_package(
|
2020-03-18 21:00:07 +00:00
|
|
|
entity,
|
|
|
|
Some(*pos),
|
|
|
|
vel.copied(),
|
|
|
|
ori.copied(),
|
2020-10-07 10:31:49 +00:00
|
|
|
));
|
2020-11-02 18:30:56 +00:00
|
|
|
for (client, regions, client_entity, _) in &mut subscribers {
|
2019-10-25 05:35:15 +00:00
|
|
|
if maybe_key
|
|
|
|
.as_ref()
|
|
|
|
.map(|key| !regions.contains(key))
|
|
|
|
.unwrap_or(true)
|
2019-11-04 00:57:36 +00:00
|
|
|
// Client doesn't need to know about itself
|
2019-10-26 02:00:30 +00:00
|
|
|
&& *client_entity != entity
|
2019-10-25 05:35:15 +00:00
|
|
|
{
|
2020-11-02 18:30:56 +00:00
|
|
|
client.send_fallible(create_msg.clone());
|
2019-10-25 05:35:15 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2020-02-01 20:39:39 +00:00
|
|
|
},
|
2019-10-15 04:06:14 +00:00
|
|
|
RegionEvent::Left(id, maybe_key) => {
|
|
|
|
// Lookup UID for entity
|
|
|
|
if let Some(&uid) = uids.get(entities.entity(*id)) {
|
2020-11-02 18:30:56 +00:00
|
|
|
for (client, regions, _, _) in &mut subscribers {
|
2019-10-25 05:35:15 +00:00
|
|
|
if maybe_key
|
2019-10-15 04:06:14 +00:00
|
|
|
.as_ref()
|
2019-10-25 05:35:15 +00:00
|
|
|
.map(|key| !regions.contains(key))
|
|
|
|
.unwrap_or(true)
|
2019-10-15 04:06:14 +00:00
|
|
|
{
|
2020-11-02 18:30:56 +00:00
|
|
|
client.send_fallible(ServerGeneral::DeleteEntity(uid));
|
2019-10-15 04:06:14 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2020-02-01 20:39:39 +00:00
|
|
|
},
|
2019-10-15 04:06:14 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-11-04 00:57:36 +00:00
|
|
|
// Sync tracked components
|
2019-11-29 06:04:37 +00:00
|
|
|
// Get deleted entities in this region from DeletedEntities
|
2020-03-18 21:00:07 +00:00
|
|
|
let (entity_sync_package, comp_sync_package) = trackers.create_sync_packages(
|
|
|
|
&tracked_comps,
|
|
|
|
region.entities(),
|
|
|
|
deleted_entities
|
|
|
|
.take_deleted_in_region(key)
|
2020-06-11 18:44:03 +00:00
|
|
|
.unwrap_or_default(),
|
2019-11-04 00:57:36 +00:00
|
|
|
);
|
2020-10-18 23:53:19 +00:00
|
|
|
let mut entity_sync_package = Some(entity_sync_package);
|
|
|
|
let mut comp_sync_package = Some(comp_sync_package);
|
|
|
|
let mut entity_sync_lazymsg = None;
|
|
|
|
let mut comp_sync_lazymsg = None;
|
2020-11-02 18:30:56 +00:00
|
|
|
subscribers.iter_mut().for_each(move |(client, _, _, _)| {
|
|
|
|
if entity_sync_lazymsg.is_none() {
|
|
|
|
entity_sync_lazymsg = Some(client.prepare(ServerGeneral::EntitySync(
|
|
|
|
entity_sync_package.take().unwrap(),
|
|
|
|
)));
|
|
|
|
comp_sync_lazymsg = Some(
|
|
|
|
client.prepare(ServerGeneral::CompSync(comp_sync_package.take().unwrap())),
|
|
|
|
);
|
|
|
|
}
|
|
|
|
entity_sync_lazymsg
|
|
|
|
.as_ref()
|
|
|
|
.map(|msg| client.send_prepared(&msg));
|
|
|
|
comp_sync_lazymsg
|
|
|
|
.as_ref()
|
|
|
|
.map(|msg| client.send_prepared(&msg));
|
|
|
|
});
|
2019-10-15 04:06:14 +00:00
|
|
|
|
2021-03-16 02:49:33 +00:00
|
|
|
for (client, _, client_entity, client_pos) in &mut subscribers {
|
|
|
|
let mut comp_sync_package = CompSyncPackage::new();
|
|
|
|
|
|
|
|
for (_, entity, &uid, &pos, vel, ori, force_update, collider) in (
|
|
|
|
region.entities(),
|
|
|
|
&entities,
|
|
|
|
&uids,
|
|
|
|
&positions,
|
|
|
|
velocities.maybe(),
|
|
|
|
orientations.maybe(),
|
|
|
|
force_updates.maybe(),
|
|
|
|
colliders.maybe(),
|
|
|
|
)
|
|
|
|
.join()
|
|
|
|
{
|
|
|
|
// Decide how regularly to send physics updates.
|
|
|
|
let send_now = if client_entity == &entity {
|
2019-11-29 06:04:37 +00:00
|
|
|
// Don't send client physics updates about itself unless force update is set
|
|
|
|
force_update.is_some()
|
2021-03-16 02:49:33 +00:00
|
|
|
} else if matches!(collider, Some(Collider::Voxel { .. })) {
|
|
|
|
// Things with a voxel collider (airships, etc.) need to have very stable
|
|
|
|
// physics so we always send updated for these where
|
|
|
|
// we can.
|
2019-11-04 00:57:36 +00:00
|
|
|
true
|
|
|
|
} else {
|
2021-03-16 02:49:33 +00:00
|
|
|
// Throttle update rates for all other entities based on distance to client
|
2019-11-04 00:57:36 +00:00
|
|
|
let distance_sq = client_pos.0.distance_squared(pos.0);
|
2020-03-18 21:00:07 +00:00
|
|
|
let id_staggered_tick = tick + entity.id() as u64;
|
2021-03-16 02:49:33 +00:00
|
|
|
|
2019-11-04 00:57:36 +00:00
|
|
|
// More entities farther away so checks start there
|
2021-03-16 00:11:02 +00:00
|
|
|
if distance_sq > 350.0f32.powi(2) {
|
|
|
|
id_staggered_tick % 64 == 0
|
|
|
|
} else if distance_sq > 180.0f32.powi(2) {
|
2020-03-18 21:00:07 +00:00
|
|
|
id_staggered_tick % 32 == 0
|
2021-03-16 00:11:02 +00:00
|
|
|
} else if distance_sq > 100.0f32.powi(2) {
|
2020-03-18 21:00:07 +00:00
|
|
|
id_staggered_tick % 16 == 0
|
2021-03-16 00:11:02 +00:00
|
|
|
} else if distance_sq > 48.0f32.powi(2) {
|
2020-03-18 21:00:07 +00:00
|
|
|
id_staggered_tick % 8 == 0
|
2021-03-16 00:11:02 +00:00
|
|
|
} else if distance_sq > 24.0f32.powi(2) {
|
2020-03-18 21:00:07 +00:00
|
|
|
id_staggered_tick % 4 == 0
|
2019-11-04 00:57:36 +00:00
|
|
|
} else {
|
2021-03-16 00:11:02 +00:00
|
|
|
id_staggered_tick % 3 == 0
|
2019-10-15 04:06:14 +00:00
|
|
|
}
|
2021-03-16 02:49:33 +00:00
|
|
|
};
|
2021-03-13 23:36:48 +00:00
|
|
|
|
2021-03-16 12:19:42 +00:00
|
|
|
if last_pos.get(entity).is_none() {
|
|
|
|
comp_sync_package.comp_inserted(uid, pos);
|
|
|
|
let _ = last_pos.insert(entity, Last(pos));
|
|
|
|
} else if send_now {
|
|
|
|
comp_sync_package.comp_modified(uid, pos);
|
|
|
|
}
|
2019-10-15 04:06:14 +00:00
|
|
|
|
2021-03-16 12:19:42 +00:00
|
|
|
vel.map(|v| {
|
|
|
|
if last_vel.get(entity).is_none() {
|
|
|
|
comp_sync_package.comp_inserted(uid, *v);
|
|
|
|
let _ = last_vel.insert(entity, Last(*v));
|
|
|
|
} else if send_now {
|
|
|
|
comp_sync_package.comp_modified(uid, *v);
|
|
|
|
}
|
|
|
|
});
|
2019-10-15 04:06:14 +00:00
|
|
|
|
2021-03-16 12:19:42 +00:00
|
|
|
ori.map(|o| {
|
|
|
|
if last_ori.get(entity).is_none() {
|
|
|
|
comp_sync_package.comp_inserted(uid, *o);
|
|
|
|
let _ = last_ori.insert(entity, Last(*o));
|
|
|
|
} else if send_now {
|
|
|
|
comp_sync_package.comp_modified(uid, *o);
|
|
|
|
}
|
|
|
|
});
|
2021-03-16 00:11:02 +00:00
|
|
|
}
|
|
|
|
|
2021-03-16 02:49:33 +00:00
|
|
|
client.send_fallible(ServerGeneral::CompSync(comp_sync_package));
|
2019-10-15 04:06:14 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-02-01 20:39:39 +00:00
|
|
|
// Handle entity deletion in regions that don't exist in RegionMap
|
|
|
|
// (theoretically none)
|
2019-11-29 06:04:37 +00:00
|
|
|
for (region_key, deleted) in deleted_entities.take_remaining_deleted() {
|
2020-11-02 18:30:56 +00:00
|
|
|
for client in (presences.maybe(), &subscriptions, &clients)
|
2020-10-16 19:37:28 +00:00
|
|
|
.join()
|
2020-11-02 18:30:56 +00:00
|
|
|
.filter_map(|(presence, subscription, client)| {
|
2020-10-30 16:39:53 +00:00
|
|
|
if presence.is_some() && subscription.regions.contains(®ion_key) {
|
2020-11-02 18:30:56 +00:00
|
|
|
Some(client)
|
2020-10-16 19:37:28 +00:00
|
|
|
} else {
|
|
|
|
None
|
|
|
|
}
|
|
|
|
})
|
2019-11-29 06:04:37 +00:00
|
|
|
{
|
|
|
|
for uid in &deleted {
|
2020-11-02 18:30:56 +00:00
|
|
|
client.send_fallible(ServerGeneral::DeleteEntity(Uid(*uid)));
|
2019-11-29 06:04:37 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-11-04 00:57:36 +00:00
|
|
|
// TODO: Sync clients that don't have a position?
|
|
|
|
|
2019-10-15 04:06:14 +00:00
|
|
|
// Sync inventories
|
2020-11-02 18:30:56 +00:00
|
|
|
for (inventory, update, client) in (&inventories, &inventory_updates, &clients).join() {
|
|
|
|
client.send_fallible(ServerGeneral::InventoryUpdate(
|
2020-03-04 10:09:48 +00:00
|
|
|
inventory.clone(),
|
|
|
|
update.event(),
|
|
|
|
));
|
2019-10-15 04:06:14 +00:00
|
|
|
}
|
|
|
|
|
2020-07-31 17:16:20 +00:00
|
|
|
// Sync outcomes
|
2020-11-02 18:30:56 +00:00
|
|
|
for (presence, pos, client) in (presences.maybe(), positions.maybe(), &clients).join() {
|
2020-08-06 16:41:43 +00:00
|
|
|
let is_near = |o_pos: Vec3<f32>| {
|
2020-10-30 16:39:53 +00:00
|
|
|
pos.zip_with(presence, |pos, presence| {
|
2020-08-06 16:41:43 +00:00
|
|
|
pos.0.xy().distance_squared(o_pos.xy())
|
2020-10-30 16:39:53 +00:00
|
|
|
< (presence.view_distance as f32 * TerrainChunkSize::RECT_SIZE.x as f32)
|
2020-11-25 00:28:24 +00:00
|
|
|
.powi(2)
|
2020-08-06 16:41:43 +00:00
|
|
|
})
|
|
|
|
};
|
2020-07-31 17:16:20 +00:00
|
|
|
|
|
|
|
let outcomes = outcomes
|
|
|
|
.iter()
|
|
|
|
.filter(|o| o.get_pos().and_then(&is_near).unwrap_or(true))
|
|
|
|
.cloned()
|
|
|
|
.collect::<Vec<_>>();
|
2020-08-17 09:08:11 +00:00
|
|
|
if !outcomes.is_empty() {
|
2020-11-02 18:30:56 +00:00
|
|
|
client.send_fallible(ServerGeneral::Outcomes(outcomes));
|
2020-07-31 17:16:20 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
outcomes.clear();
|
|
|
|
|
2019-10-15 04:06:14 +00:00
|
|
|
// Remove all force flags.
|
|
|
|
force_updates.clear();
|
|
|
|
inventory_updates.clear();
|
2019-10-20 07:20:21 +00:00
|
|
|
|
2019-11-04 00:57:36 +00:00
|
|
|
// Sync resources
|
2020-02-01 20:39:39 +00:00
|
|
|
// TODO: doesn't really belong in this system (rename system or create another
|
|
|
|
// system?)
|
2020-10-18 23:53:19 +00:00
|
|
|
let mut tof_lazymsg = None;
|
2020-11-02 18:30:56 +00:00
|
|
|
for client in (&clients).join() {
|
2020-10-18 23:53:19 +00:00
|
|
|
if tof_lazymsg.is_none() {
|
2020-11-02 18:30:56 +00:00
|
|
|
tof_lazymsg = Some(client.prepare(ServerGeneral::TimeOfDay(*time_of_day)));
|
2020-10-18 23:53:19 +00:00
|
|
|
}
|
2020-11-02 18:30:56 +00:00
|
|
|
tof_lazymsg.as_ref().map(|msg| client.send_prepared(&msg));
|
2019-11-04 00:57:36 +00:00
|
|
|
}
|
2019-10-15 04:06:14 +00:00
|
|
|
}
|
|
|
|
}
|