Changeset f133da0 in opengl-game

Timestamp:

Sep 16, 2019, 2:09:05 AM (5 years ago)

Author:

Dmitry Portnoy <dmp1488@…>

Branches:

feature/imgui-sdl, master, points-test

Children:

c6fec84

Parents:

df2cc24

Message:

Add renderScene and renderUI functions to openglgame and use IMGUI to render the main menu

Files:

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

game-gui-glfw.cpp

@@ -60 +60 @@
    // I think glfwGetWindowSize(window, width, height) works fine.
 
+   return window;
+}
+
+void GameGui_GLFW::bindEventHandlers() {
    glfwSetMouseButtonCallback(window, glfw_mouse_button_callback);
    glfwSetKeyCallback(window, glfw_key_callback);
-
-   return window;
 }
 

game-gui-glfw.hpp

@@ -29 +29 @@
       void destroyWindow();
 
+      void bindEventHandlers();
       void processEvents();
       int pollEvent(UIEvent* event);

new-game.cpp

@@ -397 +397 @@
    cout << "MAX_UNIFORMS: " << MAX_UNIFORMS << endl;
 
+/*** START OF REFACTORED CODE ***/
    // Setup Dear ImGui binding
    IMGUI_CHECKVERSION();
@@ -411 +412 @@
    glfwSetMouseButtonCallback(window, mouse_button_callback);
    glfwSetKeyCallback(window, key_callback);
+/*** END OF REFACTORED CODE ***/
 
    glfwSetWindowSizeCallback(window, window_size_callback);
@@ -2446 +2448 @@
 }
 
+/*** START OF REFACTORED CODE ***/
 void renderMainMenuGui() {
    ImGui_ImplGlfwGL3_NewFrame();
@@ -2478 +2481 @@
    ImGui_ImplGlfwGL3_RenderDrawData(ImGui::GetDrawData());
 }
+/*** END OF REFACTORED CODE ***/
 
 void initGuiValueLists(map<string, vector<UIValue>> valueLists) {

opengl-game.cpp

@@ -87 +87 @@
       cout << "OpenGL debug message callback is not supported" << endl;
    }
+
+   // Setup Dear ImGui binding
+   IMGUI_CHECKVERSION();
+   ImGui::CreateContext();
+   ImGuiIO& io = ImGui::GetIO(); (void)io;
+   //io.ConfigFlags |= ImGuiConfigFlags_NavEnableKeyboard;  // Enable Keyboard Controls
+   //io.ConfigFlags |= ImGuiConfigFlags_NavEnableGamepad;   // Enable Gamepad Controls
+   ImGui_ImplGlfwGL3_Init(window, true);
+
+   // Setup style
+   ImGui::StyleColorsDark();
+   //ImGui::StyleColorsClassic();
+
+   // The glfw event handlers have to be bound after ImGui is initialized.
+   // Otherwise, it seems they get overridden by ImGui
+   ((GameGui_GLFW*)gui)->bindEventHandlers();
 }
 
@@ -103 +119 @@
                break;
             case UI_EVENT_KEY:
+               cout << "Got a key event" << endl;
                if (e.key.keycode == GLFW_KEY_ESCAPE) {
                   quit = true;
@@ -121 +138 @@
       //glViewport(0, 0, gui->getWindowWidth(), gui->getWindowHeight());
 
+      renderScene();
+      renderUI();
+
       glfwSwapBuffers(window);
    }
 }
 
+void OpenGLGame::renderScene() {
+
+}
+
+void OpenGLGame::renderUI() {
+   ImGui_ImplGlfwGL3_NewFrame();
+
+   {
+      int padding = 4;
+      ImGui::SetNextWindowPos(ImVec2(-padding, -padding), ImGuiCond_Once);
+      ImGui::SetNextWindowSize(ImVec2(gui->getWindowWidth() + 2 * padding, gui->getWindowHeight() + 2 * padding), ImGuiCond_Always);
+      ImGui::Begin("WndMain", NULL,
+         ImGuiWindowFlags_NoTitleBar |
+         ImGuiWindowFlags_NoResize |
+         ImGuiWindowFlags_NoMove);
+
+      ImGui::InvisibleButton("", ImVec2(10, 80));
+      ImGui::InvisibleButton("", ImVec2(285, 18));
+      ImGui::SameLine();
+      ImGui::Button("New Game");
+
+      ImGui::InvisibleButton("", ImVec2(10, 15));
+      ImGui::InvisibleButton("", ImVec2(300, 18));
+      ImGui::SameLine();
+      ImGui::Button("Quit");
+
+      ImGui::End();
+   }
+
+   ImGui::Render();
+   ImGui_ImplGlfwGL3_RenderDrawData(ImGui::GetDrawData());
+}
+
 void OpenGLGame::cleanup() {
+   ImGui_ImplGlfwGL3_Shutdown();
+   ImGui::DestroyContext();
+
    gui->destroyWindow();
    gui->shutdown();

opengl-game.hpp

@@ -1 +1 @@
 #ifndef _OPENGL_GAME_H
 #define _OPENGL_GAME_H
+
+#include "IMGUI/imgui.h"
+#include "imgui_impl_glfw_gl3.h"
 
 #include "game-gui-glfw.hpp"
@@ -18 +21 @@
       void initOpenGL();
       void mainLoop();
+      void renderScene();
+      void renderUI();
       void cleanup();
 };