Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

include origin into system name

Browse Source
This commit is contained in:
Marcel Märtens 2021-04-07 01:20:26 +02:00
parent 425063e24e
commit 485a477503
3 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
common/ecs/src/system.rs
View File

@ -30,6 +30,17 @@ pub enum Origin {
Frontend(&'static str),
}
impl Origin {
fn name(&self) -> &'static str {
match self {
Origin::Common => "Common",
Origin::Client => "Client",
Origin::Server => "Server",
Origin::Frontend(name) => name,
}
}
}
#[derive(Default, Debug, Clone)]
pub struct CpuTimeline {
/// measurements for a System
@ -234,7 +245,7 @@ pub trait System<'a> {
type SystemData: specs::SystemData<'a>;
fn run(job: &mut Job<Self>, data: Self::SystemData);
fn sys_name() -> String { format!("{}_sys", Self::NAME) }
fn sys_name() -> String { format!("{}_{}_sys", Self::ORIGIN.name(), Self::NAME) }
}
pub fn dispatch<'a, 'b, T>(builder: &mut specs::DispatcherBuilder<'a, 'b>, dep: &[&str])

1
common/sys/src/lib.rs
View File

@ -19,6 +19,7 @@ use common_ecs::{dispatch, System};
use specs::DispatcherBuilder;
pub fn add_local_systems(dispatch_builder: &mut DispatcherBuilder) {
//TODO: don't run interpolation on server
dispatch::<interpolation::Sys>(dispatch_builder, &[]);
dispatch::<mount::Sys>(dispatch_builder, &[]);
dispatch::<controller::Sys>(dispatch_builder, &[&mount::Sys::sys_name()]);

5
server/src/sys/mod.rs
View File

@ -12,7 +12,7 @@ pub mod terrain_sync;
pub mod waypoint;
use common_ecs::{dispatch, run_now, System};
use common_sys::{interpolation, melee, projectile};
use common_sys::{melee, projectile};
use specs::DispatcherBuilder;
use std::{
marker::PhantomData,
@ -23,7 +23,8 @@ pub type PersistenceScheduler = SysScheduler<persistence::Sys>;
pub fn add_server_systems(dispatch_builder: &mut DispatcherBuilder) {
dispatch::<melee::Sys>(dispatch_builder, &[&projectile::Sys::sys_name()]);
dispatch::<agent::Sys>(dispatch_builder, &[&interpolation::Sys::sys_name()]);
//Note: server should not depend on interpolation system
dispatch::<agent::Sys>(dispatch_builder, &[]);
dispatch::<terrain::Sys>(dispatch_builder, &[]);
dispatch::<waypoint::Sys>(dispatch_builder, &[]);
dispatch::<invite_timeout::Sys>(dispatch_builder, &[]);