Changeset f809ae6 in opengl-game

Timestamp:

Jun 10, 2020, 9:44:02 PM (5 years ago)

Author:

Dmitry Portnoy <dmitry.portnoy@…>

Branches:

feature/imgui-sdl, master

Children:

6bfd91c

Parents:

699e83a

Message:

Show the score and frame rate on the game screen

Files:

• gui/game-screen.cpp (modified) (2 diffs)
• gui/ui-value.hpp (added)
• makefile (modified) (1 diff)
• vulkan-game.cpp (modified) (6 diffs)
• vulkan-game.hpp (modified) (3 diffs)

gui/game-screen.cpp

@@ -9 +9 @@
 #include "button.hpp"
 #include "panel.hpp"
+#include "ui-value.hpp"
 
 using namespace std;
@@ -20 +21 @@
       Screen(renderer, gameInfo) {
    Panel *statsPanel = new Panel(10, 50, 95, 46, 0x161616FF, this->renderer);
+
+   statsPanel->addUIElement(new UIValue(0, 0, "Score: ", this->gameInfo.score,
+      this->gameInfo.proggyFont, 0xFFFFFFFF, this->renderer));
+   statsPanel->addUIElement(new UIValue(14, 19, "FPS: ", this->gameInfo.fps,
+      this->gameInfo.proggyFont, 0xFFFFFFFF, this->renderer));
 
    // TODO: Add the button to the panel it's in, not directly to the window

makefile

@@ -60 +60 @@
 
 GUI_SRC_FILES = gui/screen.cpp gui/main-screen.cpp gui/game-screen.cpp gui/ui-element.cpp gui/button.cpp gui/panel.cpp
-GUI_HEADER_FILES = gui/screen.hpp gui/main-screen.hpp gui/game-screen.hpp gui/ui-element.hpp gui/button.hpp gui/panel.hpp
+GUI_HEADER_FILES = gui/screen.hpp gui/main-screen.hpp gui/game-screen.hpp gui/ui-element.hpp gui/button.hpp gui/panel.hpp gui/ui-value.hpp
 
 SRC_FILES = main-vulkan.cpp vulkan-game.cpp crash-logger.cpp logger.cpp vulkan-utils.cpp utils.cpp game-gui-sdl.cpp $(GUI_SRC_FILES)

vulkan-game.cpp

@@ -44 +44 @@
 
    cout << "Vulkan Game" << endl;
+
+   this->score = 0;
 
    if (initUI(width, height, guiFlags) == RTWO_ERROR) {
@@ -674 +676 @@
    curTime = duration<float, seconds::period>(high_resolution_clock::now() - this->startTime).count();
 
+   this->fpsStartTime = curTime;
+   this->frameCount = 0;
+
    lastSpawn_asteroid = curTime;
 
@@ -681 +686 @@
       curTime = duration<float, seconds::period>(high_resolution_clock::now() - this->startTime).count();
       this->elapsedTime = curTime - this->prevTime;
+
+      if (curTime - this->fpsStartTime >= 1.0f) {
+         this->fps = (float)frameCount / (curTime - this->fpsStartTime);
+
+         this->frameCount = 0;
+         this->fpsStartTime = curTime;
+      }
+
+      this->frameCount++;
 
       gui->processEvents();
@@ -818 +832 @@
       }
 
-      // renderUI();
       currentScreen->renderUI();
 
@@ -877 +890 @@
             addExplosion(model_mat, 0.5f, curTime);
 
-            // TODO: Increment player's score here
+            this->score++;
          } else if ((objCenter.z - asteroid.radius) > -NEAR_CLIP) {
             asteroid.ssbo.deleted = true;
@@ -1022 +1035 @@
 
    VulkanUtils::copyDataToMemory(device, uniformBuffersMemory_explosionPipeline[currentImage], 0, explosion_UBO);
-}
-
-void VulkanGame::renderUI() {
-   SDL_SetRenderDrawColor(renderer, 0x00, 0x00, 0x00, 0x00);
-   SDL_RenderClear(renderer);
-
-   SDL_Rect rect = {280, 220, 100, 100};
-   SDL_SetRenderDrawColor(renderer, 0x00, 0xFF, 0x00, 0xFF);
-   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);
-
-   VulkanUtils::populateVulkanImageFromSDLTexture(device, physicalDevice, commandPool, uiOverlay, renderer,
-      sdlOverlayImage, graphicsQueue);
 }
 

vulkan-game.hpp

@@ -204 +204 @@
       TTF_Font* proggyFont;
 
+      int score;
+      float fps;
+
       GraphicsPipeline_Vulkan<OverlayVertex, void*> overlayPipeline;
 
@@ -345 +348 @@
       float prevTime, elapsedTime;
 
+      float fpsStartTime;
+      int frameCount;
+
       float shipSpeed = 0.5f;
       float asteroidSpeed = 2.0f;
@@ -363 +369 @@
       void mainLoop();
       void updateScene(uint32_t currentImage);
-      void renderUI();
       void renderScene();
       void cleanup();