Changeset 6bfd91c in opengl-game

Timestamp:

Jun 10, 2020, 9:47:29 PM (5 years ago)

Author:

Dmitry Portnoy <dmitry.portnoy@…>

Branches:

feature/imgui-sdl, master

Children:

aa7707d

Parents:

f809ae6

Message:

Remove unused variables from the VulkanGame class after they were moved to the game Screen classes

Files:

• vulkan-game.cpp (modified) (3 diffs)
• vulkan-game.hpp (modified) (3 diffs)

vulkan-game.cpp

@@ -21 +21 @@
    this->gui = nullptr;
    this->window = nullptr;
-   this->font = nullptr;
-   this->fontSDLTexture = nullptr;
-   this->imageSDLTexture = nullptr;
 
    this->currentFrame = 0;
@@ -146 +143 @@
    // TODO: Print the filename of the font in the error message
 
-   font = TTF_OpenFont("assets/fonts/lazy.ttf", 28);
-   if (font == nullptr) {
+   lazyFont = TTF_OpenFont("assets/fonts/lazy.ttf", 28);
+   if (lazyFont == nullptr) {
       cout << "Failed to load lazy font! SDL_ttf Error: " << TTF_GetError() << endl;
       return RTWO_ERROR;
    }
-
-   SDL_Surface* fontSDLSurface = TTF_RenderText_Solid(font, "Great success!", { 255, 255, 255 });
-   if (fontSDLSurface == nullptr) {
-      cout << "Unable to render text surface! SDL_ttf Error: " << TTF_GetError() << endl;
-      return RTWO_ERROR;
-   }
-
-   fontSDLTexture = SDL_CreateTextureFromSurface(renderer, fontSDLSurface);
-   if (fontSDLTexture == nullptr) {
-      cout << "Unable to create texture from rendered text! SDL Error: " << SDL_GetError() << endl;
-      SDL_FreeSurface(fontSDLSurface);
-      return RTWO_ERROR;
-   }
-
-   SDL_FreeSurface(fontSDLSurface);
-
-   // TODO: Load a PNG instead
-   SDL_Surface* imageSDLSurface = SDL_LoadBMP("assets/images/spaceship.bmp");
-   if (imageSDLSurface == nullptr) {
-      cout << "Unable to load image " << "spaceship.bmp" << "! SDL Error: " << SDL_GetError() << endl;
-      return RTWO_ERROR;
-   }
-
-   imageSDLTexture = SDL_CreateTextureFromSurface(renderer, imageSDLSurface);
-   if (imageSDLTexture == nullptr) {
-      cout << "Unable to create texture from BMP surface! SDL Error: " << SDL_GetError() << endl;
-      SDL_FreeSurface(imageSDLSurface);
-      return RTWO_ERROR;
-   }
-
-   SDL_FreeSurface(imageSDLSurface);
 
    proggyFont = TTF_OpenFont("assets/fonts/ProggyClean.ttf", 16);
@@ -1142 +1108 @@
    delete screens[SCREEN_GAME];
 
-   // TODO: Check if any of these functions accept null parameters
-   // If they do, I don't need to check for that
-
-   if (fontSDLTexture != nullptr) {
-      SDL_DestroyTexture(fontSDLTexture);
-      fontSDLTexture = nullptr;
-   }
-
-   if (imageSDLTexture != nullptr) {
-      SDL_DestroyTexture(imageSDLTexture);
-      imageSDLTexture = nullptr;
-   }
-
-   TTF_CloseFont(font);
-   font = nullptr;
+   if (lazyFont != nullptr) {
+      TTF_CloseFont(lazyFont);
+      lazyFont = nullptr;
+   }
 
    if (proggyFont != nullptr) {

vulkan-game.hpp

@@ -12 +12 @@
 #include <glm/gtc/matrix_transform.hpp>
 
+#include <vulkan/vulkan.h>
+
+#include <SDL2/SDL_ttf.h>
+
+#include "consts.hpp"
 #include "vulkan-utils.hpp"
 #include "graphics-pipeline_vulkan.hpp"
@@ -202 +207 @@
       Screen* currentScreen;
 
+      TTF_Font* lazyFont;
       TTF_Font* proggyFont;
 
@@ -285 +291 @@
       VulkanImage laserTextureImage;
       VkDescriptorImageInfo laserTextureImageDescriptor;
-
-      TTF_Font* font;
-      SDL_Texture* fontSDLTexture;
-
-      SDL_Texture* imageSDLTexture;
 
       mat4 viewMat, projMat;