Added camera controls LOOK_LEFT+LOOK_RIGHT

Renamed LOOKBACK to LOOK_BACK Changed toggle order: instead of resetting to front view first and then toggling the direction, the direction is toggled immediatelly and only a second press resets view to front. Note: LOOK_LEFT+LOOK_RIGHT have no default bindings because all numpad keys are taken.
RigsOfRods · Mar 11, 2024 · 181bb1b · 181bb1b
1 parent 847476a
commit 181bb1b
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 13 deletions.
diff --git a/source/main/gfx/camera/CameraManager.cpp b/source/main/gfx/camera/CameraManager.cpp
@@ -813,19 +813,26 @@ bool CameraManager::CameraBehaviorStaticMouseMoved(const OIS::MouseEvent& _arg)
     return false;
 }
 
-void CameraManager::CameraBehaviorOrbitUpdate()
+void CameraManager::CameraBehaviorOrbitToggleAngle(events ev, Ogre::Degree angle)
 {
-    if (RoR::App::GetInputEngine()->getEventBoolValueBounce(EV_CAMERA_LOOKBACK))
+    if (RoR::App::GetInputEngine()->getEventBoolValueBounce(ev))
     {
-        if (m_cam_rot_x > Degree(0))
+        if (m_cam_rot_x != angle)
         {
-            m_cam_rot_x = Degree(0);
+            m_cam_rot_x = angle;
         }
         else
         {
-            m_cam_rot_x = Degree(180);
+            m_cam_rot_x = Degree(0);
         }
     }
+}
+
+void CameraManager::CameraBehaviorOrbitUpdate()
+{
+    this->CameraBehaviorOrbitToggleAngle(EV_CAMERA_LOOK_BACK, Degree(180));
+    this->CameraBehaviorOrbitToggleAngle(EV_CAMERA_LOOK_LEFT, Degree(270));
+    this->CameraBehaviorOrbitToggleAngle(EV_CAMERA_LOOK_RIGHT, Degree(90));
 
     if (App::io_invert_orbitcam->getBool() && this->GetCurrentBehavior() != CameraManager::CAMERA_BEHAVIOR_VEHICLE_CINECAM)
     {
@@ -960,13 +967,13 @@ bool CameraManager::CameraBehaviorOrbitMouseMoved(const OIS::MouseEvent& _arg)
 
         if (App::io_invert_orbitcam->getBool() && this->GetCurrentBehavior() != CameraManager::CAMERA_BEHAVIOR_VEHICLE_CINECAM)
         {
-            m_cam_rot_x += Degree(ms.X.rel * -0.13f);
-            m_cam_rot_y += Degree(-ms.Y.rel * -0.13f);
+            m_cam_rot_x += Degree(_arg.state.X.rel * -0.13f);
+            m_cam_rot_y += Degree(-_arg.state.Y.rel * -0.13f);
         }
         else
         {
-            m_cam_rot_x += Degree(ms.X.rel * 0.13f);
-            m_cam_rot_y += Degree(-ms.Y.rel * 0.13f);
+            m_cam_rot_x += Degree(_arg.state.X.rel * 0.13f);
+            m_cam_rot_y += Degree(-_arg.state.Y.rel * 0.13f);
         }
         return true;
     }

diff --git a/source/main/gfx/camera/CameraManager.h b/source/main/gfx/camera/CameraManager.h
@@ -22,6 +22,7 @@
 #pragma once
 
 #include "Application.h"
+#include "InputEngine.h"
 
 #include <OIS.h>
 #include <Ogre.h>
@@ -101,6 +102,7 @@ class CameraManager
     void CameraBehaviorOrbitReset();
     bool CameraBehaviorOrbitMouseMoved(const OIS::MouseEvent& _arg);
     void CameraBehaviorOrbitUpdate();
+    void CameraBehaviorOrbitToggleAngle(RoR::events ev, Ogre::Degree angle);
 
     Ogre::Camera*        m_camera;
     Ogre::SceneNode*     m_camera_node;

diff --git a/source/main/scripting/bindings/InputEngineAngelscript.cpp b/source/main/scripting/bindings/InputEngineAngelscript.cpp
@@ -108,7 +108,9 @@ void registerEventTypeEnum(asIScriptEngine* engine)
     result = engine->RegisterEnumValue("inputEvents", "EV_CAMERA_DOWN",                    EV_CAMERA_DOWN                ); ROR_ASSERT(result >= 0);
     result = engine->RegisterEnumValue("inputEvents", "EV_CAMERA_FREE_MODE",               EV_CAMERA_FREE_MODE           ); ROR_ASSERT(result >= 0);
     result = engine->RegisterEnumValue("inputEvents", "EV_CAMERA_FREE_MODE_FIX",           EV_CAMERA_FREE_MODE_FIX       ); ROR_ASSERT(result >= 0);
-    result = engine->RegisterEnumValue("inputEvents", "EV_CAMERA_LOOKBACK",                EV_CAMERA_LOOKBACK            ); ROR_ASSERT(result >= 0);
+    result = engine->RegisterEnumValue("inputEvents", "EV_CAMERA_LOOK_BACK",               EV_CAMERA_LOOK_BACK             ); ROR_ASSERT(result >= 0);
+    result = engine->RegisterEnumValue("inputEvents", "EV_CAMERA_LOOK_LEFT",               EV_CAMERA_LOOK_LEFT             ); ROR_ASSERT(result >= 0);
+    result = engine->RegisterEnumValue("inputEvents", "EV_CAMERA_LOOK_RIGHT",              EV_CAMERA_LOOK_RIGHT            ); ROR_ASSERT(result >= 0);
     result = engine->RegisterEnumValue("inputEvents", "EV_CAMERA_RESET",                   EV_CAMERA_RESET               ); ROR_ASSERT(result >= 0);
     result = engine->RegisterEnumValue("inputEvents", "EV_CAMERA_ROTATE_DOWN",             EV_CAMERA_ROTATE_DOWN         ); ROR_ASSERT(result >= 0);
     result = engine->RegisterEnumValue("inputEvents", "EV_CAMERA_ROTATE_LEFT",             EV_CAMERA_ROTATE_LEFT         ); ROR_ASSERT(result >= 0);

diff --git a/source/main/utils/InputEngine.cpp b/source/main/utils/InputEngine.cpp
@@ -337,7 +337,9 @@ InputEvent eventInfo[] = {
 
     // Camera
     {"CAMERA_CHANGE",                 EV_CAMERA_CHANGE,                 "Keyboard EXPL+C",              _LC("InputEvent", "change camera mode")},
-    {"CAMERA_LOOKBACK",               EV_CAMERA_LOOKBACK,               "Keyboard NUMPAD1",             _LC("InputEvent", "look back (toggles between normal and lookback)")},
+    {"CAMERA_LOOK_BACK",              EV_CAMERA_LOOK_BACK,              "Keyboard NUMPAD1",             _LC("InputEvent", "look back (toggles between normal and lookback)")},
+    {"CAMERA_LOOK_LEFT",              EV_CAMERA_LOOK_LEFT,              "",                             _LC("InputEvent", "look left (toggles between normal and lookleft)")},
+    {"CAMERA_LOOK_RIGHT",             EV_CAMERA_LOOK_RIGHT,             "",                             _LC("InputEvent", "look right (toggles between normal and lookright)")},
     {"CAMERA_RESET",                  EV_CAMERA_RESET,                  "Keyboard NUMPAD5",             _LC("InputEvent", "reset the camera position")},
     {"CAMERA_ROTATE_DOWN",            EV_CAMERA_ROTATE_DOWN,            "Keyboard NUMPAD2",             _LC("InputEvent", "rotate camera down")},
     {"CAMERA_ROTATE_LEFT",            EV_CAMERA_ROTATE_LEFT,            "Keyboard NUMPAD4",             _LC("InputEvent", "rotate camera left")},

diff --git a/source/main/utils/InputEngine.h b/source/main/utils/InputEngine.h
@@ -115,8 +115,10 @@ enum events
     EV_CAMERA_DOWN,
     EV_CAMERA_FREE_MODE,
     EV_CAMERA_FREE_MODE_FIX,
-    EV_CAMERA_LOOKBACK,          //!< look back (toggles between normal and lookback)
-    EV_CAMERA_RESET,             //!< reset the camera position
+    EV_CAMERA_LOOK_BACK,         //!< look back (toggles between normal and lookback)
+    EV_CAMERA_LOOK_LEFT,         //!< look left (toggles between normal and lookleft)
+    EV_CAMERA_LOOK_RIGHT,        //!< look right (toggles between normal and lookright)
+    EV_CAMERA_RESET,             //!< reset the camera position/rotation
     EV_CAMERA_ROTATE_DOWN,       //!< rotate camera down
     EV_CAMERA_ROTATE_LEFT,       //!< rotate camera left
     EV_CAMERA_ROTATE_RIGHT,      //!< rotate camera right