From 6d57169875742ff598b7a36420bf30c5c17744c5 Mon Sep 17 00:00:00 2001 From: Imbris Date: Thu, 4 Jan 2024 00:01:08 -0500 Subject: [PATCH] review fixes --- Cargo.lock | 4 ++-- Cargo.toml | 2 +- common/state/src/state.rs | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 191b004dac..07cfe7aa8c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5768,7 +5768,7 @@ checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3" [[package]] name = "shred" version = "0.15.0" -source = "git+https://github.com/Imberflur/shred.git?rev=5d52c6fc390dd04c12158633e77591f6523d1f85#5d52c6fc390dd04c12158633e77591f6523d1f85" +source = "git+https://github.com/amethyst/shred.git?rev=5d52c6fc390dd04c12158633e77591f6523d1f85#5d52c6fc390dd04c12158633e77591f6523d1f85" dependencies = [ "ahash 0.8.7", "arrayvec 0.7.4", @@ -5782,7 +5782,7 @@ dependencies = [ [[package]] name = "shred-derive" version = "0.6.3" -source = "git+https://github.com/Imberflur/shred.git?rev=5d52c6fc390dd04c12158633e77591f6523d1f85#5d52c6fc390dd04c12158633e77591f6523d1f85" +source = "git+https://github.com/amethyst/shred.git?rev=5d52c6fc390dd04c12158633e77591f6523d1f85#5d52c6fc390dd04c12158633e77591f6523d1f85" dependencies = [ "proc-macro2 1.0.66", "quote 1.0.33", diff --git a/Cargo.toml b/Cargo.toml index f4ba4a7399..53665a2a94 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -165,7 +165,7 @@ winit = { git = "https://github.com/Imberflur/winit.git", tag = "raw-window-hand wgpu = { git = "https://github.com/pythonesque/wgpu.git", rev = "179ea209374a92837cde252f1d9ee01f628cae08" } # ntapi 3.7 fails to compile under windows due to the bug https://github.com/MSxDOS/ntapi/pull/12 ntapi = { git = "https://github.com/MSxDOS/ntapi.git", rev = "9f56b149c9e25796739157c0fce3e0007a7de6eb" } -shred = { git = "https://github.com/Imberflur/shred.git", rev = "5d52c6fc390dd04c12158633e77591f6523d1f85" } +shred = { git = "https://github.com/amethyst/shred.git", rev = "5d52c6fc390dd04c12158633e77591f6523d1f85" } [patch."https://github.com/gfx-rs/gfx"] gfx-hal = { git = "https://github.com/Imberflur/gfx.git", tag = "veloren-fixes-v1" } diff --git a/common/state/src/state.rs b/common/state/src/state.rs index 4f3967f577..4f380dd0f9 100644 --- a/common/state/src/state.rs +++ b/common/state/src/state.rs @@ -194,7 +194,6 @@ impl State { DispatcherBuilder::<'static, 'static>::new().with_pool(Arc::clone(&pools)); // TODO: Consider alternative ways to do this add_systems(&mut dispatch_builder); - // This dispatches all the systems in parallel. let dispatcher = dispatch_builder .build() .try_into_sendable() @@ -682,6 +681,7 @@ impl State { (dt.as_secs_f32() * time_scale as f32).min(MAX_DELTA_TIME); section_span!(guard, "run systems"); + // This dispatches all the systems in parallel. self.dispatcher.dispatch(&self.ecs); drop(guard);