Controller menu navigation & limit camera rotation

ChangeLog.md

@@ -2,6 +2,10 @@
 
 ## OpenRaider (0.1.3) xythobuz <xythobuz@xythobuz.de>
 
+    [ 20140213 ]
+    * The menu can be navigated using a controller
+    * Vertical camera rotation is now also clamped when using a controller
+
     [ 20140211 ]
     * Updated imgui to version 1.32
     * Included some SDL game controller configurations

include/Camera.h

@@ -21,7 +21,6 @@ class Camera {
     static void handleAction(ActionEvents action, bool isFinished);
     static void handleMouseMotion(int x, int y);
     static void handleControllerAxis(float value, KeyboardButton axis);
-    static void handleControllerButton(KeyboardButton button, bool released);
 
     //! \fixme The Y axis seems to be the source of all evil?
     static void setPosition(glm::vec3 p) { pos = glm::vec3(p.x, -p.y, p.z); }

include/Game.h

@@ -23,7 +23,6 @@ class Game {
     static void handleAction(ActionEvents action, bool isFinished);
     static void handleMouseMotion(int xrel, int yrel, int xabs, int yabs);
     static void handleControllerAxis(float value, KeyboardButton axis);
-    static void handleControllerButton(KeyboardButton button, bool released);
 
     static Entity& getLara();
     static void setLara(long lara);

src/Camera.cpp

@@ -37,8 +37,10 @@ const static float fov = 45.0f;
 const static float nearDist = 0.1f;
 const static float farDist = 75000.0f;
 const static float maxSpeed = 3072.0f;
+const static float controllerDeadZone = 0.33f;
 const static float controllerViewFactor = glm::pi<float>();
-const static float controllerDeadZone = 0.2f;
+const static float rotationAngleClamp = glm::pi<float>() * 2.0f;
+const static float rotationAngleVertMax = glm::pi<float>() / 2.0f;
 
 const static glm::vec3 rightUnit(1.0f, 0.0f, 0.0f);
 const static glm::vec3 upUnit(0.0f, 1.0f, 0.0f);
@@ -111,32 +113,24 @@ void Camera::handleMouseMotion(int x, int y) {
     }
 
     while (y > 0) {
-        if (rot.y > -(glm::pi<float>() / 2.0f)) {
+        if (rot.y > -rotationAngleVertMax) {
             rot.y -= rotationDeltaY;
         }
         y--;
     }
 
     while (y < 0) {
-        if (rot.y < (glm::pi<float>() / 2.0f)) {
+        if (rot.y < rotationAngleVertMax) {
             rot.y += rotationDeltaY;
         }
         y++;
     }
-
-    while (rot.x > (glm::pi<float>() * 2.0f))
-        rot.x -= glm::pi<float>() * 2.0f;
-
-    while (rot.x < -(glm::pi<float>() * 2.0f))
-        rot.x += glm::pi<float>() * 2.0f;
 }
 
 void Camera::handleControllerAxis(float value, KeyboardButton axis) {
     if (glm::epsilonEqual(value, 0.0f, controllerDeadZone))
         value = 0.0f;
 
-    // TODO clamp Y rotation axis somehow...?
-
     if (axis == leftXAxis) {
         posSpeed.x = -maxSpeed * value;
     } else if (axis == leftYAxis) {
@@ -152,32 +146,26 @@ void Camera::handleControllerAxis(float value, KeyboardButton axis) {
     dirty = true;
 }
 
-void Camera::handleControllerButton(KeyboardButton button, bool released) {
-    if (button == aButton) {
-        handleAction(jumpAction, released);
-    } else if (button == bButton) {
-        handleAction(crouchAction, released);
-    } else if (button == padUp) {
-        handleAction(forwardAction, released);
-    } else if (button == padDown) {
-        handleAction(backwardAction, released);
-    } else if (button == padLeft) {
-        handleAction(leftAction, released);
-    } else if (button == padRight) {
-        handleAction(rightAction, released);
-    } else {
-        return;
-    }
-
-    dirty = true;
-}
-
 bool Camera::update() {
     if ((!dirty) && equal(posSpeed, 0.0f) && equal(rotSpeed, 0.0f))
         return false;
 
+    while (rot.x > rotationAngleClamp)
+        rot.x -= rotationAngleClamp;
+    while (rot.x < -rotationAngleClamp)
+        rot.x += rotationAngleClamp;
+    while (rot.y > rotationAngleClamp)
+        rot.y -= rotationAngleClamp;
+    while (rot.y < -rotationAngleClamp)
+        rot.y += rotationAngleClamp;
+
     float dT = RunTime::getLastFrameTime();
-    rot += rotSpeed * dT;
+    glm::vec2 newRot = rot + rotSpeed * dT;
+
+    if ((newRot.y > -rotationAngleVertMax) && (newRot.y < rotationAngleVertMax))
+        rot = newRot;
+    else
+        rotSpeed = glm::vec2(0.0f, 0.0f);
 
     glm::quat quatY = glm::angleAxis(rot.x, glm::vec3(0.0f, 1.0f, 0.0f));
     glm::quat quatX = glm::angleAxis(rot.y, glm::vec3(1.0f, 0.0f, 0.0f));

src/Game.cpp

@@ -87,8 +87,9 @@ void Game::handleAction(ActionEvents action, bool isFinished) {
         return;
 
     if (isFinished) {
+        if (activeEvents[action])
+            Camera::handleAction(action, isFinished);
         activeEvents[action] = false;
-        Camera::handleAction(action, isFinished);
     } else {
         if (!activeEvents[action])
             Camera::handleAction(action, isFinished);
@@ -110,13 +111,6 @@ void Game::handleControllerAxis(float value, KeyboardButton axis) {
     Camera::handleControllerAxis(value, axis);
 }
 
-void Game::handleControllerButton(KeyboardButton button, bool released) {
-    if (!mLoaded)
-        return;
-
-    Camera::handleControllerButton(button, released);
-}
-
 Entity& Game::getLara() {
     assert(mLara >= 0);
     assert(mLara < (int)getWorld().sizeEntity());

src/UI.cpp

@@ -360,7 +360,42 @@ void UI::handleControllerAxis(float value, KeyboardButton axis) {
 }
 
 void UI::handleControllerButton(KeyboardButton button, bool released) {
-    Game::handleControllerButton(button, released);
+    if (visible || Console::isVisible())
+        return;
+
+    if (getMenu().isVisible()) {
+        if (button == aButton) {
+            handleKeyboard(enterKey, !released);
+        } else if (button == padUp) {
+            handleKeyboard(upKey, !released);
+        } else if (button == padDown) {
+            handleKeyboard(downKey, !released);
+        } else if (button == padLeft) {
+            handleKeyboard(leftKey, !released);
+        } else if (button == padRight) {
+            handleKeyboard(rightKey, !released);
+        } else if (button == startButton) {
+            if (!released)
+                getMenu().setVisible(false);
+        }
+    } else {
+        if (button == aButton) {
+            Game::handleAction(jumpAction, released);
+        } else if (button == bButton) {
+            Game::handleAction(crouchAction, released);
+        } else if (button == padUp) {
+            Game::handleAction(forwardAction, released);
+        } else if (button == padDown) {
+            Game::handleAction(backwardAction, released);
+        } else if (button == padLeft) {
+            Game::handleAction(leftAction, released);
+        } else if (button == padRight) {
+            Game::handleAction(rightAction, released);
+        } else if (button == startButton) {
+            if (!released)
+                getMenu().setVisible(true);
+        }
+    }
 }
 
 void UI::renderImGui(ImDrawList** const cmd_lists, int cmd_lists_count) {