Require UserAction bound for InputPlugin (#665)

* Require UserAction bound for InputPlugin because otherwise it gives terrible errors * Fix warning in simple_box
cBournhonesque · Oct 7, 2024 · 56970e1 · 56970e1
1 parent 7bca1d8
commit 56970e1
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/examples/simple_box/src/client.rs b/examples/simple_box/src/client.rs
@@ -140,7 +140,7 @@ fn player_movement(
     for input in input_reader.read() {
         if let Some(input) = input.input() {
             //No need to iterate the position when the input is None
-            if (input == &Inputs::None) {
+            if input == &Inputs::None {
                 continue;
             }
             for position in position_query.iter_mut() {

diff --git a/lightyear/src/client/input/native.rs b/lightyear/src/client/input/native.rs
@@ -115,7 +115,7 @@ impl Default for InputConfig {
     }
 }
 
-pub struct InputPlugin<A> {
+pub struct InputPlugin<A: UserAction> {
     config: InputConfig,
     _marker: std::marker::PhantomData<A>,
 }

diff --git a/lightyear/src/server/input/native.rs b/lightyear/src/server/input/native.rs
@@ -13,7 +13,7 @@ use crate::server::events::InputEvent;
 use crate::shared::replication::network_target::NetworkTarget;
 use crate::shared::sets::{InternalMainSet, ServerMarker};
 
-pub struct InputPlugin<A> {
+pub struct InputPlugin<A: UserAction> {
     _marker: std::marker::PhantomData<A>,
 }
 
@@ -32,7 +32,7 @@ impl<A> Default for InputBuffers<A> {
     }
 }
 
-impl<A> Default for InputPlugin<A> {
+impl<A: UserAction> Default for InputPlugin<A> {
     fn default() -> Self {
         Self {
             _marker: std::marker::PhantomData,

diff --git a/lightyear/src/shared/input/native.rs b/lightyear/src/shared/input/native.rs
@@ -8,11 +8,11 @@ use crate::prelude::{MessageRegistry, UserAction};
 use crate::protocol::message::MessageType;
 use crate::server::config::ServerConfig;
 
-pub struct InputPlugin<A> {
+pub struct InputPlugin<A: UserAction> {
     _marker: std::marker::PhantomData<A>,
 }
 
-impl<A> Default for InputPlugin<A> {
+impl<A: UserAction> Default for InputPlugin<A> {
     fn default() -> Self {
         Self {
             _marker: std::marker::PhantomData,