Changeset 1f25a71 in opengl-game

Timestamp:

Nov 10, 2019, 5:40:12 PM (5 years ago)

Author:

Dmitry Portnoy <dmitry.portnoy@…>

Branches:

feature/imgui-sdl, master, points-test

Children:

0ae182f

Parents:

cc4a8b5

git-author:

Dmitry Portnoy <dmitry.portnoy@…> (11/10/19 17:39:32)

git-committer:

Dmitry Portnoy <dmitry.portnoy@…> (11/10/19 17:40:12)

Message:

In vulkangame, print the SDL version and finish implementing renderUI() to show some test images and text using SDL

Files:

• assets/fonts/lazy.ttf (moved) (moved from fonts/lazy.ttf )
• vulkan-game.cpp (modified) (5 diffs)
• vulkan-game.hpp (modified) (1 diff)
• vulkan-ref.cpp (modified) (10 diffs)

vulkan-game.cpp

@@ -28 +28 @@
    gui = nullptr;
    window = nullptr;
+   font = nullptr;
+   fontSDLTexture = nullptr;
+   imageSDLTexture = nullptr;
 
    currentFrame = 0;
@@ -102 +105 @@
 
    SDL_VERSION(&sdlVersion);
+
+   cout << "SDL " << sdlVersion.major << "." << sdlVersion.minor << "." << sdlVersion.patch << endl;
+
+   font = TTF_OpenFont("assets/fonts/lazy.ttf", 28);
+   if (font == 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);
 
    // In SDL 2.0.10 (currently, the latest), SDL_TEXTUREACCESS_TARGET is required to get a transparent overlay working
@@ -117 +159 @@
    if (uiOverlay == nullptr) {
       cout << "Unable to create blank texture! SDL Error: " << SDL_GetError() << endl;
+      return RTWO_ERROR;
    }
    if (SDL_SetTextureBlendMode(uiOverlay, SDL_BLENDMODE_BLEND) != 0) {
       cout << "Unable to set texture blend mode! SDL Error: " << SDL_GetError() << endl;
+      return RTWO_ERROR;
    }
 
@@ -282 +326 @@
    SDL_RenderFillRect(renderer, &rect);
 
+   rect = {10, 10, 0, 0};
+   SDL_QueryTexture(fontSDLTexture, nullptr, nullptr, &(rect.w), &(rect.h));
+   SDL_RenderCopy(renderer, fontSDLTexture, nullptr, &rect);
+
+   rect = {10, 80, 0, 0};
+   SDL_QueryTexture(imageSDLTexture, nullptr, nullptr, &(rect.w), &(rect.h));
+   SDL_RenderCopy(renderer, imageSDLTexture, nullptr, &rect);
+
    SDL_SetRenderDrawColor(renderer, 0x00, 0x00, 0xFF, 0xFF);
    SDL_RenderDrawLine(renderer, 50, 5, 150, 500);
@@ -388 +440 @@
       uiOverlay = nullptr;
    }
+
+   if (fontSDLTexture != nullptr) {
+      SDL_DestroyTexture(fontSDLTexture);
+      fontSDLTexture = nullptr;
+   }
+
+   if (imageSDLTexture != nullptr) {
+      SDL_DestroyTexture(imageSDLTexture);
+      imageSDLTexture = nullptr;
+   }
+
+   TTF_CloseFont(font);
+   font = nullptr;
 
    SDL_DestroyRenderer(renderer);

vulkan-game.hpp

@@ -87 +87 @@
       VkDescriptorImageInfo sdlOverlayImageDescriptor;
 
+      TTF_Font* font;
+      SDL_Texture* fontSDLTexture;
+
+      SDL_Texture* imageSDLTexture;
+
       vector<VkSemaphore> imageAvailableSemaphores;
       vector<VkSemaphore> renderFinishedSemaphores;

vulkan-ref.cpp

@@ -152 +152 @@
       SDL_Renderer* gRenderer = nullptr;
       SDL_Texture* uiOverlay = nullptr;
-/*** END OF REFACTORED CODE ***/
 
       TTF_Font* gFont = nullptr;
@@ -158 +157 @@
       SDL_Texture* uiImage = nullptr;
 
-/*** START OF REFACTORED CODE ***/
       VkInstance instance;
       VkDebugUtilsMessengerEXT debugMessenger;
@@ -264 +262 @@
             cout << "Unable to set texture blend mode! SDL Error: " << SDL_GetError() << endl;
          }
-/*** END OF REFACTORED CODE ***/
-
-         gFont = TTF_OpenFont("fonts/lazy.ttf", 28);
+
+         gFont = TTF_OpenFont("assets/fonts/lazy.ttf", 28);
          if (gFont == nullptr) {
             cout << "Failed to load lazy font! SDL_ttf Error: " << TTF_GetError() << endl;
@@ -272 +269 @@
          }
 
-         SDL_Color textColor = { 0, 0, 0 };
-
-         SDL_Surface* textSurface = TTF_RenderText_Solid(gFont, "Great sucess!", textColor);
+         SDL_Surface* textSurface = TTF_RenderText_Solid(gFont, "Great success!", { 255, 255, 255 });
          if (textSurface == nullptr) {
             cout << "Unable to render text surface! SDL_ttf Error: " << TTF_GetError() << endl;
@@ -308 +303 @@
       }
 
-/*** START OF REFACTORED CODE ***/
       void initVulkan() {
          createInstance();
@@ -1851 +1845 @@
          SDL_SetRenderDrawColor(gRenderer, 0x00, 0x00, 0x00, 0x00);
          SDL_RenderClear(gRenderer);
-/*** END OF REFACTORED CODE ***/
 
          SDL_Rect rect;
@@ -1858 +1851 @@
          SDL_SetRenderDrawColor(gRenderer, 0x00, 0xFF, 0x00, 0xFF);
          SDL_RenderFillRect(gRenderer, &rect);
-         SDL_SetRenderDrawColor(gRenderer, 0x00, 0x9F, 0x9F, 0xFF);
 
          rect = {10, 10, 0, 0};
@@ -1868 +1860 @@
          SDL_RenderCopy(gRenderer, uiImage, nullptr, &rect);
 
-/*** START OF REFACTORED CODE ***/
          SDL_SetRenderDrawColor(gRenderer, 0x00, 0x00, 0xFF, 0xFF);
          SDL_RenderDrawLine(gRenderer, 50, 5, 150, 500);
@@ -1970 +1961 @@
             uiOverlay = nullptr;
          }
-/*** END OF REFACTORED CODE ***/
 
          TTF_CloseFont(gFont);
-              gFont = nullptr;
+         gFont = nullptr;
 
          if (uiText != nullptr) {
@@ -1985 +1975 @@
          }
 
-/*** START OF REFACTORED CODE ***/
          SDL_DestroyRenderer(gRenderer);
          gRenderer = nullptr;