(WIP, DO NOT MERGE) Replay drag n drop

_RELEASE/config.json

@@ -38,6 +38,7 @@
 	"player_speed" : 9.449999809265137,
 	"pulse_enabled" : true,
 	"rotate_to_start" : true,
+	"save_local_best_replay_to_file" : true,
 	"server_local" : true,
 	"server_verbose" : true,
 	"show_fps" : true,

include/SSVOpenHexagon/Core/Discord.hpp

@@ -4,8 +4,6 @@
 
 #pragma once
 
-#include "SSVOpenHexagon/Global/Common.hpp"
-
 #include "discord/discord.h"
 
 #include <string_view>

include/SSVOpenHexagon/Core/HexagonGame.hpp

@@ -4,7 +4,6 @@
 
 #pragma once
 
-#include "SSVOpenHexagon/Global/Common.hpp"
 #include "SSVOpenHexagon/Core/HGStatus.hpp"
 #include "SSVOpenHexagon/Core/Steam.hpp"
 #include "SSVOpenHexagon/Core/RandomNumberGenerator.hpp"
@@ -35,6 +34,11 @@
 #include <SSVUtils/Core/Common/Frametime.hpp>
 #include <SSVUtils/Timeline/Timeline.hpp>
 
+#include <SFML/Audio.hpp>
+#include <SFML/Graphics.hpp>
+#include <SFML/System.hpp>
+#include <SFML/Window.hpp>
+
 #include <sstream>
 #include <optional>
 
@@ -161,6 +165,9 @@ class HexagonGame
 
     Utils::LuaMetadata luaMetadata;
 
+    std::string packId;
+    std::string levelId;
+
     // Lua related methods
     void redefineLuaFunctions();
     void destroyMaliciousFunctions();
@@ -238,6 +245,8 @@ class HexagonGame
             Utils::runLuaFunctionIfExists<T, TArgs...>(lua, mName, mArgs...)){};
     }
 
+    void setLastReplay(const replay_file& mReplayFile);
+
 private:
     void start();
 
@@ -283,8 +292,20 @@ class HexagonGame
     void addMessage(std::string mMessage, double mDuration, bool mSoundToggle);
     void clearMessages();
 
+    enum class CheckSaveScoreResult
+    {
+        Ineligible,
+        Invalid,
+        Local_NewBest,
+        Local_NoNewBest,
+        Online_LessThan8Secs,
+        Online_ConnectionError,
+        Online_VersionMismatch,
+        Online_Sent
+    };
+
     // Level/menu loading/unloading/changing
-    void checkAndSaveScore();
+    CheckSaveScoreResult checkAndSaveScore();
     void goToMenu(bool mSendScores = true, bool mError = false);
 
     void invalidateScore(const std::string& mReason);

include/SSVOpenHexagon/Core/MenuGame.hpp

@@ -5,6 +5,7 @@
 #pragma once
 
 #include "SSVOpenHexagon/Core/Steam.hpp"
+
 #include "SSVOpenHexagon/Core/HexagonDialogBox.hpp"
 #include "SSVOpenHexagon/Global/Common.hpp"
 #include "SSVOpenHexagon/Data/LevelData.hpp"
@@ -22,6 +23,11 @@
 
 #include <SSVUtils/Core/Common/Frametime.hpp>
 
+#include <SFML/Audio.hpp>
+#include <SFML/Graphics.hpp>
+#include <SFML/System.hpp>
+#include <SFML/Window.hpp>
+
 #include <cctype>
 
 namespace hg
@@ -30,12 +36,7 @@ namespace hg
 enum class States
 {
     EpilepsyWarning,
-    ETUser,
-    ETPass,
-    ETEmail,
     ETLPNew,
-    ETFriend,
-    SLogging,
     SMain,
     SLPSelect,
     MWlcm,
@@ -218,9 +219,7 @@ class MenuGame
 
     [[nodiscard]] bool isEnteringText()
     {
-        return state == States::ETUser || state == States::ETPass ||
-               state == States::ETEmail || state == States::ETLPNew ||
-               state == States::ETFriend;
+        return state == States::ETLPNew;
     }
 
     [[nodiscard]] ssvms::Menu* getCurrentMenu() noexcept

include/SSVOpenHexagon/Core/Replay.hpp

@@ -78,13 +78,13 @@ class replay_data
     [[nodiscard]] bool operator!=(const replay_data& rhs) const noexcept;
 
     [[nodiscard]] serialization_result serialize(
-        std::byte* buffer, const std::size_t buffer_size);
+        std::byte* buffer, const std::size_t buffer_size) const;
 
     [[nodiscard]] deserialization_result deserialize(
         const std::byte* buffer, const std::size_t buffer_size);
 
     [[nodiscard]] serialization_result serialize(
-        std::byte* buffer, const std::byte* const buffer_end);
+        std::byte* buffer, const std::byte* const buffer_end) const;
 
     [[nodiscard]] deserialization_result deserialize(
         const std::byte* buffer, const std::byte* const buffer_end);
@@ -101,6 +101,7 @@ class replay_player
 
     [[nodiscard]] input_bitset get_current_and_move_forward() noexcept;
     [[nodiscard]] bool done() const noexcept;
+    void reset() noexcept;
 };
 
 struct replay_file
@@ -121,19 +122,21 @@ struct replay_file
     [[nodiscard]] bool operator!=(const replay_file& rhs) const noexcept;
 
     [[nodiscard]] serialization_result serialize(
-        std::byte* buffer, const std::size_t buffer_size);
+        std::byte* buffer, const std::size_t buffer_size) const;
 
     [[nodiscard]] deserialization_result deserialize(
         const std::byte* buffer, const std::size_t buffer_size);
 
     [[nodiscard]] serialization_result serialize(
-        std::byte* buffer, const std::byte* const buffer_end);
+        std::byte* buffer, const std::byte* const buffer_end) const;
 
     [[nodiscard]] deserialization_result deserialize(
         const std::byte* buffer, const std::byte* const buffer_end);
 
-    [[nodiscard]] bool serialize_to_file(const std::filesystem::path p);
+    [[nodiscard]] bool serialize_to_file(const std::filesystem::path p) const;
     [[nodiscard]] bool deserialize_from_file(const std::filesystem::path p);
+
+    [[nodiscard]] std::string create_filename() const;
 };
 
 } // namespace hg

include/SSVOpenHexagon/Core/Steam.hpp

@@ -4,10 +4,10 @@
 
 #pragma once
 
-#include "SSVOpenHexagon/Global/Common.hpp"
-
+#include <stdint.h> // Steam API needs this.
 #include "steam/steam_api.h"
 
+#include <functional>
 #include <string_view>
 #include <unordered_set>
 

include/SSVOpenHexagon/Data/CapColor.hpp

@@ -4,7 +4,6 @@
 
 #pragma once
 
-#include "SSVOpenHexagon/Global/Common.hpp"
 #include "SSVOpenHexagon/Data/ColorData.hpp"
 #include "SSVOpenHexagon/SSVUtilsJson/SSVUtilsJson.hpp"
 

include/SSVOpenHexagon/Data/MusicData.hpp

@@ -4,10 +4,11 @@
 
 #pragma once
 
-#include "SSVOpenHexagon/Global/Common.hpp"
 #include "SSVOpenHexagon/Global/Config.hpp"
 #include "SSVOpenHexagon/Global/Assets.hpp"
 
+#include <SFML/System.hpp>
+
 #include <string>
 
 namespace hg

include/SSVOpenHexagon/Data/ProfileData.hpp

@@ -4,7 +4,6 @@
 
 #pragma once
 
-#include "SSVOpenHexagon/Global/Common.hpp"
 #include "SSVOpenHexagon/SSVUtilsJson/SSVUtilsJson.hpp"
 
 namespace hg

include/SSVOpenHexagon/Data/StyleData.hpp

@@ -4,11 +4,12 @@
 
 #pragma once
 
-#include "SSVOpenHexagon/Global/Common.hpp"
 #include "SSVOpenHexagon/Data/ColorData.hpp"
 #include "SSVOpenHexagon/Data/CapColor.hpp"
 #include "SSVOpenHexagon/SSVUtilsJson/SSVUtilsJson.hpp"
 
+#include <SFML/Graphics.hpp>
+
 #include <SSVUtils/Core/FileSystem/FileSystem.hpp>
 
 namespace hg

include/SSVOpenHexagon/Data/TrackedVariable.hpp

@@ -5,19 +5,13 @@
 #pragma once
 
 #include <string>
-#include <utility>
 
 namespace hg
 {
 
 struct TrackedVariable
 {
     std::string variableName, displayName;
-    TrackedVariable(std::string mVariableName, std::string mDisplayName)
-        : variableName{std::move(mVariableName)}, displayName{
-                                                      std::move(mDisplayName)}
-    {
-    }
 };
 
 } // namespace hg

include/SSVOpenHexagon/Global/Assets.hpp

@@ -4,13 +4,10 @@
 
 #pragma once
 
-#include "SSVOpenHexagon/Global/Common.hpp"
 #include "SSVOpenHexagon/Data/LevelData.hpp"
 #include "SSVOpenHexagon/Data/PackData.hpp"
 #include "SSVOpenHexagon/Data/ProfileData.hpp"
 #include "SSVOpenHexagon/Data/StyleData.hpp"
-#include "SSVOpenHexagon/Online/Online.hpp"
-#include "SSVOpenHexagon/Online/OHServer.hpp"
 
 #include <SSVStart/Assets/Assets.hpp>
 #include <SSVStart/SoundPlayer/SoundPlayer.hpp>
@@ -19,6 +16,8 @@
 #include <SSVUtils/Core/Assert/Assert.hpp>
 #include <SSVUtils/Core/FileSystem/FileSystem.hpp>
 
+#include <SFML/System.hpp>
+
 #include <unordered_map>
 #include <map>
 #include <vector>
@@ -72,8 +71,6 @@ class HGAssets
     [[nodiscard]] bool loadPackInfo(const PackData& packData);
 
 public:
-    float playedSeconds{0};
-
     HGAssets(Steam::steam_manager& mSteamManager, bool mLevelsOnly = false);
 
     auto& operator()()
@@ -183,43 +180,25 @@ class HGAssets
 
     std::string pGetName() const
     {
-        if(!playingLocally)
-        {
-            return Online::getCurrentUsername();
-        }
-
+        assert(playingLocally); // TODO
         return getCurrentLocalProfile().getName();
     }
 
     const std::vector<std::string>& pGetTrackedNames() const
     {
-        if(!playingLocally)
-        {
-            return Online::getUserStats().trackedNames;
-        }
-
+        assert(playingLocally); // TODO
         return getCurrentLocalProfile().getTrackedNames();
     }
 
     void pClearTrackedNames()
     {
-        if(!playingLocally)
-        {
-            Online::trySendClearFriends();
-            return;
-        }
-
+        assert(playingLocally); // TODO
         getCurrentLocalProfile().clearTrackedNames();
     }
 
     void pAddTrackedName(const std::string& mName)
     {
-        if(!playingLocally)
-        {
-            Online::trySendAddFriend(mName);
-            return;
-        }
-
+        assert(playingLocally); // TODO
         getCurrentLocalProfile().addTrackedName(mName);
     }
 

include/SSVOpenHexagon/Global/Config.hpp

@@ -70,6 +70,7 @@ void setTimescale(float mX);
 void setShowKeyIcons(bool mX);
 void setKeyIconsScale(float mX);
 void setFirstTimePlaying(bool mX);
+void setSaveLocalBestReplayToFile(bool mX);
 
 [[nodiscard]] bool getOnline();
 [[nodiscard]] bool getOfficial();
@@ -93,8 +94,8 @@ void setFirstTimePlaying(bool mX);
 [[nodiscard]] bool getVsync();
 [[nodiscard]] bool getAutoZoomFactor();
 [[nodiscard]] bool getFullscreen();
-[[nodiscard]] float getVersion();
-[[nodiscard]] const char* getVersionString();
+[[nodiscard, gnu::const]] float getVersion();
+[[nodiscard, gnu::const]] const char* getVersionString();
 [[nodiscard]] bool getWindowedAutoResolution();
 [[nodiscard]] bool getFullscreenAutoResolution();
 [[nodiscard]] unsigned int getFullscreenWidth();
@@ -134,6 +135,7 @@ void setFirstTimePlaying(bool mX);
 [[nodiscard]] bool getShowKeyIcons();
 [[nodiscard]] float getKeyIconsScale();
 [[nodiscard]] bool getFirstTimePlaying();
+[[nodiscard]] bool getSaveLocalBestReplayToFile();
 
 [[nodiscard]] ssvs::Input::Trigger getTriggerRotateCCW();
 [[nodiscard]] ssvs::Input::Trigger getTriggerRotateCW();