Changeset 7bf5433 in opengl-game for game-gui-glfw.cpp

Timestamp:

Sep 12, 2019, 5:23:28 AM (5 years ago)

Author:

Dmitry Portnoy <dmp1488@…>

Branches:

feature/imgui-sdl, master, points-test

Children:

d2f607c

Parents:

27c40ce

Message:

Create a new OpenGLGame project for a refactor of the original OpenGL game to make copying its logic over to the Vulkan implementation easier

File:

• game-gui-glfw.cpp (modified) (4 diffs)

game-gui-glfw.cpp

@@ -1 +1 @@
 #include "game-gui-glfw.hpp"
+
+#include <queue>
 
 #include "compiler.hpp"
 #include "consts.hpp"
 
-const int KEY_STATE_UNCHANGED = -1;
+int GameGui_GLFW::s_keyState[GLFW_KEY_LAST];
+bool GameGui_GLFW::s_keyDown[GLFW_KEY_LAST];
+
+// queue<MouseEvent> mouseEvents;
 
 string GameGui_GLFW::s_errorMessage;
-
-int GameGui_GLFW::s_keyState[NUM_KEYS];
-bool GameGui_GLFW::s_keyDown[NUM_KEYS];
 
 string& GameGui_GLFW::getError() {
@@ -62 +64 @@
    //glfwMakeContextCurrent(window);
 
-   //glfwSetMouseButtonCallback(window, mouse_button_callback);
+   glfwSetMouseButtonCallback(window, glfw_mouse_button_callback);
    glfwSetKeyCallback(window, glfw_key_callback);
 
-   fill(GameGui_GLFW::s_keyState, GameGui_GLFW::s_keyState + NUM_KEYS, KEY_STATE_UNCHANGED);
+   // fill(s_keyState, s_keyState + GLFW_KEY_LAST, RTWO_KEY_EVENT_NONE);
+   // fill(s_keyDown, s_keyDown + GLFW_KEY_LAST, false);
 
    return window;
@@ -74 +77 @@
    glfwDestroyWindow(window);
 }
+
+/*
+void GameGui_GLFW::processEvents() {
+   fill(s_keyState, s_keyState + GLFW_KEY_LAST, RTWO_KEY_EVENT_NONE);
+
+   glfwPollEvents();
+}
+
+unsigned char GameGui_GLFW::getKeyEvent(unsigned int key) {
+   return s_keyState[key];
+}
+
+bool GameGui_GLFW::isKeyPressed(unsigned int key) {
+   return s_keyDown[key];
+}
+
+int GameGui_GLFW::pollMouseEvent(MouseEvent* event) {
+   if (mouseEvents.empty()) {
+      return 0;
+   }
+
+   *event = mouseEvents.front();
+   mouseEvents.pop();
+
+   return 1;
+}
+*/
 
 #ifdef GAMEGUI_INCLUDE_VULKAN
@@ -107 +137 @@
 }
 
+void glfw_mouse_button_callback(GLFWwindow* window, int button, int action, int mods) {
+   double x, y;
+   glfwGetCursorPos(window, &x, &y);
+
+   /*
+   MouseEvent e { button, action, (int)x, (int)y };
+
+   mouseEvents.push(e);
+   */
+}
+
 void glfw_key_callback(GLFWwindow* window, int key, int scancode, int action, int mods) {
    GameGui_GLFW::s_keyState[key] = action;
+   /*
+   switch(action) {
+      case GLFW_PRESS:
+         s_keyState[key] = RTWO_KEY_EVENT_PRESSED;
+         break;
+      case GLFW_RELEASE:
+         s_keyState[key] = RTWO_KEY_EVENT_RELEASED;
+         break;
+      default:
+         s_keyState[key] = RTWO_KEY_EVENT_NONE;
+         break;
+   }
 
    // should be true for GLFW_PRESS and GLFW_REPEAT
    GameGui_GLFW::s_keyDown[key] = (action != GLFW_RELEASE);
+   */
 }