Changeset 99d44b2 in opengl-game

Timestamp:

Aug 30, 2019, 4:12:23 PM (5 years ago)

Author:

Dmitry Portnoy <dmitry.portnoy@…>

Branches:

feature/imgui-sdl, master, points-test

Children:

d02c25f

Parents:

4eb4d0a

Message:

Rename spacegame to vulkangame

Files:

• .gitignore (modified) (1 diff)
• main-vulkan.cpp (moved) (moved from main.cpp ) (2 diffs)
• makefile (modified) (2 diffs)
• vulkan-game.cpp (moved) (moved from space-game.cpp ) (4 diffs)
• vulkan-game.hpp (moved) (moved from space-game.hpp ) (3 diffs)

.gitignore

@@ -1 @@
-spacegame
 newgame
 vulkanref
+vulkangame
 
 gl.log

main-vulkan.cpp

@@ -1 @@
-#include "space-game.hpp"
+#include "vulkan-game.hpp"
 
 #include <iostream>
@@ -13 +13 @@
 #endif
 
-   cout << "Starting Space Game..." << endl;
+   cout << "Starting Vulkan Game..." << endl;
 
-   SpaceGame game;
+   VulkanGame game;
 
    try {

makefile

@@ -56 +56 @@
         $(CC) $(CXX_FLAGS) -o $@ $^ $(LIB_FLAGS) -DGAMEGUI_INCLUDE_VULKAN
 
-spacegame: main.cpp space-game.cpp game-gui-sdl.cpp
+vulkangame: main-vulkan.cpp vulkan-game.cpp game-gui-sdl.cpp
         $(CC) $(CXX_FLAGS) -o $@ $^ $(LIB_FLAGS)
 
@@ -66 +66 @@
         rm -f newgame
         rm -f vulkanref
-        rm -f spacegame
+        rm -f vulkangame
         rm -f shaders/*.spv

vulkan-game.cpp

@@ -1 @@
-#include "space-game.hpp"
+#include "vulkan-game.hpp"
 
 #include <iostream>
 
+#define GAMEGUI_INCLUDE_VULKAN
 #include "game-gui-sdl.hpp"
 
 using namespace std;
 
-SpaceGame::SpaceGame() {
+VulkanGame::VulkanGame() {
    gui = nullptr;
    window = nullptr;
 }
 
-SpaceGame::~SpaceGame() {
+VulkanGame::~VulkanGame() {
 }
 
-void SpaceGame::run() {
+void VulkanGame::run() {
    if (initWindow() == RTWO_ERROR) {
       return;
@@ -24 +25 @@
 }
 
-bool SpaceGame::initWindow() {
+bool VulkanGame::initWindow() {
    gui = new GameGui_SDL();
 
@@ -43 +44 @@
 }
 
-void SpaceGame::initVulkan() {
+void VulkanGame::initVulkan() {
 }
 
-void SpaceGame::mainLoop() {
+void VulkanGame::mainLoop() {
    SDL_Event e;
    bool quit = false;
@@ -65 +66 @@
 }
 
-void SpaceGame::cleanup() {
+void VulkanGame::cleanup() {
    gui->DestroyWindow();
    gui->Shutdown();

vulkan-game.hpp

@@ -1 @@
-#ifndef _SPACE_GAME_H
-#define _SPACE_GAME_H
+#ifndef _VULKAN_GAME_H
+#define _VULKAN_GAME_H
 
 #include "game-gui-sdl.hpp"
@@ -7 +7 @@
 const int SCREEN_HEIGHT = 600;
 
-class SpaceGame {
+class VulkanGame {
    public:
-      SpaceGame();
-      ~SpaceGame();
+      VulkanGame();
+      ~VulkanGame();
 
       void run();
@@ -24 +24 @@
 };
 
-#endif // _SPACE_GAME_H
+#endif // _VULKAN_GAME_H