From ed561d7f70f37f441b686540a822d77cf9f7d15c Mon Sep 17 00:00:00 2001
From: Carter Anderson <mcanders1@gmail.com>
Date: Thu, 4 Jun 2020 23:49:36 -0700
Subject: [PATCH] break up input examples

---
 Cargo.toml                                    | 16 +++++++++----
 .../{input_keyboard.rs => keyboard_input.rs}  | 12 ++++++----
 examples/input/keyboard_input_events.rs       | 24 +++++++++++++++++++
 examples/input/mouse_input.rs                 | 19 +++++++++++++++
 .../{input_mouse.rs => mouse_input_events.rs} | 17 +++----------
 5 files changed, 65 insertions(+), 23 deletions(-)
 rename examples/input/{input_keyboard.rs => keyboard_input.rs} (87%)
 create mode 100644 examples/input/keyboard_input_events.rs
 create mode 100644 examples/input/mouse_input.rs
 rename examples/input/{input_mouse.rs => mouse_input_events.rs} (68%)

diff --git a/Cargo.toml b/Cargo.toml
index 8eeaaa45b3..d176a76302 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -152,12 +152,20 @@ name = "ecs_guide"
 path = "examples/ecs/ecs_guide.rs"
 
 [[example]]
-name = "input_mouse"
-path = "examples/input/input_mouse.rs"
+name = "mouse_input"
+path = "examples/input/mouse_input.rs"
 
 [[example]]
-name = "input_keyboard"
-path = "examples/input/input_keyboard.rs"
+name = "mouse_input_events"
+path = "examples/input/mouse_input_events.rs"
+
+[[example]]
+name = "keyboard_input"
+path = "examples/input/keyboard_input.rs"
+
+[[example]]
+name = "keyboard_input_events"
+path = "examples/input/keyboard_input_events.rs"
 
 [[example]]
 name = "load_scene"
diff --git a/examples/input/input_keyboard.rs b/examples/input/keyboard_input.rs
similarity index 87%
rename from examples/input/input_keyboard.rs
rename to examples/input/keyboard_input.rs
index 35f517cce6..62c37e4911 100644
--- a/examples/input/input_keyboard.rs
+++ b/examples/input/keyboard_input.rs
@@ -1,5 +1,7 @@
-use bevy::{input::keyboard::KeyCode, prelude::*};
-use bevy_input::Input;
+use bevy::{
+    input::{keyboard::KeyCode, Input},
+    prelude::*,
+};
 
 fn main() {
     App::build()
@@ -9,7 +11,7 @@ fn main() {
         .run();
 }
 
-/// moves our cube left when the "left" key is pressed. moves it right when the "right" key is pressed
+/// This system moves our cube left when the "left" key is pressed and moves it right when the "right" key is pressed
 fn move_on_input(
     world: &mut SubWorld,
     time: Res<Time>,
@@ -39,7 +41,7 @@ fn move_on_input(
     }
 }
 
-/// creates a simple scene
+/// Creates a simple scene containing the cube we will be controlling
 fn setup(
     command_buffer: &mut CommandBuffer,
     mut meshes: ResMut<Assets<Mesh>>,
@@ -68,7 +70,7 @@ fn setup(
         // camera
         .add_entity(PerspectiveCameraEntity {
             local_to_world: LocalToWorld::new_sync_disabled(Mat4::look_at_rh(
-                Vec3::new(3.0, 8.0, 5.0),
+                Vec3::new(0.0, 8.0, 5.0),
                 Vec3::new(0.0, 0.0, 0.0),
                 Vec3::new(0.0, 0.0, 1.0),
             )),
diff --git a/examples/input/keyboard_input_events.rs b/examples/input/keyboard_input_events.rs
new file mode 100644
index 0000000000..90dbf4ac2a
--- /dev/null
+++ b/examples/input/keyboard_input_events.rs
@@ -0,0 +1,24 @@
+use bevy::{input::keyboard::KeyboardInput, prelude::*};
+
+fn main() {
+    App::build()
+        .add_default_plugins()
+        .init_resource::<State>()
+        .add_system(print_keyboard_event_system.system())
+        .run();
+}
+
+#[derive(Default)]
+struct State {
+    event_reader: EventReader<KeyboardInput>,
+}
+
+/// This system prints out all mouse events as they come in
+fn print_keyboard_event_system(
+    mut state: ResMut<State>,
+    keyboard_input_events: Res<Events<KeyboardInput>>,
+) {
+    for event in state.event_reader.iter(&keyboard_input_events) {
+        println!("{:?}", event);
+    }
+}
diff --git a/examples/input/mouse_input.rs b/examples/input/mouse_input.rs
new file mode 100644
index 0000000000..427552f043
--- /dev/null
+++ b/examples/input/mouse_input.rs
@@ -0,0 +1,19 @@
+use bevy::prelude::*;
+
+fn main() {
+    App::build()
+        .add_default_plugins()
+        .add_system(mouse_click_system.system())
+        .run();
+}
+
+// This system prints messages when you press or release the left mouse button:
+fn mouse_click_system(mouse_button_input: Res<Input<MouseButton>>) {
+    if mouse_button_input.just_pressed(MouseButton::Left) {
+        println!("left mouse clicked");
+    }
+
+    if mouse_button_input.just_released(MouseButton::Left) {
+        println!("left mouse released");
+    }
+}
diff --git a/examples/input/input_mouse.rs b/examples/input/mouse_input_events.rs
similarity index 68%
rename from examples/input/input_mouse.rs
rename to examples/input/mouse_input_events.rs
index 1fa2e529cc..59ac5d174a 100644
--- a/examples/input/input_mouse.rs
+++ b/examples/input/mouse_input_events.rs
@@ -8,21 +8,10 @@ fn main() {
     App::build()
         .add_default_plugins()
         .init_resource::<State>()
-        .add_system(mouse_click_system.system())
-        .add_system(mouse_input_event_system.system())
+        .add_system(print_mouse_events_system.system())
         .run();
 }
 
-fn mouse_click_system(mouse_button_input: Res<Input<MouseButton>>) {
-    if mouse_button_input.just_pressed(MouseButton::Left) {
-        println!("left mouse clicked");
-    }
-
-    if mouse_button_input.just_released(MouseButton::Left) {
-        println!("left mouse released");
-    }
-}
-
 #[derive(Default)]
 struct State {
     mouse_button_event_reader: EventReader<MouseButtonInput>,
@@ -30,8 +19,8 @@ struct State {
     cursor_moved_event_reader: EventReader<CursorMoved>,
 }
 
-/// prints out all mouse events as they come in
-fn mouse_input_event_system(
+/// This system prints out all mouse events as they come in
+fn print_mouse_events_system(
     mut state: ResMut<State>,
     mouse_button_input_events: Res<Events<MouseButtonInput>>,
     mouse_motion_events: Res<Events<MouseMotion>>,