*Chainer -> *Chain, if_() -> chain()

Author: CleanCut

CHANGELOG.md

@@ -3,7 +3,7 @@
 
 ## Added
 
-- Added `_do` variants to all of the `[just_]pressed[_any]` methods of `KeyboardState` and `MouseState`. These new variants accept closures to perform the logic, and can be chained. Contributed by [@just-do-halee](https://github.com/just-do-halee) in [#55].
+- Added `KeyboardStateChain` and `MouseStateChain` to provide a functional interface for dealing with user input. Call `.chain()` on  `KeyboardState` or `MouseState` to access them. These new structs have methods with the same names as in their `Chain`-less variants which accept closures to perform the logic, and can be chained. Contributed by [@just-do-halee](https://github.com/just-do-halee) in [#55].
 
 ## Improved
 

examples/keyboard_state.rs

@@ -33,42 +33,34 @@ fn logic(game_state: &mut Engine, _: &mut ()) {
 
     // Handle keyboard input
     let ks = &mut game_state.keyboard_state;
-    if ks.pressed_any(&[KeyCode::A, KeyCode::Left]) {
-        race_car.translation.x -= move_amount;
-    }
-    if ks.pressed_any(&[KeyCode::D, KeyCode::Right, KeyCode::E]) {
-        race_car.translation.x += move_amount;
-    }
-    if ks.pressed_any(&[KeyCode::O, KeyCode::Down, KeyCode::S]) {
-        race_car.translation.y -= move_amount;
-    }
     if ks.pressed_any(&[KeyCode::W, KeyCode::Up, KeyCode::Comma]) {
         race_car.translation.y += move_amount;
     }
-    if ks.pressed_any(&[KeyCode::Z, KeyCode::Semicolon]) {
-        race_car.rotation += rotation_amount;
-    }
-    if ks.pressed_any(&[KeyCode::C, KeyCode::J]) {
-        race_car.rotation -= rotation_amount;
+    if ks.pressed_any(&[KeyCode::A, KeyCode::Left]) {
+        race_car.translation.x -= move_amount;
     }
-    if ks.pressed_any(&[KeyCode::Plus, KeyCode::Equals]) {
-        race_car.scale *= 1.0 + scale_amount;
+    if ks.pressed_any(&[KeyCode::S, KeyCode::Down, KeyCode::O]) {
+        race_car.translation.y -= move_amount;
     }
-    if ks.pressed_any(&[KeyCode::Minus, KeyCode::Underline]) {
-        race_car.scale *= 1.0 - scale_amount;
+    if ks.pressed_any(&[KeyCode::D, KeyCode::Right, KeyCode::E]) {
+        race_car.translation.x += move_amount;
     }
 
-    // If you prefer a more functional style, there are also method `if_` that accept a
-    // closure to perform your logic with and are chainable, like this:
-    //
-    // ks.if_()
-    //     .pressed_any(&[KeyCode::A, KeyCode::Left], |_| {
-    //         race_car.translation.x -= move_amount;
-    //     })
-    //     .pressed_any(&[KeyCode::D, KeyCode::Right, KeyCode::E], |_| {
-    //         race_car.translation.x += move_amount;
-    //     });
-    //      ...etc
+    // If you prefer a more functional style that is equivalent to the kind of logic above,
+    // but takes closures to run if the buttons are pressed, you can call `.chain()`
+    ks.chain()
+        .pressed_any(&[KeyCode::Z, KeyCode::Semicolon], |_| {
+            race_car.rotation += rotation_amount;
+        })
+        .pressed_any(&[KeyCode::C, KeyCode::J], |_| {
+            race_car.rotation -= rotation_amount;
+        })
+        .pressed_any(&[KeyCode::Plus, KeyCode::Equals], |_| {
+            race_car.scale *= 1.0 + scale_amount;
+        })
+        .pressed_any(&[KeyCode::Minus, KeyCode::Underline], |_| {
+            race_car.scale *= 1.0 - scale_amount;
+        });
 
     // Clamp the scale to a certain range so the scaling is reasonable
     race_car.scale = race_car.scale.clamp(0.1, 3.0);

src/keyboard.rs

@@ -30,9 +30,9 @@ fn sync_keyboard_events(
     }
 }
 
-pub struct KeyboardStateChainer(KeyboardState);
+pub struct KeyboardStateChain(KeyboardState);
 
-impl KeyboardStateChainer {
+impl KeyboardStateChain {
     /// Calls the closure if a key is currently pressed
     #[inline]
     pub fn pressed(&self, key: KeyCode, mut then: impl FnMut(&KeyboardState)) -> &Self {
@@ -130,8 +130,8 @@ impl KeyboardState {
     pub fn just_released_any(&self, key_codes: &[KeyCode]) -> bool {
         key_codes.iter().any(|k| self.just_released(*k))
     }
-    pub fn if_(&self) -> KeyboardStateChainer {
-        KeyboardStateChainer(self.clone())
+    pub fn chain(&self) -> KeyboardStateChain {
+        KeyboardStateChain(self.clone())
     }
 }
 

src/mouse.rs

@@ -22,9 +22,9 @@ impl Plugin for MousePlugin {
     }
 }
 
-pub struct MouseStateChainer(MouseState);
+pub struct MouseStateChain(MouseState);
 
-impl MouseStateChainer {
+impl MouseStateChain {
     /// Calls the closure if the mouse button was pressed
     #[inline]
     pub fn pressed(&self, mouse_button: MouseButton, mut then: impl FnMut(&MouseState)) -> &Self {
@@ -172,8 +172,8 @@ impl MouseState {
     pub fn just_released_any(&self, mouse_buttons: &[MouseButton]) -> bool {
         mouse_buttons.iter().any(|k| self.just_released(*k))
     }
-    pub fn if_(&self) -> MouseStateChainer {
-        MouseStateChainer(self.clone())
+    pub fn chain(&self) -> MouseStateChain {
+        MouseStateChain(self.clone())
     }
 }