Apply suggestions from @UkoeHB

projectharmonia · Oct 2, 2023 · 27f0084 · 27f0084
1 parent 108c817
commit 27f0084
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 24 deletions.
diff --git a/benches/replication.rs b/benches/replication.rs
@@ -157,7 +157,7 @@ fn replication(c: &mut Criterion) {
 fn setup_app(app: &mut App) {
     app.add_plugins((
         MinimalPlugins,
-        ReplicationPlugins.set(ServerPlugin::new(TickPolicy::Manual)),
+        ReplicationPlugins.set(ServerPlugin::new(TickPolicy::EveryFrame)),
     ))
     .replicate::<DummyComponent>();
 

diff --git a/src/server.rs b/src/server.rs
@@ -80,14 +80,23 @@ impl Plugin for ServerPlugin {
             ),
         );
 
-        if let TickPolicy::MaxTickRate(max_tick_rate) = self.tick_policy {
-            let tick_time = Duration::from_millis(1000 / max_tick_rate as u64);
-            app.add_systems(
-                PostUpdate,
-                Self::increment_tick
-                    .before(Self::diffs_sending_system)
-                    .run_if(on_timer(tick_time)),
-            );
+        match self.tick_policy {
+            TickPolicy::MaxTickRate(max_tick_rate) => {
+                let tick_time = Duration::from_millis(1000 / max_tick_rate as u64);
+                app.add_systems(
+                    PostUpdate,
+                    Self::increment_tick
+                        .before(Self::diffs_sending_system)
+                        .run_if(on_timer(tick_time)),
+                );
+            }
+            TickPolicy::EveryFrame => {
+                app.add_systems(
+                    PostUpdate,
+                    Self::increment_tick.before(Self::diffs_sending_system),
+                );
+            }
+            TickPolicy::Manual => (),
         }
     }
 }
@@ -386,6 +395,8 @@ pub enum TickPolicy {
     ///
     /// By default it's 30 updates per second.
     MaxTickRate(u16),
+    /// Send updates from server every frame.
+    EveryFrame,
     /// [`ServerSet::Send`] should be manually configured.
     Manual,
 }

diff --git a/tests/common/mod.rs b/tests/common/mod.rs
@@ -47,8 +47,7 @@ pub(super) fn connect(server_app: &mut App, client_app: &mut App) {
 
     server_app
         .insert_resource(server)
-        .insert_resource(server_transport)
-        .add_systems(Update, ServerPlugin::increment_tick); // Increment tick every frame per `TickPolicy::Manual`.
+        .insert_resource(server_transport);
 
     client_app
         .insert_resource(client)

diff --git a/tests/replication.rs b/tests/replication.rs
@@ -13,7 +13,7 @@ fn acked_ticks_cleanup() {
     for app in [&mut server_app, &mut client_app] {
         app.add_plugins((
             MinimalPlugins,
-            ReplicationPlugins.set(ServerPlugin::new(TickPolicy::Manual)),
+            ReplicationPlugins.set(ServerPlugin::new(TickPolicy::EveryFrame)),
         ));
     }
 
@@ -38,7 +38,7 @@ fn tick_acks_receiving() {
     for app in [&mut server_app, &mut client_app] {
         app.add_plugins((
             MinimalPlugins,
-            ReplicationPlugins.set(ServerPlugin::new(TickPolicy::Manual)),
+            ReplicationPlugins.set(ServerPlugin::new(TickPolicy::EveryFrame)),
         ));
     }
 
@@ -63,7 +63,7 @@ fn spawn_replication() {
     for app in [&mut server_app, &mut client_app] {
         app.add_plugins((
             MinimalPlugins,
-            ReplicationPlugins.set(ServerPlugin::new(TickPolicy::Manual)),
+            ReplicationPlugins.set(ServerPlugin::new(TickPolicy::EveryFrame)),
         ))
         .replicate::<TableComponent>();
     }
@@ -100,7 +100,7 @@ fn insert_replication() {
     for app in [&mut server_app, &mut client_app] {
         app.add_plugins((
             MinimalPlugins,
-            ReplicationPlugins.set(ServerPlugin::new(TickPolicy::Manual)),
+            ReplicationPlugins.set(ServerPlugin::new(TickPolicy::EveryFrame)),
         ))
         .replicate::<TableComponent>()
         .replicate::<SparseSetComponent>()
@@ -155,7 +155,7 @@ fn removal_replication() {
     for app in [&mut server_app, &mut client_app] {
         app.add_plugins((
             MinimalPlugins,
-            ReplicationPlugins.set(ServerPlugin::new(TickPolicy::Manual)),
+            ReplicationPlugins.set(ServerPlugin::new(TickPolicy::EveryFrame)),
         ))
         .replicate::<TableComponent>();
     }
@@ -199,7 +199,7 @@ fn despawn_replication() {
     for app in [&mut server_app, &mut client_app] {
         app.add_plugins((
             MinimalPlugins,
-            ReplicationPlugins.set(ServerPlugin::new(TickPolicy::Manual)),
+            ReplicationPlugins.set(ServerPlugin::new(TickPolicy::EveryFrame)),
         ));
     }
 

diff --git a/tests/server_event.rs b/tests/server_event.rs
@@ -34,7 +34,7 @@ fn sending_receiving() {
     for app in [&mut server_app, &mut client_app] {
         app.add_plugins((
             MinimalPlugins,
-            ReplicationPlugins.set(ServerPlugin::new(TickPolicy::Manual)),
+            ReplicationPlugins.set(ServerPlugin::new(TickPolicy::EveryFrame)),
         ))
         .add_server_event::<DummyEvent>(SendPolicy::Ordered);
     }
@@ -79,7 +79,7 @@ fn sending_receiving_and_mapping() {
     for app in [&mut server_app, &mut client_app] {
         app.add_plugins((
             MinimalPlugins,
-            ReplicationPlugins.set(ServerPlugin::new(TickPolicy::Manual)),
+            ReplicationPlugins.set(ServerPlugin::new(TickPolicy::EveryFrame)),
         ))
         .add_mapped_server_event::<DummyEvent>(SendPolicy::Ordered);
     }
@@ -120,7 +120,7 @@ fn sending_receiving_reflect() {
     for app in [&mut server_app, &mut client_app] {
         app.add_plugins((
             MinimalPlugins,
-            ReplicationPlugins.set(ServerPlugin::new(TickPolicy::Manual)),
+            ReplicationPlugins.set(ServerPlugin::new(TickPolicy::EveryFrame)),
         ))
         .register_type::<ReflectedValue>()
         .add_server_reflect_event::<ReflectEvent, ReflectEventSerializer, ReflectEventDeserializer>(
@@ -171,7 +171,7 @@ fn sending_receiving_and_mapping_reflect() {
     for app in [&mut server_app, &mut client_app] {
         app.add_plugins((
             MinimalPlugins,
-            ReplicationPlugins.set(ServerPlugin::new(TickPolicy::Manual)),
+            ReplicationPlugins.set(ServerPlugin::new(TickPolicy::EveryFrame)),
         ))
         .register_type::<ReflectedValue>()
         .add_mapped_server_reflect_event::<ReflectEvent, ReflectEventSerializer, ReflectEventDeserializer>(SendPolicy::Ordered);
@@ -214,10 +214,9 @@ fn local_resending() {
     let mut app = App::new();
     app.add_plugins((
         TimePlugin,
-        ReplicationPlugins.set(ServerPlugin::new(TickPolicy::Manual)),
+        ReplicationPlugins.set(ServerPlugin::new(TickPolicy::EveryFrame)),
     ))
-    .add_server_event::<DummyEvent>(SendPolicy::Ordered)
-    .add_systems(Update, ServerPlugin::increment_tick); // Increment tick every frame per `TickPolicy::Manual`.
+    .add_server_event::<DummyEvent>(SendPolicy::Ordered);
 
     const DUMMY_CLIENT_ID: u64 = 1;
     for (mode, events_count) in [