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

fix tracy

Browse Source
This commit is contained in:
Marcel Märtens 2021-03-11 10:25:59 +01:00
parent a98e72c391
commit 381bb5eef0
6 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server-cli/src/main.rs
View File

@ -210,7 +210,7 @@ fn main() -> io::Result<()> {
// Wait for the next tick. // Wait for the next tick.
clock.tick(); clock.tick();
#[cfg(feature = "tracy")] #[cfg(feature = "tracy")]
common_base::finish_continuous_frame!(); common_base::tracy_client::finish_continuous_frame!();
} }
Ok(()) Ok(())

3
server/src/events/group_manip.rs
View File

@ -1,4 +1,4 @@
use crate::{client::Client, Server, State}; use crate::{client::Client, Server};
use common::{ use common::{
comp::{ comp::{
self, self,
@ -9,6 +9,7 @@ use common::{
uid::Uid, uid::Uid,
}; };
use common_net::{msg::ServerGeneral, sync::WorldSyncExt}; use common_net::{msg::ServerGeneral, sync::WorldSyncExt};
use common_sys::state::State;
use specs::{ use specs::{
world::{Entity, WorldExt}, world::{Entity, WorldExt},
ReadStorage, WriteStorage, ReadStorage, WriteStorage,

4
server/src/lib.rs
View File

@ -75,8 +75,10 @@ use common_net::{
sync::WorldSyncExt, sync::WorldSyncExt,
}; };
#[cfg(feature = "plugins")] #[cfg(feature = "plugins")]
use common_sys::plugin::memory_manager::EcsWorld;
#[cfg(feature = "plugins")]
use common_sys::plugin::PluginMgr; use common_sys::plugin::PluginMgr;
use common_sys::{plugin::memory_manager::EcsWorld, state::State}; use common_sys::state::State;
use metrics::{EcsSystemMetrics, PhysicsMetrics, TickMetrics}; use metrics::{EcsSystemMetrics, PhysicsMetrics, TickMetrics};
use network::{Network, Pid, ProtocolAddr}; use network::{Network, Pid, ProtocolAddr};
use persistence::{ use persistence::{

1
server/src/login_provider.rs
View File

@ -1,6 +1,7 @@
use crate::settings::BanRecord; use crate::settings::BanRecord;
use authc::{AuthClient, AuthClientError, AuthToken, Uuid}; use authc::{AuthClient, AuthClientError, AuthToken, Uuid};
use common_net::msg::RegisterError; use common_net::msg::RegisterError;
#[cfg(feature = "plugins")]
use common_sys::plugin::memory_manager::EcsWorld; use common_sys::plugin::memory_manager::EcsWorld;
#[cfg(feature = "plugins")] #[cfg(feature = "plugins")]
use common_sys::plugin::PluginMgr; use common_sys::plugin::PluginMgr;

8
server/src/sys/msg/register.rs
View File

@ -18,11 +18,17 @@ use plugin_api::Health;
use specs::{Entities, Join, Read, ReadExpect, ReadStorage, WriteExpect, WriteStorage}; use specs::{Entities, Join, Read, ReadExpect, ReadStorage, WriteExpect, WriteStorage};
use tracing::trace; use tracing::trace;
#[cfg(feature = "plugins")]
use common_sys::plugin::memory_manager::EcsWorld; use common_sys::plugin::memory_manager::EcsWorld;
#[cfg(feature = "plugins")] #[cfg(feature = "plugins")]
use common_sys::plugin::PluginMgr; use common_sys::plugin::PluginMgr;
#[cfg(feature = "plugins")]
type ReadPlugin<'a> = Read<'a, PluginMgr>;
#[cfg(not(feature = "plugins"))]
type ReadPlugin<'a> = Option<Read<'a, ()>>;
/// This system will handle new messages from clients /// This system will handle new messages from clients
#[derive(Default)] #[derive(Default)]
pub struct Sys; pub struct Sys;
@ -37,7 +43,7 @@ impl<'a> System<'a> for Sys {
WriteStorage<'a, Player>, WriteStorage<'a, Player>,
WriteStorage<'a, PendingLogin>, WriteStorage<'a, PendingLogin>,
Read<'a, UidAllocator>, Read<'a, UidAllocator>,
Read<'a, PluginMgr>, ReadPlugin<'a>,
ReadStorage<'a, Stats>, ReadStorage<'a, Stats>,
WriteExpect<'a, LoginProvider>, WriteExpect<'a, LoginProvider>,
WriteStorage<'a, Admin>, WriteStorage<'a, Admin>,

2
voxygen/src/run.rs
View File

@ -183,7 +183,7 @@ fn handle_main_events_cleared(
global_state.clock.tick(); global_state.clock.tick();
drop(guard); drop(guard);
#[cfg(feature = "tracy")] #[cfg(feature = "tracy")]
common::util::tracy_client::finish_continuous_frame!(); common_base::tracy_client::finish_continuous_frame!();
// Maintain global state. // Maintain global state.
global_state.maintain(global_state.clock.dt()); global_state.maintain(global_state.clock.dt());