mouse support

input/Buttons.cpp

@@ -1,9 +1,12 @@
 #include "input/Buttons.h"
 
-Buttons::Axis::Axis() : less(0.0f), greater(0.0f), lessIndex(-1), greaterIndex(-1) {
+Buttons::Axis::Axis()
+    : less(0.0f), greater(0.0f), lessIndex(-1), greaterIndex(-1) {
 }
 
-Buttons::Buttons(const Window& window) : window(window), dummy(0, "Dummy"), activeController(-1), gamepadToButton(-1) {
+Buttons::Buttons(const Window& window)
+    : window(window), dummy(0, "Dummy"), activeController(-1),
+      gamepadToButton(-1) {
 }
 
 Button& Buttons::add(int key, const char* name) {
@@ -13,6 +16,13 @@ Button& Buttons::add(int key, const char* name) {
     return buttons[buttons.getLength() - 1];
 }
 
+Button& Buttons::addMouse(int mouse, const char* name) {
+    if(mouseButtons.add(mouse, name)) {
+        return dummy;
+    }
+    return mouseButtons[mouseButtons.getLength() - 1];
+}
+
 void Buttons::mapGamepadButton(const Button& button, int mapping) {
     gamepadToButton[mapping] = searchButton(button);
 }
@@ -35,12 +45,38 @@ void Buttons::tick() {
     for(int i = 0; i < buttons.getLength(); i++) {
         buttons[i].tick(window.isKeyDown(buttons[i].key) || down[i]);
     }
+    for(int i = 0; i < mouseButtons.getLength(); i++) {
+        mouseButtons[i].tick(window.isMouseDown(mouseButtons[i].key));
+    }
+    lastMouseX = mouseX;
+    lastMouseY = mouseY;
+    window.getMousePosition(mouseX, mouseY);
 }
 
 const ButtonList& Buttons::get() const {
     return buttons;
 }
 
+const MouseList& Buttons::getMouse() const {
+    return mouseButtons;
+}
+
+double Buttons::getLastMouseX() const {
+    return lastMouseX;
+}
+
+double Buttons::getLastMouseY() const {
+    return lastMouseY;
+}
+
+double Buttons::getMouseX() const {
+    return mouseX;
+}
+
+double Buttons::getMouseY() const {
+    return mouseY;
+}
+
 bool Buttons::searchForGamepad() {
     if(activeController != -1) {
         return true;
@@ -65,9 +101,11 @@ void Buttons::checkGamepad(DownArray& down) {
         }
     }
     for(int i = 0; i <= GLFW_GAMEPAD_AXIS_LAST; i++) {
-        if(gamepadAxisToButton[i].greaterIndex != -1 && state.axes[i] > gamepadAxisToButton[i].greater) {
+        if(gamepadAxisToButton[i].greaterIndex != -1 &&
+           state.axes[i] > gamepadAxisToButton[i].greater) {
             down[gamepadAxisToButton[i].greaterIndex] = true;
-        } else if(gamepadAxisToButton[i].lessIndex != -1 && state.axes[i] < gamepadAxisToButton[i].less) {
+        } else if(gamepadAxisToButton[i].lessIndex != -1 &&
+                  state.axes[i] < gamepadAxisToButton[i].less) {
             down[gamepadAxisToButton[i].lessIndex] = true;
         }
     }

input/Buttons.h

@@ -2,11 +2,12 @@
 #define BUTTONS_H
 
 #include "input/Button.h"
+#include "rendering/Window.h"
 #include "utils/Array.h"
 #include "utils/ArrayList.h"
-#include "rendering/Window.h"
 
 typedef ArrayList<Button, 32> ButtonList;
+typedef ArrayList<Button, 1 + GLFW_MOUSE_BUTTON_LAST> MouseList;
 
 class Buttons final {
     typedef Array<bool, 32> DownArray;
@@ -15,6 +16,11 @@ class Buttons final {
     Button dummy;
     int activeController;
     ButtonList buttons;
+    MouseList mouseButtons;
+    double lastMouseX;
+    double lastMouseY;
+    double mouseX;
+    double mouseY;
 
     struct Axis {
         float less;
@@ -25,19 +31,26 @@ class Buttons final {
         Axis();
     };
 
-    Array<int, 1 + GLFW_GAMEPAD_BUTTON_LAST> gamepadToButton;
     Array<Axis, 1 + GLFW_GAMEPAD_AXIS_LAST> gamepadAxisToButton;
+    Array<int, 1 + GLFW_GAMEPAD_BUTTON_LAST> gamepadToButton;
 
 public:
     Buttons(const Window& window);
 
     Button& add(int key, const char* name);
+    Button& addMouse(int mouse, const char* name);
     void mapGamepadButton(const Button& button, int mapping);
     void mapGamepadAxis(const Button& button, float value, int index);
 
     void tick();
 
     const ButtonList& get() const;
+    const MouseList& getMouse() const;
+
+    double getLastMouseX() const;
+    double getLastMouseY() const;
+    double getMouseX() const;
+    double getMouseY() const;
 
 private:
     bool searchForGamepad();

rendering/Window.cpp

@@ -77,6 +77,14 @@ bool Window::isKeyDown(int key) const {
     return glfwGetKey(window, key) == GLFW_PRESS;
 }
 
+bool Window::isMouseDown(int mouse) const {
+    return glfwGetMouseButton(window, mouse) == GLFW_PRESS;
+}
+
+void Window::getMousePosition(double& x, double& y) const {
+    glfwGetCursorPos(window, &x, &y);
+}
+
 void Window::keyCallback(GLFWwindow* w, int key, int scancode, int action,
                          int mods) {
     void* p = glfwGetWindowUserPointer(w);

rendering/Window.h

@@ -30,6 +30,9 @@ public:
     Size getFramebufferSize() const;
     bool isKeyDown(int key) const;
 
+    bool isMouseDown(int mouse) const;
+    void getMousePosition(double& x, double& y) const;
+
 private:
     static void keyCallback(GLFWwindow* w, int key, int scancode, int action,
                             int mods);