Changeset 1ce9afe in opengl-game for game-gui-glfw.cpp

Timestamp:

Sep 2, 2019, 7:40:49 PM (5 years ago)

Author:

Dmitry Portnoy <dmitry.portnoy@…>

Branches:

feature/imgui-sdl, master, points-test

Children:

7fc5e27

Parents:

301d0d4

Message:

Add a fullscreen flag to GameGui::CreateWindow and implement fullscreen functionality and the ability to detect key presses in openglgame

File:

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

game-gui-glfw.cpp

@@ -1 +1 @@
 #include "game-gui-glfw.hpp"
 
+#include "compiler.hpp"
 #include "consts.hpp"
+
+const int KEY_STATE_UNCHANGED = -1;
 
 string GameGui_GLFW::s_errorMessage;
 
-void glfw_error_callback(int error, const char* description) {
-   GameGui_GLFW::s_errorMessage = description;
-}
+int GameGui_GLFW::s_keyState[NUM_KEYS];
+bool GameGui_GLFW::s_keyDown[NUM_KEYS];
 
 string& GameGui_GLFW::GetError() {
@@ -24 +26 @@
 }
 
-void* GameGui_GLFW::CreateWindow(const string& title, unsigned int width, unsigned int height) {
-   glfwWindowHint(GLFW_CLIENT_API, GLFW_NO_API);
+void* GameGui_GLFW::CreateWindow(const string& title, unsigned int width, unsigned int height, bool fullscreen) {
+   GLFWwindow* window = nullptr;
+   GLFWmonitor* mon = nullptr;
 
-   window = glfwCreateWindow(width, height, title.c_str(), nullptr, nullptr);
+#if defined(GAMEGUI_INCLUDE_VULKAN)
+   glfwWindowHint(GLFW_CLIENT_API, GLFW_NO_API); // This is for Vulkan, OpenGL needs different flags
+#elif defined(MAC)
+   glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 3);
+   glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 3);
+   glfwWindowHint(GLFW_OPENGL_FORWARD_COMPAT, GL_TRUE);
+   glfwWindowHint(GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE);
+#else
+   glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 4);
+   glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 3);
+#endif
+
+   glfwWindowHint(GLFW_SAMPLES, 16);
+   glfwWindowHint(GLFW_OPENGL_DEBUG_CONTEXT, true);
+
+   if (fullscreen) {
+      mon = glfwGetPrimaryMonitor();
+      const GLFWvidmode* vmode = glfwGetVideoMode(mon);
+
+      width = vmode->width;
+      height = vmode->height;
+
+      // TODO: Should probably enable some way to retrieve this from outside this class
+      // and print it out there
+      cout << "Fullscreen resolution " << vmode->width << "x" << vmode->height << endl;
+   }
+
+   window = glfwCreateWindow(width, height, title.c_str(), mon, nullptr);
+   //glfwMakeContextCurrent(window);
+
+   //glfwSetMouseButtonCallback(window, mouse_button_callback);
+   glfwSetKeyCallback(window, glfw_key_callback);
+
+   fill(GameGui_GLFW::s_keyState, GameGui_GLFW::s_keyState + NUM_KEYS, KEY_STATE_UNCHANGED);
 
    return window;
@@ -60 +96 @@
    glfwGetFramebufferSize(window, width, height);
 }
+
+void glfw_error_callback(int error, const char* description) {
+   GameGui_GLFW::s_errorMessage = description;
+}
+
+void glfw_key_callback(GLFWwindow* window, int key, int scancode, int action, int mods) {
+   GameGui_GLFW::s_keyState[key] = action;
+
+   // should be true for GLFW_PRESS and GLFW_REPEAT
+   GameGui_GLFW::s_keyDown[key] = (action != GLFW_RELEASE);
+}