Merge pull request #67 from johanhelsing/bevy-time

Use Bevy abstractions instead of using `instant` directly

Cargo.toml

@@ -18,7 +18,7 @@ wasm-bindgen = ["instant/wasm-bindgen", "ggrs/wasm-bindgen"]
 [dependencies]
 bevy = { version = "0.11", default-features = false}
 bytemuck = { version = "1.7", features=["derive"]}
-instant = "0.1"
+instant = { version = "0.1", optional = true }
 log = "0.4"
 ggrs = { version= "0.9.4", features=["sync-send"]}
 #ggrs = { git = "https://github.com/gschup/ggrs", features=["sync-send"]}

src/ggrs_stage.rs

@@ -3,26 +3,27 @@ use crate::{
     FixedTimestepData, GgrsSchedule, LocalInputs, LocalPlayers, PlayerInputs, ReadInputs,
     RollbackFrameCount, RollbackTypeRegistry, Session,
 };
-use bevy::prelude::*;
+use bevy::{prelude::*, utils::Duration};
 use ggrs::{
     Config, GGRSError, GGRSRequest, GameStateCell, InputStatus, P2PSession, SessionState,
     SpectatorSession, SyncTestSession,
 };
-use instant::{Duration, Instant};
 
 pub(crate) fn run<T: Config>(world: &mut World) {
     let mut time_data = world
         .remove_resource::<FixedTimestepData>()
         .expect("failed to extract GGRS FixedTimeStepData");
 
-    // get delta time from last run() call and accumulate it
-    let delta = Instant::now().duration_since(time_data.last_update);
+    let delta = world
+        .get_resource::<Time>()
+        .expect("Time resource not found, did you remove it?")
+        .delta();
+
     let mut fps_delta = 1. / time_data.fps as f64;
     if time_data.run_slow {
         fps_delta *= 1.1;
     }
     time_data.accumulator = time_data.accumulator.saturating_add(delta);
-    time_data.last_update = Instant::now();
 
     // no matter what, poll remotes and send responses
     if let Some(mut session) = world.get_resource_mut::<Session<T>>() {
@@ -57,7 +58,6 @@ pub(crate) fn run<T: Config>(world: &mut World) {
             Some(Session::Spectator(s)) => run_spectator(world, s),
             _ => {
                 // No session has been started yet, reset time data and snapshots
-                time_data.last_update = Instant::now();
                 time_data.accumulator = Duration::ZERO;
                 time_data.run_slow = false;
                 world.insert_resource(LocalPlayers::default());

src/lib.rs

@@ -5,10 +5,9 @@ use bevy::{
     ecs::schedule::{LogLevel, ScheduleBuildSettings, ScheduleLabel},
     prelude::*,
     reflect::{FromType, GetTypeRegistration, TypeRegistry, TypeRegistryInternal},
-    utils::HashMap,
+    utils::{Duration, HashMap},
 };
 use ggrs::{Config, InputStatus, P2PSession, PlayerHandle, SpectatorSession, SyncTestSession};
-use instant::{Duration, Instant};
 use parking_lot::RwLock;
 use std::{marker::PhantomData, sync::Arc};
 use world_snapshot::RollbackSnapshots;
@@ -50,8 +49,6 @@ pub struct PlayerInputs<T: Config>(Vec<(T::Input, InputStatus)>);
 struct FixedTimestepData {
     /// fixed FPS our logic is running with
     pub fps: usize,
-    /// internal time control variables
-    last_update: Instant,
     /// accumulated time. once enough time has been accumulated, an update is executed
     accumulator: Duration,
     /// boolean to see if we should run slow to let remote clients catch up
@@ -62,7 +59,6 @@ impl Default for FixedTimestepData {
     fn default() -> Self {
         Self {
             fps: DEFAULT_FPS,
-            last_update: Instant::now(),
             accumulator: Duration::ZERO,
             run_slow: false,
         }

tests/entity_mapping.rs

@@ -1,8 +1,9 @@
-use bevy::{prelude::*, utils::HashMap};
-
+use bevy::{
+    prelude::*,
+    utils::{Duration, HashMap},
+};
 use bevy_ggrs::*;
 use ggrs::*;
-use instant::Duration;
 
 pub struct GgrsConfig;
 impl Config for GgrsConfig {