From d0179cda697037bd9a7eebf148a047663db5cb3a Mon Sep 17 00:00:00 2001
From: SeanOMik <seanomik@gmail.com>
Date: Sun, 25 Feb 2024 17:42:14 -0500
Subject: [PATCH] scripting: get FreeFlyCamera working with ActionHandler
 created by Lua

---
 examples/testbed/src/free_fly_camera.rs | 12 ++++++------
 examples/testbed/src/main.rs            |  6 +++---
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/examples/testbed/src/free_fly_camera.rs b/examples/testbed/src/free_fly_camera.rs
index 63f8cc3..f4d7411 100644
--- a/examples/testbed/src/free_fly_camera.rs
+++ b/examples/testbed/src/free_fly_camera.rs
@@ -55,9 +55,9 @@ pub fn free_fly_camera_controller(delta_time: Res<DeltaTime>, handler: Res<Actio
         let left = cam.transform.left();
         let up = Vec3::Y;
 
-        let move_y = handler.get_axis_modifier(CommonActionLabel::MoveUpDown).unwrap_or(0.0);
-        let move_x = handler.get_axis_modifier(CommonActionLabel::MoveLeftRight).unwrap_or(0.0);
-        let move_z = handler.get_axis_modifier(CommonActionLabel::MoveForwardBackward).unwrap_or(0.0);
+        let move_y = handler.get_axis_modifier("MoveUpDown").unwrap_or(0.0);
+        let move_x = handler.get_axis_modifier("MoveLeftRight").unwrap_or(0.0);
+        let move_z = handler.get_axis_modifier("MoveForwardBackward").unwrap_or(0.0);
 
         let mut velocity = Vec3::ZERO;
         velocity += move_y * up;
@@ -68,9 +68,9 @@ pub fn free_fly_camera_controller(delta_time: Res<DeltaTime>, handler: Res<Actio
             cam.transform.translation += velocity.normalize() * fly.speed * delta_time; // TODO: speeding up
         }
 
-        let motion_x = handler.get_axis_modifier(CommonActionLabel::LookLeftRight).unwrap_or(0.0);
-        let motion_y = handler.get_axis_modifier(CommonActionLabel::LookUpDown).unwrap_or(0.0);
-        let motion_z = handler.get_axis_modifier(CommonActionLabel::LookRoll).unwrap_or(0.0);
+        let motion_x = handler.get_axis_modifier("LookLeftRight").unwrap_or(0.0);
+        let motion_y = handler.get_axis_modifier("LookUpDown").unwrap_or(0.0);
+        let motion_z = handler.get_axis_modifier("LookRoll").unwrap_or(0.0);
         
         let mut camera_rot = Vec3::ZERO;
         camera_rot.y -= motion_x * fly.mouse_sensitivity;
diff --git a/examples/testbed/src/main.rs b/examples/testbed/src/main.rs
index d9d840a..36db6dc 100644
--- a/examples/testbed/src/main.rs
+++ b/examples/testbed/src/main.rs
@@ -283,8 +283,8 @@ async fn main() {
             );
 
         let world = game.world_mut();
-        world.add_resource(action_handler);
-        game.with_plugin(InputActionPlugin); */
+        world.add_resource(action_handler); */
+        game.with_plugin(InputActionPlugin);
     };
 
     let script_test_plugin = |game: &mut Game| {
@@ -309,6 +309,6 @@ async fn main() {
         .with_plugin(script_test_plugin)
         //.with_plugin(fps_plugin)
         .with_plugin(jiggle_plugin)
-        //.with_plugin(FreeFlyCameraPlugin)
+        .with_plugin(FreeFlyCameraPlugin)
         .run().await;
 }