Changeset 5081b9a in opengl-game for vulkan-game.cpp

Timestamp:

Apr 7, 2021, 2:29:16 AM (4 years ago)

Author:

Dmitry Portnoy <dportnoy@…>

Branches:

feature/imgui-sdl

Children:

db2d995

Parents:

e469aed

git-author:

Dmitry Portnoy <dportnoy@…> (04/07/21 02:25:11)

git-committer:

Dmitry Portnoy <dportnoy@…> (04/07/21 02:29:16)

Message:

Add prevTime and elapsedTime to SDLGame and refactor the event-handling code a little bit

File:

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

vulkan-game.cpp

@@ -661 +661 @@
 
          ImGui_ImplSDL2_ProcessEvent(&sdlEvent);
-         if (io.WantCaptureMouse &&
-               (e.type == UI_EVENT_MOUSEBUTTONDOWN || e.type == UI_EVENT_MOUSEBUTTONUP || e.type == UI_EVENT_UNKNOWN)) {
-            if (sdlEvent.type == SDL_MOUSEWHEEL || sdlEvent.type == SDL_MOUSEBUTTONDOWN || sdlEvent.type == SDL_MOUSEBUTTONUP) {
+         if ((e.type == UI_EVENT_MOUSEBUTTONDOWN || e.type == UI_EVENT_MOUSEBUTTONUP || e.type == UI_EVENT_UNKNOWN) &&
+             io.WantCaptureMouse) {
+            if (sdlEvent.type == SDL_MOUSEWHEEL || sdlEvent.type == SDL_MOUSEBUTTONDOWN ||
+               sdlEvent.type == SDL_MOUSEBUTTONUP) {
                continue;
             }
          }
-         if (io.WantCaptureKeyboard &&
-               (e.type == UI_EVENT_KEYDOWN || e.type == UI_EVENT_KEYUP)) {
+         if ((e.type == UI_EVENT_KEYDOWN || e.type == UI_EVENT_KEYUP) && io.WantCaptureKeyboard) {
             if (sdlEvent.type == SDL_KEYDOWN || sdlEvent.type == SDL_KEYUP) {
                continue;
@@ -681 +681 @@
                cout << "Quit event detected" << endl;
                done = true;
-               break;
-            case UI_EVENT_WINDOW:
-               cout << "Window event detected" << endl;
-               // Currently unused
                break;
             case UI_EVENT_WINDOWRESIZE:
@@ -764 +760 @@
                }
                break;
+            case UI_EVENT_WINDOW:
             case UI_EVENT_MOUSEBUTTONDOWN:
             case UI_EVENT_MOUSEBUTTONUP:
             case UI_EVENT_MOUSEMOTION:
                break;
+            case UI_EVENT_UNHANDLED:
+               cout << "Unhandled event type: 0x" << hex << sdlEvent.type << dec << endl;
+               break;
             case UI_EVENT_UNKNOWN:
-               //cout << "Unknown event type: 0x" << hex << e.unknown.eventType << dec << endl;
+            default:
+               cout << "Unknown event type: 0x" << hex << sdlEvent.type << dec << endl;
                break;
-            default:
-               cout << "Unhandled UI event: " << e.type << endl;
          }
 
@@ -1574 +1573 @@
 
    for (size_t i = 0; i < swapChainImageCount; i++) {
-      if (vkCreateSemaphore(device, &semaphoreInfo, nullptr, &imageAcquiredSemaphores[i]) != VK_SUCCESS) {
-         throw runtime_error("failed to create image acquired sempahore for a frame!");
-      }
-
-      if (vkCreateSemaphore(device, &semaphoreInfo, nullptr, &renderCompleteSemaphores[i]) != VK_SUCCESS) {
-         throw runtime_error("failed to create render complete sempahore for a frame!");
-      }
-
-      if (vkCreateFence(device, &fenceInfo, nullptr, &inFlightFences[i]) != VK_SUCCESS) {
-         throw runtime_error("failed to create fence for a frame!");
-      }
+      VKUTIL_CHECK_RESULT(vkCreateSemaphore(device, &semaphoreInfo, nullptr, &imageAcquiredSemaphores[i]),
+         "failed to create image acquired sempahore for a frame!");
+
+      VKUTIL_CHECK_RESULT(vkCreateSemaphore(device, &semaphoreInfo, nullptr, &renderCompleteSemaphores[i]),
+         "failed to create render complete sempahore for a frame!");
+
+      VKUTIL_CHECK_RESULT(vkCreateFence(device, &fenceInfo, nullptr, &inFlightFences[i]),
+         "failed to create fence for a frame!");
    }
 }