Changeset 1ce9afe in opengl-game

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

Files:

• game-gui-glfw.cpp (modified) (3 diffs)
• game-gui-glfw.hpp (modified) (2 diffs)
• game-gui-sdl.cpp (modified) (1 diff)
• game-gui-sdl.hpp (modified) (1 diff)
• game-gui.hpp (modified) (2 diffs)
• opengl-game.cpp (modified) (2 diffs)
• vulkan-game.cpp (modified) (1 diff)

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);
+}

game-gui-glfw.hpp

@@ -10 +10 @@
 #include <GLFW/glfw3.h>
 
+#define NUM_KEYS (512)
+
 class GameGui_GLFW : public GameGui {
    public:
+      static string s_errorMessage; // Has to be public so that glfw_error_callback can access it
+
+      // Both have to be public so that glfw_key_callback can access them
+      // TODO: Implement a more generic public api over this to get the key state
+      static int s_keyState[NUM_KEYS];
+      static bool s_keyDown[NUM_KEYS];
+
       string& GetError();
-
-      static string s_errorMessage; // Has to be public so that glfw_error_callback can access it
 
       bool Init();
       void Shutdown();
 
-      void* CreateWindow(const string& title, unsigned int width, unsigned int height);
+      void* CreateWindow(const string& title, unsigned int width, unsigned int height, bool fullscreen);
       void DestroyWindow();
 
@@ -34 +41 @@
 
 void glfw_error_callback(int error, const char* description);
+void glfw_key_callback(GLFWwindow* window, int key, int scancode, int action, int mods);
 
 #endif // _GAME_GUI_GLFW_H

game-gui-sdl.cpp

@@ -37 +37 @@
 }
 
-void* GameGui_SDL::CreateWindow(const string& title, unsigned int width, unsigned int height) {
+void* GameGui_SDL::CreateWindow(const string& title, unsigned int width, unsigned int height, bool fullscreen) {
+   cout << "About to go fullscreen in SDL..." << endl;
+
+   // TODO: Make an OpenGL version of the SDL_CreateWindow call as well
+
    // On Apple's OS X you must set the NSHighResolutionCapable Info.plist property to YES,
    // otherwise you will not receive a High DPI OpenGL canvas.

game-gui-sdl.hpp

@@ -16 +16 @@
       void Shutdown();
 
-      void* CreateWindow(const string& title, unsigned int width, unsigned int height);
+      void* CreateWindow(const string& title, unsigned int width, unsigned int height, bool fullscreen);
       void DestroyWindow();
 

game-gui.hpp

@@ -8 +8 @@
    #include <vulkan/vulkan.h>
 #endif
+
+// TODO: Remove the line below once the couts in the game-gui-* files are moved
+#include <iostream>
 
 using namespace std;
@@ -20 +23 @@
       virtual void Shutdown() = 0;
 
-      virtual void* CreateWindow(const string& title, unsigned int width, unsigned int height) = 0;
+      virtual void* CreateWindow(const string& title, unsigned int width, unsigned int height, bool fullscreen) = 0;
       virtual void DestroyWindow() = 0;
 

opengl-game.cpp

@@ -36 +36 @@
    cout << "GUI init succeeded" << endl;
 
-   window = (GLFWwindow*) gui->CreateWindow("OpenGL Game", width, height);
+   window = (GLFWwindow*) gui->CreateWindow("OpenGL Game", width, height, guiFlags | GUI_FLAGS_WINDOW_FULLSCREEN);
    if (window == nullptr) {
       cout << "Window could not be created!" << endl;
@@ -52 +52 @@
       glfwPollEvents();
 
+      if (GameGui_GLFW::s_keyState[GLFW_KEY_ESCAPE] == GLFW_PRESS) {
+         glfwSetWindowShouldClose(window, 1);
+      }
+
       glfwSwapBuffers(window);
    }

vulkan-game.cpp

@@ -37 +37 @@
    cout << "GUI init succeeded" << endl;
 
-   window = (SDL_Window*) gui->CreateWindow("Vulkan Game", width, height);
+   window = (SDL_Window*) gui->CreateWindow("Vulkan Game", width, height, guiFlags | GUI_FLAGS_WINDOW_FULLSCREEN);
    if (window == nullptr) {
       cout << "Window could not be created!" << endl;