Changeset 5081b9a in opengl-game for sdl-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:

• sdl-game.cpp (modified) (3 diffs)

sdl-game.cpp

@@ -196 +196 @@
    while (!done) {
 
+      prevTime = curTime;
       curTime = duration<float, seconds::period>(steady_clock::now() - startTime).count();
+      elapsedTime = curTime - prevTime;
 
       if (curTime - fpsStartTime >= 1.0f) {
@@ -215 +217 @@
 
          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;
@@ -232 +234 @@
 
          switch (e.type) {
-         case UI_EVENT_MOUSEMOTION:
-            // Currently unused
-            break;
-         case UI_EVENT_WINDOW:
-            // Currently unused
-            break;
-         case UI_EVENT_QUIT:
-            cout << "Quit event detected" << endl;
-            done = true;
-            break;
-         case UI_EVENT_UNHANDLED:
-            cout << "Unhandled event type: 0x" << hex << sdlEvent.type << dec << endl;
-            break;
-         case UI_EVENT_UNKNOWN:
-         default:
-            cout << "Unknown event type: 0x" << hex << sdlEvent.type << dec << endl;
-            break;
+            case UI_EVENT_QUIT:
+               cout << "Quit event detected" << endl;
+               done = true;
+               break;
+            case UI_EVENT_WINDOWRESIZE:
+               cout << "Window resize event detected" << endl;
+               shouldRecreateSwapChain = true;
+               break;
+            case UI_EVENT_KEYUP:
+               // START UNREVIEWED SECTION
+               // END UNREVIEWED SECTION
+               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:
+            default:
+               cout << "Unknown event type: 0x" << hex << sdlEvent.type << dec << endl;
+               break;
          }
       }