adapt to latest SSVU/SSVS

3 files changed, 18 insertions, 21 deletions

diff --git a/src/SSVOpenHexagon/Core/HGGraphics.cpp b/src/SSVOpenHexagon/Core/HGGraphics.cpp
index 6c086cb3..f7bad7b5 100644
--- a/src/SSVOpenHexagon/Core/HGGraphics.cpp
+++ b/src/SSVOpenHexagon/Core/HGGraphics.cpp
@@ -80,7 +80,7 @@ void HexagonGame::draw()
 
     if(!Config::getNoBackground())
     {
-        backgroundCamera->apply();
+        backgroundCamera->apply(*window);
 
         backgroundTris.clear();
 
@@ -93,7 +93,7 @@ void HexagonGame::draw()
         render(backgroundTris);
     }
 
-    backgroundCamera->apply();
+    backgroundCamera->apply(*window);
 
     wallQuads3D.clear();
     pivotQuads3D.clear();
@@ -242,7 +242,7 @@ void HexagonGame::draw()
     render(pivotQuads);
     render(playerTris);
 
-    overlayCamera->apply();
+    overlayCamera->apply(*window);
 
     drawParticles();
     drawText();
@@ -293,7 +293,7 @@ void HexagonGame::drawImguiLuaConsole()
     }
 
     SSVOH_ASSERT(overlayCamera.has_value());
-    overlayCamera->unapply();
+    overlayCamera->unapply(*window);
 
     Imgui::render(*window);
 }
diff --git a/src/SSVOpenHexagon/Core/HexagonGame.cpp b/src/SSVOpenHexagon/Core/HexagonGame.cpp
index eb08cca6..98b190e8 100644
--- a/src/SSVOpenHexagon/Core/HexagonGame.cpp
+++ b/src/SSVOpenHexagon/Core/HexagonGame.cpp
@@ -307,13 +307,11 @@ HexagonGame::HexagonGame(Steam::steam_manager* mSteamManager,
         const float height = Config::getHeight();
         const float zoomFactor = Config::getZoomFactor();
 
-        backgroundCamera.emplace(*window,
-            sf::View{ssvs::zeroVec2f,
-                sf::Vector2f{width * zoomFactor, height * zoomFactor}});
+        backgroundCamera.emplace(sf::View{ssvs::zeroVec2f,
+            sf::Vector2f{width * zoomFactor, height * zoomFactor}});
 
-        overlayCamera.emplace(
-            *window, sf::View{sf::Vector2f{width / 2.f, height / 2.f},
-                         sf::Vector2f{width, height}});
+        overlayCamera.emplace(sf::View{sf::Vector2f{width / 2.f, height / 2.f},
+            sf::Vector2f{width, height}});
 
         txStarParticle = &assets.getTextureOrNullTexture("starParticle.png");
         txSmallCircle = &assets.getTextureOrNullTexture("smallCircle.png");
diff --git a/src/SSVOpenHexagon/Core/MenuGame.cpp b/src/SSVOpenHexagon/Core/MenuGame.cpp
index 7ab255a0..208deb0d 100644
--- a/src/SSVOpenHexagon/Core/MenuGame.cpp
+++ b/src/SSVOpenHexagon/Core/MenuGame.cpp
@@ -170,14 +170,13 @@ MenuGame::MenuGame(Steam::steam_manager& mSteamManager,
       rsOnlineStatus{sf::Vector2f{128.f, 32.f}},
       txtOnlineStatus{"", openSquare, 24},
       enteredChars{},
-      backgroundCamera{window,
+      backgroundCamera{
           {ssvs::zeroVec2f, {Config::getSizeX() * Config::getZoomFactor(),
                                 Config::getSizeY() * Config::getZoomFactor()}}},
-      overlayCamera{
-          window, {{Config::getWidth() / 2.f,
-                       Config::getHeight() * Config::getZoomFactor() / 2.f},
-                      {Config::getWidth() * Config::getZoomFactor(),
-                          Config::getHeight() * Config::getZoomFactor()}}},
+      overlayCamera{{{Config::getWidth() / 2.f,
+                         Config::getHeight() * Config::getZoomFactor() / 2.f},
+          {Config::getWidth() * Config::getZoomFactor(),
+              Config::getHeight() * Config::getZoomFactor()}}},
       mustRefresh{false},
       wasFocusHeld{false},
       focusHeld{false},
@@ -957,7 +956,7 @@ void MenuGame::initInput()
 
     game.addInput( // hardcoded
         {{k::Escape}},
-        [this](ssvs::FT mFT)
+        [this](ssvu::FT mFT)
         {
             if(state != States::MOpts)
             {
@@ -3637,7 +3636,7 @@ void MenuGame::setMouseCursorVisible(const bool x)
         return false;
     }
 
-    const sf::Vector2f mp = overlayCamera.getMousePosition();
+    const sf::Vector2f mp = overlayCamera.getMousePosition(window);
 
     return mp.x > mins.x - tolerance && mp.x < maxs.x + tolerance &&
            mp.y > mins.y - tolerance && mp.y < maxs.y + tolerance;
@@ -5705,7 +5704,7 @@ void MenuGame::draw()
     styleData.computeColors();
     window.clear(sf::Color{0, 0, 0, 255});
 
-    backgroundCamera.apply();
+    backgroundCamera.apply(window);
     const bool mainOrAbove{state >= States::SMain};
 
     // Only draw the hexagon background past the loading screens.
@@ -5722,7 +5721,7 @@ void MenuGame::draw()
         render(menuBackgroundTris);
     }
 
-    overlayCamera.apply();
+    overlayCamera.apply(window);
 
     // Draw the profile name.
     if(mainOrAbove && state != States::LevelSelection)
@@ -5903,7 +5902,7 @@ void MenuGame::draw()
 
     if(!dialogBox.empty())
     {
-        overlayCamera.apply();
+        overlayCamera.apply(window);
         dialogBox.draw(dialogBoxTextColor, styleData.getColor(0));
     }