[game] enabled wasd controls for the car (not just arrows) so that th…

…e control scheme doesn't change when switching from the camera to the car view and vice versa
PanosK92 · Dec 2, 2024 · bd489ef · bd489ef
1 parent 1f166c5
commit bd489ef
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/runtime/Game/Car.cpp b/runtime/Game/Car.cpp
@@ -671,7 +671,7 @@ namespace Spartan
                 m_parameters.break_until_opposite_torque = false;
             }
 
-            if (Input::GetKey(KeyCode::Arrow_Up) || Input::GetGamepadTriggerRight() != 0.0f)
+            if (Input::GetKey(KeyCode::W) || Input::GetKey(KeyCode::Arrow_Up) || Input::GetGamepadTriggerRight() != 0.0f)
             {
                 if (m_parameters.movement_direction == CarMovementState::Backward)
                 {
@@ -682,7 +682,7 @@ namespace Spartan
                     m_parameters.throttle = 1.0f;
                 }
             }
-            else if (Input::GetKey(KeyCode::Arrow_Down) || Input::GetGamepadTriggerLeft() != 0.0f)
+            else if (Input::GetKey(KeyCode::S) || Input::GetKey(KeyCode::Arrow_Down) || Input::GetGamepadTriggerLeft() != 0.0f)
             {
                 if (m_parameters.movement_direction == CarMovementState::Forward)
                 {
@@ -706,11 +706,11 @@ namespace Spartan
         {
             float steering_angle_target = 0.0f;
 
-            if (Input::GetKey(KeyCode::Arrow_Left) || Input::GetGamepadThumbStickLeft().x < 0.0f)
+            if (Input::GetKey(KeyCode::A) || Input::GetKey(KeyCode::Arrow_Left) || Input::GetGamepadThumbStickLeft().x < 0.0f)
             {
                 steering_angle_target = -tuning::steering_angle_max;
             }
-            else if (Input::GetKey(KeyCode::Arrow_Right) || Input::GetGamepadThumbStickLeft().x > 0.0f)
+            else if (Input::GetKey(KeyCode::D) || Input::GetKey(KeyCode::Arrow_Right) || Input::GetGamepadThumbStickLeft().x > 0.0f)
             {
                 steering_angle_target = tuning::steering_angle_max;
             }
@@ -768,7 +768,7 @@ namespace Spartan
             m_parameters.body->applyCentralForce(drag_bullet);
         }
 
-        // breaking
+        // braking
         {
             float breaking = Input::GetKey(KeyCode::Space) ? 1.0f : 0.0f;
             breaking       = m_parameters.break_until_opposite_torque ? 1.0f : breaking;

diff --git a/runtime/Game/Game.cpp b/runtime/Game/Game.cpp
@@ -1098,14 +1098,14 @@ namespace Spartan
                     // the camera is a child of physics capsule
                     bool outside_the_car = m_default_physics_body_camera->GetChildrenCount() != 0;
 
-                    if (outside_the_car)
+                    if (outside_the_car) // move inside
                     {
                         Entity* camera = m_default_physics_body_camera->GetChildByName("component_camera");
                         camera->SetParent(m_default_car);
                         camera->SetPositionLocal(Vector3(0.5f, 1.8f, -0.6f));
                         camera->SetRotationLocal(Quaternion::Identity);
                     }
-                    else
+                    else // move outside
                     {
                         Entity* camera = m_default_car->GetChildByName("component_camera");
                         camera->SetParent(m_default_physics_body_camera);