Merge pull request #733 from lethal-guitar/fix-mac-hidpi-rendering-modded

Fix Mac high DPI rendering when modded

Author: lethal-guitar

BUILDING.md

@@ -250,9 +250,7 @@ docker run -ti --device=/dev/dri:/dev/dri --cap-add=SYS_PTRACE --security-opt se
 
 ### <a name="mac-build-instructions">OS X builds</a>
 
-:exclamation: On Mojave (10.14) and older, non-Apple clang must be installed via Homebrew, Apple's clang does not have all required C++ library features. Starting with Catalina (10.15), Xcode's clang works fine.
-
-The oldest OS/compiler combination that has worked for me is clang 7 on Sierra (10.12).
+:exclamation: On Mojave (10.14), non-Apple clang must be installed via Homebrew, Apple's clang does not have all required C++ library features. Starting with Catalina (10.15), Xcode's clang works fine.
 
 ### <a name="mac-build-instructions-1015">Catalina (10.15) or newer</a>
 
@@ -266,6 +264,9 @@ mkdir build
 cd build
 cmake .. -DWARNINGS_AS_ERRORS=OFF
 make
+
+# Now run it!
+./src/RigelEngine.app/Contents/MacOS/RigelEngine
 ```
 
 ### <a name="mac-build-instructions-1014">Mojave (10.14) using clang 8</a>
@@ -290,28 +291,9 @@ mkdir build
 cd build
 cmake .. -DWARNINGS_AS_ERRORS=OFF
 make
-```
-
-### <a name="mac-build-instructions-1013">High Sierra (10.13) or older using clang 7</a>
-
-```bash
-# You might need to run brew update.
-brew install llvm@7 cmake sdl2 sdl2_mixer boost
-
-# Set up environment variables so that CMake picks up the newly installed clang -
-# this is only necessary the first time.
-export rigel_llvm_path=`brew --prefix llvm@7`;
-export CC="$rigel_llvm_path/bin/clang";
-export CXX="$CC++";
-export CPPFLAGS="-I$rigel_llvm_path/include";
-export LDFLAGS="-L$rigel_llvm_path/lib -Wl,-rpath,$rigel_llvm_path/lib";
-unset rigel_llvm_path;
 
-# Now, the regular build via CMake should work:
-mkdir build
-cd build
-cmake .. -DWARNINGS_AS_ERRORS=OFF
-make
+# Now run it!
+./src/RigelEngine.app/Contents/MacOS/RigelEngine
 ```
 
 ### <a name="windows-build-instructions">Windows builds</a>

src/frontend/game.cpp

@@ -258,6 +258,7 @@ Game::Game(
   , mIsMinimized(false)
   , mCommandLineOptions(commandLineOptions)
   , mpUserProfile(pUserProfile)
+  , mPreviousWindowSize(mRenderer.windowSize())
   , mWidescreenModeWasActive(
       pUserProfile->mOptions.mWidescreenModeOn &&
       renderer::canUseWidescreenMode(&mRenderer))
@@ -637,7 +638,8 @@ void Game::applyChangedOptions()
   if (
     widescreenModeActive != mWidescreenModeWasActive ||
     currentOptions.mPerElementUpscalingEnabled !=
-      mPreviousOptions.mPerElementUpscalingEnabled)
+      mPreviousOptions.mPerElementUpscalingEnabled ||
+    mPreviousWindowSize != mRenderer.windowSize())
   {
     mRenderTarget = renderer::createFullscreenRenderTarget(
       &mRenderer, mpUserProfile->mOptions);
@@ -646,6 +648,7 @@ void Game::applyChangedOptions()
 
   mPreviousOptions = mpUserProfile->mOptions;
   mWidescreenModeWasActive = widescreenModeActive;
+  mPreviousWindowSize = mRenderer.windowSize();
 }
 
 

src/frontend/game.hpp

@@ -142,6 +142,7 @@ class Game : public IGameServiceProvider
   CommandLineOptions mCommandLineOptions;
   UserProfile* mpUserProfile;
   data::GameOptions mPreviousOptions;
+  base::Size<int> mPreviousWindowSize;
   bool mWidescreenModeWasActive;
   std::filesystem::path mGamePathToSwitchTo;
 

src/game_logic/game_world.cpp

@@ -299,6 +299,7 @@ GameWorld::GameWorld(
       mpRenderer,
       renderer::determineWidescreenViewPort(mpRenderer).mWidthPx,
       data::GameTraits::viewPortHeightPx)
+  , mPreviousWindowSize(mpRenderer->windowSize())
   , mWidescreenModeWasOn(widescreenModeOn())
   , mPerElementUpscalingWasEnabled(mpOptions->mPerElementUpscalingEnabled)
 {
@@ -703,7 +704,8 @@ void GameWorld::render()
 {
   if (
     widescreenModeOn() != mWidescreenModeWasOn ||
-    mpOptions->mPerElementUpscalingEnabled != mPerElementUpscalingWasEnabled)
+    mpOptions->mPerElementUpscalingEnabled != mPerElementUpscalingWasEnabled ||
+    mPreviousWindowSize != mpRenderer->windowSize())
   {
     mWaterEffectBuffer =
       renderer::createFullscreenRenderTarget(mpRenderer, *mpOptions);
@@ -843,6 +845,7 @@ void GameWorld::render()
 
   mWidescreenModeWasOn = widescreenModeOn();
   mPerElementUpscalingWasEnabled = mpOptions->mPerElementUpscalingEnabled;
+  mPreviousWindowSize = mpRenderer->windowSize();
 }
 
 

src/game_logic/game_world.hpp

@@ -157,6 +157,7 @@ class GameWorld : public entityx::Receiver<GameWorld>
   ui::IngameMessageDisplay mMessageDisplay;
   renderer::RenderTargetTexture mWaterEffectBuffer;
   renderer::RenderTargetTexture mLowResLayer;
+  base::Size<int> mPreviousWindowSize;
   bool mWidescreenModeWasOn;
   bool mPerElementUpscalingWasEnabled;
 

src/renderer/renderer.cpp

@@ -401,7 +401,6 @@ struct Renderer::Impl
   RenderMode mLastKnownRenderMode = RenderMode::SpriteBatch;
 
   // cold
-  base::Size<int> mMaxWindowSize;
   int mNumTextures = 0;
   int mNumInternalTextures = 0;
   TextureId mWaterSurfaceAnimTexture = 0;
@@ -429,11 +428,6 @@ struct Renderer::Impl
         {"position", "texCoordMask"})
     , mWindowSize(getSize(pWindow))
     , mpWindow(pWindow)
-    , mMaxWindowSize([pWindow]() {
-      SDL_DisplayMode displayMode;
-      sdl_utils::check(SDL_GetDesktopDisplayMode(0, &displayMode));
-      return base::Size<int>{displayMode.w, displayMode.h};
-    }())
   {
     // General configuration
     glDisable(GL_DEPTH_TEST);
@@ -1323,12 +1317,6 @@ base::Size<int> Renderer::windowSize() const
 }
 
 
-base::Size<int> Renderer::maxWindowSize() const
-{
-  return mpImpl->mMaxWindowSize;
-}
-
-
 void Renderer::setRenderTarget(const TextureId target)
 {
   mpImpl->setRenderTarget(target);

src/renderer/upscaling_utils.cpp

@@ -125,9 +125,7 @@ RenderTargetTexture createFullscreenRenderTarget(
   if (options.mPerElementUpscalingEnabled)
   {
     return RenderTargetTexture{
-      pRenderer,
-      pRenderer->maxWindowSize().width,
-      pRenderer->maxWindowSize().height};
+      pRenderer, pRenderer->windowSize().width, pRenderer->windowSize().height};
   }
   else
   {

src/ui/options_menu.cpp

@@ -709,7 +709,7 @@ void OptionsMenu::drawCreditsBox(const engine::TimeDelta dt)
 
   ImGui::NewLine();
 
-  centeredText("OpenSUSE package by mnhauke (https://github.com/mnhauke)");
+  centeredText("openSUSE package by mnhauke (https://github.com/mnhauke)");
 
   ImGui::NewLine();