adapt to newest sfml

CMakeLists.txt

@@ -97,7 +97,7 @@ set(SFML_ENABLE_PCH true)
 CPMAddPackage(
     NAME SFML
     GITHUB_REPOSITORY vittorioromeo/SFML
-    GIT_TAG e327277b1d001079a85f3959ba2fc802f7dbbc6b
+    GIT_TAG 0608821ff4e8de462d5aa44343df42d989f8102a
 )
 
 set_target_properties(sfml-system PROPERTIES UNITY_BUILD ON)
@@ -201,7 +201,7 @@ if(NOT SSVOH_ANDROID)
     CPMAddPackage(
         NAME imgui-sfml
         GITHUB_REPOSITORY vittorioromeo/imgui-sfml
-        GIT_TAG 6ea83b31a67876fe8c3061297e2ac39033a8e0f3
+        GIT_TAG 32b2c1588b78b2946f8c7c61420fbd8a45ae4e9c
         )
 
     set_target_properties(ImGui-SFML PROPERTIES UNITY_BUILD ON)

include/SSVOpenHexagon/Core/HexagonGame.hpp

@@ -33,6 +33,8 @@
 #include <SFML/Graphics/Text.hpp>
 #include <SFML/Graphics/Texture.hpp>
 
+#include <SFML/Window/GraphicsContext.hpp>
+
 #include <SFML/System/Vector2.hpp>
 #include <SFML/System/Clock.hpp>
 
@@ -101,6 +103,9 @@ class HexagonGame
         TextUI(HGAssets& mAssets);
     };
 
+    sf::GraphicsContext* graphicsContext;
+    sf::base::Optional<sf::Texture> nullTexture;
+
     Steam::steam_manager* steamManager;
     Discord::discord_manager* discordManager;
     bool discordHung{false};
@@ -453,7 +458,8 @@ class HexagonGame
 public:
     std::function<void(const bool)> fnGoToMenu;
 
-    HexagonGame(Steam::steam_manager* mSteamManager,
+    HexagonGame(sf::GraphicsContext* graphicsContext,
+        Steam::steam_manager* mSteamManager,
         Discord::discord_manager* mDiscordManager, HGAssets& mAssets,
         Audio* mAudio, ssvs::GameWindow* mGameWindow,
         HexagonClient* mHexagonClient);

include/SSVOpenHexagon/Core/MenuGame.hpp

@@ -26,6 +26,8 @@
 #include <SFML/Graphics/Text.hpp>
 #include <SFML/Graphics/Texture.hpp>
 
+#include <SFML/Window/GraphicsContext.hpp>
+
 #include <SFML/System/Vector2.hpp>
 
 #include <array>
@@ -97,6 +99,7 @@ class MenuGame
     //---------------------------------------
     // Classes
 
+    sf::GraphicsContext& graphicsContext;
     Steam::steam_manager& steamManager;
     Discord::discord_manager& discordManager;
     HGAssets& assets;
@@ -572,7 +575,8 @@ class MenuGame
         const std::string& extra = "");
 
 public:
-    MenuGame(Steam::steam_manager& mSteamManager,
+    MenuGame(sf::GraphicsContext& mGraphicsContext,
+        Steam::steam_manager& mSteamManager,
         Discord::discord_manager& mDiscordManager, HGAssets& mAssets,
         Audio& mAudio, ssvs::GameWindow& mGameWindow,
         HexagonClient& mHexagonClient);

include/SSVOpenHexagon/Global/AssetStorage.hpp

@@ -4,15 +4,17 @@
 
 #pragma once
 
+#include "Imgui.hpp"
 #include "SSVOpenHexagon/Utils/UniquePtr.hpp"
 
 #include <string>
 
 namespace sf {
 
+class Font;
+class GraphicsContext;
 class SoundBuffer;
 class Texture;
-class Font;
 
 } // namespace sf
 
@@ -32,10 +34,11 @@ class AssetStorage
     explicit AssetStorage();
     ~AssetStorage();
 
-    [[nodiscard]] bool loadTexture(
+    [[nodiscard]] bool loadTexture(sf::GraphicsContext& graphicsContext,
         const std::string& id, const std::string& path);
 
-    [[nodiscard]] bool loadFont(const std::string& id, const std::string& path);
+    [[nodiscard]] bool loadFont(sf::GraphicsContext& graphicsContext,
+        const std::string& id, const std::string& path);
 
     [[nodiscard]] bool loadSoundBuffer(
         const std::string& id, const std::string& path);

include/SSVOpenHexagon/Global/Assets.hpp

@@ -14,10 +14,11 @@
 #include <vector>
 
 namespace sf {
-class SoundBuffer;
 class Font;
-class Texture;
+class GraphicsContext;
 class Shader;
+class SoundBuffer;
+class Texture;
 } // namespace sf
 
 namespace ssvu::FileSystem {
@@ -46,7 +47,8 @@ class HGAssets
     Utils::UniquePtr<HGAssetsImpl> _impl;
 
 public:
-    HGAssets(Steam::steam_manager* mSteamManager, bool mHeadless,
+    HGAssets(sf::GraphicsContext* graphicsContext,
+        Steam::steam_manager* mSteamManager, bool mHeadless,
         bool mLevelsOnly = false);
 
     ~HGAssets();
@@ -55,8 +57,8 @@ class HGAssets
 
     [[nodiscard]] LoadInfo& getLoadResults();
 
+    [[nodiscard]] bool hasTexture(const std::string& mId);
     [[nodiscard]] sf::Texture& getTexture(const std::string& mId);
-    [[nodiscard]] sf::Texture& getTextureOrNullTexture(const std::string& mId);
 
     [[nodiscard]] sf::Font& getFont(const std::string& mId);
 
@@ -99,7 +101,7 @@ class HGAssets
     [[nodiscard]] sf::Shader* getShaderByShaderId(const std::size_t mShaderId);
     [[nodiscard]] bool isValidShaderId(const std::size_t mShaderId) const;
 
-    void reloadAllShaders();
+    void reloadAllShaders(sf::GraphicsContext& graphicsContext);
     [[nodiscard]] std::string reloadPack(
         const std::string& mPackId, const std::string& mPath);
     [[nodiscard]] std::string reloadLevel(const std::string& mPackId,

include/SSVOpenHexagon/Global/Imgui.hpp

@@ -6,14 +6,15 @@
 
 namespace sf {
 class Event;
+class GraphicsContext;
 class RenderTarget;
 class RenderWindow;
 class Window;
 } // namespace sf
 
 namespace hg::Imgui {
 
-[[nodiscard]] bool initialize(sf::RenderWindow&);
+[[nodiscard]] bool initialize(sf::GraphicsContext&, sf::RenderWindow&);
 void shutdown();
 [[nodiscard]] bool wantCaptureKeyboard();
 [[nodiscard]] bool wantCaptureMouse();

src/SSVOpenHexagon/Core/Audio.cpp

@@ -18,6 +18,8 @@
 #include <SFML/Audio/Music.hpp>
 #include <SFML/Audio/PlaybackDevice.hpp>
 
+#include <SFML/Base/Optional.hpp>
+
 #include <optional>
 #include <string>
 
@@ -34,7 +36,7 @@ class Audio::AudioImpl
     // TODO (P2): remove these, roll own system
     ssvs::SoundPlayer _soundPlayer;
 
-    std::optional<sf::Music> _music;
+    sf::base::Optional<sf::Music> _music;
     float _musicVolume;
     std::string _lastLoadedMusicPath;
 
@@ -75,15 +77,15 @@ class Audio::AudioImpl
         SSVOH_ASSERT(volume >= 0.f && volume <= 100.f);
         _musicVolume = volume;
 
-        if (_music.has_value())
+        if (_music.hasValue())
         {
             _music->setVolume(_musicVolume);
         }
     }
 
     void resumeMusic()
     {
-        if (_music.has_value())
+        if (_music.hasValue())
         {
             _music->setVolume(_musicVolume);
             _music->play(_playbackDevice);
@@ -92,39 +94,39 @@ class Audio::AudioImpl
 
     void pauseMusic()
     {
-        if (_music.has_value())
+        if (_music.hasValue())
         {
             _music->pause();
         }
     }
 
     void stopMusic()
     {
-        if (_music.has_value())
+        if (_music.hasValue())
         {
             _music->stop();
         }
     }
 
     void setMusicPlayingOffsetSeconds(const float seconds)
     {
-        if (_music.has_value())
+        if (_music.hasValue())
         {
             _music->setPlayingOffset(sf::seconds(seconds));
         }
     }
 
     void setMusicPlayingOffsetMilliseconds(const int milliseconds)
     {
-        if (_music.has_value())
+        if (_music.hasValue())
         {
             _music->setPlayingOffset(sf::milliseconds(milliseconds));
         }
     }
 
     [[nodiscard]] float getMusicPlayingOffsetSeconds() const
     {
-        if (_music.has_value())
+        if (_music.hasValue())
         {
             return _music->getPlayingOffset().asSeconds();
         }
@@ -134,7 +136,7 @@ class Audio::AudioImpl
 
     [[nodiscard]] int getMusicPlayingOffsetMilliseconds() const
     {
-        if (_music.has_value())
+        if (_music.hasValue())
         {
             return _music->getPlayingOffset().asMilliseconds();
         }
@@ -197,7 +199,7 @@ class Audio::AudioImpl
             _lastLoadedMusicPath = *path;
         }
 
-        SSVOH_ASSERT(_music.has_value());
+        SSVOH_ASSERT(_music.hasValue());
 
         _music->setLoop(true);
         setMusicPlayingOffsetSeconds(playingOffsetSeconds);
@@ -208,7 +210,7 @@ class Audio::AudioImpl
 
     void setCurrentMusicPitch(const float pitch)
     {
-        if (_music.has_value())
+        if (_music.hasValue())
         {
             _music->setPitch(pitch);
         }

src/SSVOpenHexagon/Core/HGGraphics.cpp

@@ -306,7 +306,8 @@ void HexagonGame::draw()
     {
         if (window != nullptr)
         {
-            window->saveScreenshot("screenshot.png");
+            SSVOH_ASSERT(graphicsContext != nullptr);
+            window->saveScreenshot(*graphicsContext, "screenshot.png");
         }
 
         mustTakeScreenshot = false;

src/SSVOpenHexagon/Core/HGScripting.cpp

@@ -30,8 +30,8 @@
 
 #include <SSVUtils/Core/Log/Log.hpp>
 
-#include <SFML/Graphics.hpp>
-#include <SFML/System.hpp>
+#include <SFML/Window/Mouse.hpp>
+#include <SFML/Window/Keyboard.hpp>
 
 #include <iostream>
 #include <string>

src/SSVOpenHexagon/Core/HGUpdate.cpp

@@ -1000,7 +1000,7 @@ void HexagonGame::updateTrailParticles(float mFT)
         TrailParticle p{sf::Sprite{txSmallCircle->getRect()}};
 
         p.sprite.setPosition(player.getPosition());
-        p.sprite.setOrigin(sf::Vector2f{txSmallCircle->getSize()} / 2.f);
+        p.sprite.setOrigin(txSmallCircle->getSize().to<sf::Vector2f>() / 2.f);
 
         const float scale = Config::getPlayerTrailScale();
         p.sprite.setScale({scale, scale});
@@ -1030,7 +1030,7 @@ void HexagonGame::updateTrailParticles(float mFT)
         p.sprite.setScale(p.sprite.getScale() * 0.98f);
 
         p.sprite.setPosition(
-            sf::Vector2f(status.radius + 2.4f, sf::radians(p.angle)));
+            sf::Vector2f::fromAngle(status.radius + 2.4f, sf::radians(p.angle)));
     }
 
     if (player.hasChangedAngle())
@@ -1054,7 +1054,7 @@ void HexagonGame::updateSwapParticles(float mFT)
         SwapParticle p{sf::Sprite(txSmallCircle->getRect())};
 
         p.sprite.setPosition(si.position);
-        p.sprite.setOrigin(sf::Vector2f{txSmallCircle->getSize()} / 2.f);
+        p.sprite.setOrigin(txSmallCircle->getSize().to<sf::Vector2f>() / 2.f);
 
         const float scale = ssvu::getRndR(0.65f, 1.35f) * scaleMult;
         p.sprite.setScale({scale, scale});
@@ -1064,7 +1064,7 @@ void HexagonGame::updateSwapParticles(float mFT)
         c.a = alpha;
         p.sprite.setColor(c);
 
-        p.velocity = sf::Vector2f(ssvu::getRndR(0.1f, 10.f) * speedMult,
+        p.velocity = sf::Vector2f::fromAngle(ssvu::getRndR(0.1f, 10.f) * speedMult,
             sf::radians(si.angle + ssvu::getRndR(-expand, expand)));
 
         return p;