2020-03-09 03:32:34 +00:00
|
|
|
use super::SysTimer;
|
2020-05-14 16:56:10 +00:00
|
|
|
use crate::client::Client;
|
|
|
|
use common::{
|
|
|
|
comp::{Player, Pos, Waypoint, WaypointArea},
|
|
|
|
msg::{Notification, ServerMsg},
|
2020-08-29 06:39:16 +00:00
|
|
|
span,
|
2020-05-24 04:10:08 +00:00
|
|
|
state::Time,
|
2020-05-14 16:56:10 +00:00
|
|
|
};
|
2020-05-24 04:10:08 +00:00
|
|
|
use specs::{Entities, Join, Read, ReadStorage, System, Write, WriteStorage};
|
2020-01-25 12:27:36 +00:00
|
|
|
|
2020-05-24 04:10:08 +00:00
|
|
|
/// Cooldown time (in seconds) for "Waypoint Saved" notifications
|
|
|
|
const NOTIFY_TIME: f64 = 10.0;
|
2020-05-14 16:56:10 +00:00
|
|
|
|
2020-01-26 12:47:41 +00:00
|
|
|
/// This system updates player waypoints
|
|
|
|
/// TODO: Make this faster by only considering local waypoints
|
2020-01-25 12:27:36 +00:00
|
|
|
pub struct Sys;
|
|
|
|
impl<'a> System<'a> for Sys {
|
2020-06-10 19:47:36 +00:00
|
|
|
#[allow(clippy::type_complexity)] // TODO: Pending review in #587
|
2020-01-25 12:27:36 +00:00
|
|
|
type SystemData = (
|
|
|
|
Entities<'a>,
|
|
|
|
ReadStorage<'a, Pos>,
|
|
|
|
ReadStorage<'a, Player>,
|
|
|
|
ReadStorage<'a, WaypointArea>,
|
|
|
|
WriteStorage<'a, Waypoint>,
|
2020-05-14 16:56:10 +00:00
|
|
|
WriteStorage<'a, Client>,
|
2020-05-24 04:10:08 +00:00
|
|
|
Read<'a, Time>,
|
2020-03-09 03:32:34 +00:00
|
|
|
Write<'a, SysTimer<Self>>,
|
2020-01-25 12:27:36 +00:00
|
|
|
);
|
|
|
|
|
|
|
|
fn run(
|
|
|
|
&mut self,
|
2020-05-24 04:10:08 +00:00
|
|
|
(entities, positions, players, waypoint_areas, mut waypoints, mut clients, time, mut timer): Self::SystemData,
|
2020-01-25 12:27:36 +00:00
|
|
|
) {
|
2020-09-07 04:59:16 +00:00
|
|
|
span!(_guard, "run", "waypoint::Sys::run");
|
2020-03-09 03:32:34 +00:00
|
|
|
timer.start();
|
|
|
|
|
2020-05-14 16:56:10 +00:00
|
|
|
for (entity, player_pos, _, client) in
|
|
|
|
(&entities, &positions, &players, &mut clients).join()
|
|
|
|
{
|
2020-01-25 12:27:36 +00:00
|
|
|
for (waypoint_pos, waypoint_area) in (&positions, &waypoint_areas).join() {
|
2020-05-14 16:56:10 +00:00
|
|
|
if player_pos.0.distance_squared(waypoint_pos.0) < waypoint_area.radius().powi(2) {
|
2020-05-24 04:10:08 +00:00
|
|
|
if let Ok(wp_old) = waypoints.insert(entity, Waypoint::new(player_pos.0, *time))
|
|
|
|
{
|
|
|
|
if wp_old.map_or(true, |w| w.elapsed(*time) > NOTIFY_TIME) {
|
Redo Network Frontend.
Rather than having a single Stream to handle ALL data, seperate into multiple streams:
- Ping Stream, for seperate PINGS
- Register Stream, only used till the client is registered, then no longer used!
- General Stream, used for msg that can occur always
- NotInGame Stream, used for everything NOT ingame, e.g. Character Screen
- InGame Stream, used for all GAME data, players, terrain, entities, etc...
This version does compile, and gets the client registered (with auth too) but doesnt get to the char screen yet.
This fixes also the ignoring messages problem we had, as we are not sending data to the register stream!
This fixes also the problem that the server had to sleep for the Stream Creation, as the Server is now creating the streams and client has to sleep.
2020-10-04 18:20:18 +00:00
|
|
|
client.send_msg(ServerMsg::Notification(Notification::WaypointSaved));
|
2020-05-14 16:56:10 +00:00
|
|
|
}
|
|
|
|
}
|
2020-01-25 12:27:36 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2020-03-09 03:32:34 +00:00
|
|
|
|
|
|
|
timer.end();
|
2020-01-25 12:27:36 +00:00
|
|
|
}
|
|
|
|
}
|