Changeset 5edbd58 in opengl-game

Timestamp:

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

Author:

Dmitry Portnoy <dmitry.portnoy@…>

Branches:

feature/imgui-sdl, master, points-test

Children:

301d0d4

Parents:

2beb6c7

Message:

For both openglgame and vulkangame, pass in the window width and height and a fullscreen flag to the run() function

Files:

• main-opengl.cpp (modified) (2 diffs)
• main-vulkan.cpp (modified) (2 diffs)
• opengl-game.cpp (modified) (4 diffs)
• opengl-game.hpp (modified) (3 diffs)
• vulkan-game.cpp (modified) (4 diffs)
• vulkan-game.hpp (modified) (3 diffs)

main-opengl.cpp

@@ -3 +3 @@
 #include <iostream>
 
+#include "consts.hpp"
 #include "crash-logger.hpp"
 
@@ -28 +29 @@
 
    try {
-      game.run();
+      game.run(640, 480, GUI_FLAGS_WINDOW_FULLSCREEN);
    } catch (const exception& e) {
       cerr << e.what() << endl;

main-vulkan.cpp

@@ -3 +3 @@
 #include <iostream>
 
+#include "consts.hpp"
 #include "crash-logger.hpp"
 
@@ -28 +29 @@
 
    try {
-      game.run();
+      game.run(800, 600, GUI_FLAGS_WINDOW_FULLSCREEN);
    } catch (const exception& e) {
       cerr << e.what() << endl;

opengl-game.cpp

@@ -2 +2 @@
 
 #include <iostream>
+
+#include "consts.hpp"
 
 #include "game-gui-glfw.hpp"
@@ -15 +17 @@
 }
 
-void OpenGLGame::run() {
-   if (initWindow() == RTWO_ERROR) {
+void OpenGLGame::run(unsigned int width, unsigned int height, unsigned char guiFlags) {
+   if (initWindow(width, height, guiFlags) == RTWO_ERROR) {
       return;
    }
@@ -24 +26 @@
 }
 
-bool OpenGLGame::initWindow() {
+bool OpenGLGame::initWindow(unsigned int width, unsigned int height, unsigned char guiFlags) {
    gui = new GameGui_GLFW();
 
@@ -34 +36 @@
    cout << "GUI init succeeded" << endl;
 
-   window = (GLFWwindow*) gui->CreateWindow("OpenGL Game", SCREEN_WIDTH, SCREEN_HEIGHT);
+   window = (GLFWwindow*) gui->CreateWindow("OpenGL Game", width, height);
    if (window == nullptr) {
       cout << "Window could not be created!" << endl;

opengl-game.hpp

@@ -3 +3 @@
 
 #include "game-gui-glfw.hpp"
-
-const int SCREEN_WIDTH = 800;
-const int SCREEN_HEIGHT = 600;
 
 class OpenGLGame {
@@ -12 +9 @@
       ~OpenGLGame();
 
-      void run();
+      void run(unsigned int width, unsigned int height, unsigned char guiFlags);
 
    private:
@@ -18 +15 @@
       GLFWwindow* window;
 
-      bool initWindow();
+      bool initWindow(unsigned int width, unsigned int height, unsigned char guiFlags);
       void initOpenGL();
       void mainLoop();

vulkan-game.cpp

@@ -2 +2 @@
 
 #include <iostream>
+
+#include "consts.hpp"
 
 #define GAMEGUI_INCLUDE_VULKAN
@@ -16 +18 @@
 }
 
-void VulkanGame::run() {
-   if (initWindow() == RTWO_ERROR) {
+void VulkanGame::run(unsigned int width, unsigned int height, unsigned char guiFlags) {
+   if (initWindow(width, height, guiFlags) == RTWO_ERROR) {
       return;
    }
@@ -25 +27 @@
 }
 
-bool VulkanGame::initWindow() {
+bool VulkanGame::initWindow(unsigned int width, unsigned int height, unsigned char guiFlags) {
    gui = new GameGui_SDL();
 
@@ -35 +37 @@
    cout << "GUI init succeeded" << endl;
 
-   window = (SDL_Window*) gui->CreateWindow("Vulkan Game", SCREEN_WIDTH, SCREEN_HEIGHT);
+   window = (SDL_Window*) gui->CreateWindow("Vulkan Game", width, height);
    if (window == nullptr) {
       cout << "Window could not be created!" << endl;

vulkan-game.hpp

@@ -3 +3 @@
 
 #include "game-gui-sdl.hpp"
-
-const int SCREEN_WIDTH = 800;
-const int SCREEN_HEIGHT = 600;
 
 class VulkanGame {
@@ -12 +9 @@
       ~VulkanGame();
 
-      void run();
+      void run(unsigned int width, unsigned int height, unsigned char guiFlags);
 
    private:
@@ -18 +15 @@
       SDL_Window* window;
 
-      bool initWindow();
+      bool initWindow(unsigned int width, unsigned int height, unsigned char guiFlags);
       void initVulkan();
       void mainLoop();