Changeset c61323a in opengl-game for game-gui-glfw.cpp

Timestamp:

Sep 13, 2019, 2:51:30 AM (5 years ago)

Author:

Dmitry Portnoy <dmp1488@…>

Branches:

feature/imgui-sdl, master, points-test

Children:

1fcca9e

Parents:

f6521fb

Message:

Implement processEvents() and pollEvent() for GameGui_GLFW and re-implement the main loop in opengl-game using those functions

File:

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

game-gui-glfw.cpp

@@ -1 +1 @@
 #include "game-gui-glfw.hpp"
-
-#include <queue>
 
 #include "compiler.hpp"
 #include "consts.hpp"
 
-int GameGui_GLFW::s_keyState[GLFW_KEY_LAST];
-bool GameGui_GLFW::s_keyDown[GLFW_KEY_LAST];
-
-// queue<MouseEvent> mouseEvents;
-
+queue<UIEvent> GameGui_GLFW::s_events;
 string GameGui_GLFW::s_errorMessage;
 
@@ -32 +26 @@
 
 void* GameGui_GLFW::createWindow(const string& title, int width, int height, bool fullscreen) {
-   GLFWwindow* window = nullptr;
    GLFWmonitor* mon = nullptr;
 
@@ -62 +55 @@
 
    window = glfwCreateWindow(windowWidth, windowHeight, title.c_str(), mon, nullptr);
-   //glfwMakeContextCurrent(window);
 
    glfwSetMouseButtonCallback(window, glfw_mouse_button_callback);
    glfwSetKeyCallback(window, glfw_key_callback);
-
-   // fill(s_keyState, s_keyState + GLFW_KEY_LAST, RTWO_KEY_EVENT_NONE);
-   // fill(s_keyDown, s_keyDown + GLFW_KEY_LAST, false);
 
    return window;
@@ -78 +67 @@
 }
 
-/*
 void GameGui_GLFW::processEvents() {
-   fill(s_keyState, s_keyState + GLFW_KEY_LAST, RTWO_KEY_EVENT_NONE);
+   glfwPollEvents();
 
-   glfwPollEvents();
+   if (glfwWindowShouldClose(window)) {
+      UIEvent e;
+      e.type = UI_EVENT_QUIT;
+
+      s_events.push(e);
+   }
 }
 
-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()) {
+int GameGui_GLFW::pollEvent(UIEvent* event) {
+   if (s_events.empty()) {
       return 0;
    }
 
-   *event = mouseEvents.front();
-   mouseEvents.pop();
+   *event = s_events.front();
+   s_events.pop();
 
    return 1;
 }
-*/
 
 #ifdef GAMEGUI_INCLUDE_VULKAN
@@ -149 +133 @@
 
 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;
-   }
+   UIEvent e;
+   e.type = UI_EVENT_KEY;
+   e.key.keycode = key;
 
-   // should be true for GLFW_PRESS and GLFW_REPEAT
-   GameGui_GLFW::s_keyDown[key] = (action != GLFW_RELEASE);
-   */
+   GameGui_GLFW::s_events.push(e);
 }