From 1d9310fb9c937c16a046298a359cc05edbae1557 Mon Sep 17 00:00:00 2001 From: Future Date: Sun, 26 May 2024 11:53:07 +0200 Subject: [PATCH 1/4] feat(iw5): load leaderboard definitions from raw --- .../AssetLoaders/AssetLoaderLeaderboard.cpp | 26 ++++ .../IW5/AssetLoaders/AssetLoaderLeaderboard.h | 3 + .../Leaderboard/JsonLeaderboardDefLoader.cpp | 145 ++++++++++++++++++ .../Leaderboard/JsonLeaderboardDefLoader.h | 9 ++ 4 files changed, 183 insertions(+) create mode 100644 src/ObjLoading/Game/IW5/Leaderboard/JsonLeaderboardDefLoader.cpp create mode 100644 src/ObjLoading/Game/IW5/Leaderboard/JsonLeaderboardDefLoader.h diff --git a/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderLeaderboard.cpp b/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderLeaderboard.cpp index a1dce05f..25b25e48 100644 --- a/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderLeaderboard.cpp +++ b/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderLeaderboard.cpp @@ -1,10 +1,13 @@ #include "AssetLoaderLeaderboard.h" #include "Game/IW5/IW5.h" +#include "Game/IW5/Leaderboard/JsonLeaderboardDefLoader.h" #include "ObjLoading.h" #include "Pool/GlobalAssetPool.h" #include +#include +#include using namespace IW5; @@ -15,3 +18,26 @@ void* AssetLoaderLeaderboard::CreateEmptyAsset(const std::string& assetName, Mem leaderboard->name = memory->Dup(assetName.c_str()); return leaderboard; } + +bool AssetLoaderLeaderboard::CanLoadFromRaw() const +{ + return true; +} + +bool AssetLoaderLeaderboard::LoadFromRaw( + const std::string& assetName, ISearchPath* searchPath, MemoryManager* memory, IAssetLoadingManager* manager, Zone* zone) const +{ + const auto file = searchPath->Open(std::format("leaderboards/{}.json", assetName)); + if (!file.IsOpen()) + return false; + + auto* leaderboardDef = memory->Alloc(); + leaderboardDef->name = memory->Dup(assetName.c_str()); + + if (LoadLeaderboardAsJson(*file.m_stream, *leaderboardDef, memory)) + manager->AddAsset(assetName, leaderboardDef); + else + std::cerr << std::format("Failed to load leaderboard \"{}\"\n", assetName); + + return true; +} diff --git a/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderLeaderboard.h b/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderLeaderboard.h index c0e58f96..50c7cf72 100644 --- a/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderLeaderboard.h +++ b/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderLeaderboard.h @@ -10,5 +10,8 @@ namespace IW5 { public: _NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override; + _NODISCARD bool CanLoadFromRaw() const override; + bool + LoadFromRaw(const std::string& assetName, ISearchPath* searchPath, MemoryManager* memory, IAssetLoadingManager* manager, Zone* zone) const override; }; } // namespace IW5 diff --git a/src/ObjLoading/Game/IW5/Leaderboard/JsonLeaderboardDefLoader.cpp b/src/ObjLoading/Game/IW5/Leaderboard/JsonLeaderboardDefLoader.cpp new file mode 100644 index 00000000..b46a727d --- /dev/null +++ b/src/ObjLoading/Game/IW5/Leaderboard/JsonLeaderboardDefLoader.cpp @@ -0,0 +1,145 @@ +#include "JsonLeaderboardDefLoader.h" + +#include "Game/IW5/CommonIW5.h" +#include "Game/IW5/Leaderboard/JsonLeaderboardDef.h" + +#include +#include +#include + +using namespace nlohmann; +using namespace IW5; + +namespace +{ + class JsonLoader + { + public: + JsonLoader(std::istream& stream, MemoryManager& memory) + : m_stream(stream), + m_memory(memory) + { + } + + bool Load(LeaderboardDef& leaderboardDef) const + { + const auto jRoot = json::parse(m_stream); + std::string type; + unsigned version; + + jRoot.at("_type").get_to(type); + jRoot.at("_version").get_to(version); + + if (type != "leaderboard" || version != 1u) + { + std::cerr << std::format("Tried to load leaderboard \"{}\" but did not find expected type leaderboard of version 1\n", leaderboardDef.name); + return false; + } + + const auto jLeaderboard = jRoot.get(); + return CreateLeaderboardFromJson(jLeaderboard, leaderboardDef); + } + + private: + static bool CreateTrackTypeFlagsFromJson(const JsonLeaderboardDef& jLeaderboardDef, int& gameFlags) + { + for (const auto gameFlag : jLeaderboardDef.trackTypes) + gameFlags |= gameFlag; + + return true; + } + + bool CreateColumnDefFromJson(const JsonColumnDef& jColumn, LbColumnDef& lbColumnDef, LeaderboardDef& leaderboardDef) const + { + lbColumnDef.name = m_memory.Dup(jColumn.name.c_str()); + + if (jColumn.propertyId) + lbColumnDef.propertyId = jColumn.propertyId.value(); + else + lbColumnDef.propertyId = 0; + + if (jColumn.hidden) + lbColumnDef.hidden = jColumn.hidden.value(); + else + lbColumnDef.hidden = false; + + if (jColumn.statName) + lbColumnDef.statName = m_memory.Dup(jColumn.statName->c_str()); + else + lbColumnDef.statName = nullptr; + + lbColumnDef.type = jColumn.type; + + if (jColumn.precision) + lbColumnDef.precision = jColumn.precision.value(); + else + lbColumnDef.precision = 0; + + lbColumnDef.agg = jColumn.aggregationFunction; + + if (jColumn.uiCalColX) + lbColumnDef.uiCalColX = jColumn.uiCalColX.value(); + else + lbColumnDef.uiCalColX = 0; + + if (jColumn.uiCalColY) + lbColumnDef.uiCalColY = jColumn.uiCalColY.value(); + else + lbColumnDef.uiCalColY = 0; + + return true; + } + + bool CreateLeaderboardFromJson(const JsonLeaderboardDef& jLeaderboardDef, LeaderboardDef& leaderboardDef) const + { + leaderboardDef.id = jLeaderboardDef.id; + + if (jLeaderboardDef.xpColId) + leaderboardDef.xpColId = jLeaderboardDef.xpColId.value(); + else + leaderboardDef.xpColId = -1; + + if (jLeaderboardDef.prestigeColId) + leaderboardDef.prestigeColId = jLeaderboardDef.prestigeColId.value(); + else + leaderboardDef.prestigeColId = -1; + + if (!jLeaderboardDef.columns.empty()) + { + leaderboardDef.columnCount = static_cast(jLeaderboardDef.columns.size()); + leaderboardDef.columns = m_memory.Alloc(leaderboardDef.columnCount); + + for (auto i = 0; i < leaderboardDef.columnCount; i++) + { + if (!CreateColumnDefFromJson(jLeaderboardDef.columns[i], leaderboardDef.columns[i], leaderboardDef)) + return false; + } + } + else + { + leaderboardDef.columnCount = 0; + leaderboardDef.columns = nullptr; + } + + leaderboardDef.updateType = jLeaderboardDef.updateType; + + if (!CreateTrackTypeFlagsFromJson(jLeaderboardDef, leaderboardDef.trackTypes)) + return false; + + return true; + } + + std::istream& m_stream; + MemoryManager& m_memory; + }; +} // namespace + +namespace IW5 +{ + bool LoadLeaderboardAsJson(std::istream& stream, LeaderboardDef& leaderboard, MemoryManager* memory) + { + const JsonLoader loader(stream, *memory); + + return loader.Load(leaderboard); + } +} // namespace IW5 diff --git a/src/ObjLoading/Game/IW5/Leaderboard/JsonLeaderboardDefLoader.h b/src/ObjLoading/Game/IW5/Leaderboard/JsonLeaderboardDefLoader.h new file mode 100644 index 00000000..84186e24 --- /dev/null +++ b/src/ObjLoading/Game/IW5/Leaderboard/JsonLeaderboardDefLoader.h @@ -0,0 +1,9 @@ +#pragma once + +#include "Game/IW5/IW5.h" +#include "Utils/MemoryManager.h" + +namespace IW5 +{ + bool LoadLeaderboardAsJson(std::istream& stream, LeaderboardDef& leaderboard, MemoryManager* memory); +} // namespace IW5 From e046089cbb6fa6d7a4c4b2d55dd232fbc27fe595 Mon Sep 17 00:00:00 2001 From: Jan Date: Sat, 1 Jun 2024 13:55:00 +0200 Subject: [PATCH 2/4] chore: use std::optional value_or for iw5 leaderboard reading --- .../Leaderboard/JsonLeaderboardDefLoader.cpp | 38 ++++--------------- 1 file changed, 7 insertions(+), 31 deletions(-) diff --git a/src/ObjLoading/Game/IW5/Leaderboard/JsonLeaderboardDefLoader.cpp b/src/ObjLoading/Game/IW5/Leaderboard/JsonLeaderboardDefLoader.cpp index b46a727d..61196dbd 100644 --- a/src/ObjLoading/Game/IW5/Leaderboard/JsonLeaderboardDefLoader.cpp +++ b/src/ObjLoading/Game/IW5/Leaderboard/JsonLeaderboardDefLoader.cpp @@ -53,15 +53,8 @@ namespace { lbColumnDef.name = m_memory.Dup(jColumn.name.c_str()); - if (jColumn.propertyId) - lbColumnDef.propertyId = jColumn.propertyId.value(); - else - lbColumnDef.propertyId = 0; - - if (jColumn.hidden) - lbColumnDef.hidden = jColumn.hidden.value(); - else - lbColumnDef.hidden = false; + lbColumnDef.propertyId = jColumn.propertyId.value_or(0); + lbColumnDef.hidden = jColumn.hidden.value_or(false); if (jColumn.statName) lbColumnDef.statName = m_memory.Dup(jColumn.statName->c_str()); @@ -70,22 +63,12 @@ namespace lbColumnDef.type = jColumn.type; - if (jColumn.precision) - lbColumnDef.precision = jColumn.precision.value(); - else - lbColumnDef.precision = 0; + lbColumnDef.precision = jColumn.precision.value_or(0); lbColumnDef.agg = jColumn.aggregationFunction; - if (jColumn.uiCalColX) - lbColumnDef.uiCalColX = jColumn.uiCalColX.value(); - else - lbColumnDef.uiCalColX = 0; - - if (jColumn.uiCalColY) - lbColumnDef.uiCalColY = jColumn.uiCalColY.value(); - else - lbColumnDef.uiCalColY = 0; + lbColumnDef.uiCalColX = jColumn.uiCalColX.value_or(0); + lbColumnDef.uiCalColY = jColumn.uiCalColY.value_or(0); return true; } @@ -94,15 +77,8 @@ namespace { leaderboardDef.id = jLeaderboardDef.id; - if (jLeaderboardDef.xpColId) - leaderboardDef.xpColId = jLeaderboardDef.xpColId.value(); - else - leaderboardDef.xpColId = -1; - - if (jLeaderboardDef.prestigeColId) - leaderboardDef.prestigeColId = jLeaderboardDef.prestigeColId.value(); - else - leaderboardDef.prestigeColId = -1; + leaderboardDef.xpColId = jLeaderboardDef.xpColId.value_or(-1); + leaderboardDef.prestigeColId = jLeaderboardDef.prestigeColId.value_or(-1); if (!jLeaderboardDef.columns.empty()) { From 28465d7c64ee1986f384d6fc4009414940f5672b Mon Sep 17 00:00:00 2001 From: Jan Date: Sat, 1 Jun 2024 13:55:25 +0200 Subject: [PATCH 3/4] fix: add missing column id for iw5 leaderboards reading --- src/ObjLoading/Game/IW5/Leaderboard/JsonLeaderboardDefLoader.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/ObjLoading/Game/IW5/Leaderboard/JsonLeaderboardDefLoader.cpp b/src/ObjLoading/Game/IW5/Leaderboard/JsonLeaderboardDefLoader.cpp index 61196dbd..0e7b993a 100644 --- a/src/ObjLoading/Game/IW5/Leaderboard/JsonLeaderboardDefLoader.cpp +++ b/src/ObjLoading/Game/IW5/Leaderboard/JsonLeaderboardDefLoader.cpp @@ -53,6 +53,7 @@ namespace { lbColumnDef.name = m_memory.Dup(jColumn.name.c_str()); + lbColumnDef.id = jColumn.colId; lbColumnDef.propertyId = jColumn.propertyId.value_or(0); lbColumnDef.hidden = jColumn.hidden.value_or(false); From 667fb49ab23a13e375ef6a0c161039ed99cca159 Mon Sep 17 00:00:00 2001 From: Jan Date: Sat, 1 Jun 2024 13:55:38 +0200 Subject: [PATCH 4/4] fix: iw5 leaderboard track type reading --- .../Game/IW5/Leaderboard/JsonLeaderboardDefLoader.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ObjLoading/Game/IW5/Leaderboard/JsonLeaderboardDefLoader.cpp b/src/ObjLoading/Game/IW5/Leaderboard/JsonLeaderboardDefLoader.cpp index 0e7b993a..afb5650f 100644 --- a/src/ObjLoading/Game/IW5/Leaderboard/JsonLeaderboardDefLoader.cpp +++ b/src/ObjLoading/Game/IW5/Leaderboard/JsonLeaderboardDefLoader.cpp @@ -41,10 +41,10 @@ namespace } private: - static bool CreateTrackTypeFlagsFromJson(const JsonLeaderboardDef& jLeaderboardDef, int& gameFlags) + static bool CreateTrackTypeFlagsFromJson(const JsonLeaderboardDef& jLeaderboardDef, int& trackTypeFlags) { - for (const auto gameFlag : jLeaderboardDef.trackTypes) - gameFlags |= gameFlag; + for (const auto trackType : jLeaderboardDef.trackTypes) + trackTypeFlags |= 1 << trackType; return true; }