Changeset 756162f in opengl-game for vulkan-game.cpp

Timestamp:

May 1, 2021, 6:26:44 PM (4 years ago)

Author:

Dmitry Portnoy <dportnoy@…>

Branches:

feature/imgui-sdl

Children:

9d21aac

Parents:

b8072d3 (diff), cb6fabb (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Dmitry Portnoy <dportnoy@…> (05/01/21 18:26:23)

git-committer:

Dmitry Portnoy <dportnoy@…> (05/01/21 18:26:44)

Message:

Merge branch 'feature/imgui-sdl' of medievaltech.com:opengl-game into feature/imgui-sdl

File:

• vulkan-game.cpp (modified) (1 diff)

vulkan-game.cpp

@@ -853 +853 @@
       ImGui::NewFrame();
 
-      (this->*currentRenderScreenFn)(gui->getWindowWidth(), gui->getWindowHeight());
+      int w, h;
+      SDL_GetWindowSize(((GameGui_SDL*)gui)->window, &w, &h);
+
+      // Probably a retina display
+      // TODO: Find a better fix for this. Maybe I should use SDL_Vulkan_GetWindowSize here instead
+      // of SDL_Vulkan_GetDrawableSize
+      if (w < gui->getWindowWidth() && h < gui->getWindowHeight()) {
+         (this->*currentRenderScreenFn)(w, h);
+      } else {
+         (this->*currentRenderScreenFn)(gui->getWindowWidth(), gui->getWindowHeight());
+      }
 
       ImGui::Render();