Changeset f809ae6 in opengl-game for vulkan-game.cpp

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

File:

• vulkan-game.cpp (modified) (6 diffs)

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);
 }