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

Implement a VSystem trait that can be implemented by Systems.

Browse Source 
It will autodo some things, like track start and time and export those in system metrics
Add a origin and implement it for all Systems in Veloren
This commit is contained in:
Marcel Märtens
2021-03-04 15:00:16 +01:00
parent b7079b454c
commit c515fece28
41 changed files with 871 additions and 218 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
common/sys/src/character_behavior.rs
View File

@ -1,6 +1,6 @@
use specs::{
shred::ResourceId, Entities, Join, LazyUpdate, Read, ReadExpect, ReadStorage, System,
SystemData, World, WriteStorage,
shred::ResourceId, Entities, Join, LazyUpdate, Read, ReadExpect, ReadStorage, SystemData,
World, WriteStorage,
};
use common::{
@ -15,12 +15,12 @@ use common::{
event::{EventBus, LocalEvent, ServerEvent},
metrics::SysMetrics,
resources::DeltaTime,
span,
states::{
self,
behavior::{CharacterBehavior, JoinData, JoinStruct},
},
uid::Uid,
vsystem::{Origin, Phase, VJob, VSystem},
};
use std::time::Duration;
@ -72,9 +72,10 @@ pub struct ReadData<'a> {
/// ## Character Behavior System
/// Passes `JoinData` to `CharacterState`'s `behavior` handler fn's. Receives a
/// `StateUpdate` in return and performs updates to ECS Components from that.
#[derive(Default)]
pub struct Sys;
impl<'a> System<'a> for Sys {
impl<'a> VSystem<'a> for Sys {
#[allow(clippy::type_complexity)]
type SystemData = (
ReadData<'a>,
@ -88,9 +89,13 @@ impl<'a> System<'a> for Sys {
WriteStorage<'a, Poise>,
);
const NAME: &'static str = "character_behavior";
const ORIGIN: Origin = Origin::Common;
const PHASE: Phase = Phase::Create;
#[allow(clippy::while_let_on_iterator)] // TODO: Pending review in #587
fn run(
&mut self,
_job: &mut VJob<Self>,
(
read_data,
mut character_states,
@ -104,7 +109,6 @@ impl<'a> System<'a> for Sys {
): Self::SystemData,
) {
let start_time = std::time::Instant::now();
span!(_guard, "run", "character_behavior::Sys::run");
let mut server_emitter = read_data.server_bus.emitter();
let mut local_emitter = read_data.local_bus.emitter();