mirror of
https://github.com/Laupetin/OpenAssetTools.git
synced 2025-04-20 08:05:45 +00:00
Merge pull request #206 from diamante0018/iw5/leaderboard-load
feat(iw5): load leaderboard definitions from raw
This commit is contained in:
commit
feefc4a6a1
@ -1,10 +1,13 @@
|
|||||||
#include "AssetLoaderLeaderboard.h"
|
#include "AssetLoaderLeaderboard.h"
|
||||||
|
|
||||||
#include "Game/IW5/IW5.h"
|
#include "Game/IW5/IW5.h"
|
||||||
|
#include "Game/IW5/Leaderboard/JsonLeaderboardDefLoader.h"
|
||||||
#include "ObjLoading.h"
|
#include "ObjLoading.h"
|
||||||
#include "Pool/GlobalAssetPool.h"
|
#include "Pool/GlobalAssetPool.h"
|
||||||
|
|
||||||
#include <cstring>
|
#include <cstring>
|
||||||
|
#include <format>
|
||||||
|
#include <iostream>
|
||||||
|
|
||||||
using namespace IW5;
|
using namespace IW5;
|
||||||
|
|
||||||
@ -15,3 +18,26 @@ void* AssetLoaderLeaderboard::CreateEmptyAsset(const std::string& assetName, Mem
|
|||||||
leaderboard->name = memory->Dup(assetName.c_str());
|
leaderboard->name = memory->Dup(assetName.c_str());
|
||||||
return leaderboard;
|
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>();
|
||||||
|
leaderboardDef->name = memory->Dup(assetName.c_str());
|
||||||
|
|
||||||
|
if (LoadLeaderboardAsJson(*file.m_stream, *leaderboardDef, memory))
|
||||||
|
manager->AddAsset<AssetLeaderboard>(assetName, leaderboardDef);
|
||||||
|
else
|
||||||
|
std::cerr << std::format("Failed to load leaderboard \"{}\"\n", assetName);
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
@ -10,5 +10,8 @@ namespace IW5
|
|||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
_NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override;
|
_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
|
} // namespace IW5
|
||||||
|
122
src/ObjLoading/Game/IW5/Leaderboard/JsonLeaderboardDefLoader.cpp
Normal file
122
src/ObjLoading/Game/IW5/Leaderboard/JsonLeaderboardDefLoader.cpp
Normal file
@ -0,0 +1,122 @@
|
|||||||
|
#include "JsonLeaderboardDefLoader.h"
|
||||||
|
|
||||||
|
#include "Game/IW5/CommonIW5.h"
|
||||||
|
#include "Game/IW5/Leaderboard/JsonLeaderboardDef.h"
|
||||||
|
|
||||||
|
#include <format>
|
||||||
|
#include <iostream>
|
||||||
|
#include <nlohmann/json.hpp>
|
||||||
|
|
||||||
|
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<JsonLeaderboardDef>();
|
||||||
|
return CreateLeaderboardFromJson(jLeaderboard, leaderboardDef);
|
||||||
|
}
|
||||||
|
|
||||||
|
private:
|
||||||
|
static bool CreateTrackTypeFlagsFromJson(const JsonLeaderboardDef& jLeaderboardDef, int& trackTypeFlags)
|
||||||
|
{
|
||||||
|
for (const auto trackType : jLeaderboardDef.trackTypes)
|
||||||
|
trackTypeFlags |= 1 << trackType;
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool CreateColumnDefFromJson(const JsonColumnDef& jColumn, LbColumnDef& lbColumnDef, LeaderboardDef& leaderboardDef) const
|
||||||
|
{
|
||||||
|
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);
|
||||||
|
|
||||||
|
if (jColumn.statName)
|
||||||
|
lbColumnDef.statName = m_memory.Dup(jColumn.statName->c_str());
|
||||||
|
else
|
||||||
|
lbColumnDef.statName = nullptr;
|
||||||
|
|
||||||
|
lbColumnDef.type = jColumn.type;
|
||||||
|
|
||||||
|
lbColumnDef.precision = jColumn.precision.value_or(0);
|
||||||
|
|
||||||
|
lbColumnDef.agg = jColumn.aggregationFunction;
|
||||||
|
|
||||||
|
lbColumnDef.uiCalColX = jColumn.uiCalColX.value_or(0);
|
||||||
|
lbColumnDef.uiCalColY = jColumn.uiCalColY.value_or(0);
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool CreateLeaderboardFromJson(const JsonLeaderboardDef& jLeaderboardDef, LeaderboardDef& leaderboardDef) const
|
||||||
|
{
|
||||||
|
leaderboardDef.id = jLeaderboardDef.id;
|
||||||
|
|
||||||
|
leaderboardDef.xpColId = jLeaderboardDef.xpColId.value_or(-1);
|
||||||
|
leaderboardDef.prestigeColId = jLeaderboardDef.prestigeColId.value_or(-1);
|
||||||
|
|
||||||
|
if (!jLeaderboardDef.columns.empty())
|
||||||
|
{
|
||||||
|
leaderboardDef.columnCount = static_cast<int>(jLeaderboardDef.columns.size());
|
||||||
|
leaderboardDef.columns = m_memory.Alloc<LbColumnDef>(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
|
@ -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
|
Loading…
x
Reference in New Issue
Block a user