AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-09 17:47:43 +00:00
Code Issues Projects Releases Wiki Activity

Add imgui layer editor

Browse Source
This commit is contained in:
Henrique Gemignani Passos Lima
2021-05-27 23:55:30 +03:00
committed by Luke Street
parent 5167a33605
commit 75e84a467b
4 changed files with 66 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Runtime/World/CWorld.cpp
View File

@@ -76,9 +76,9 @@ std::vector<CWorld::CRelay> CWorld::CRelay::ReadMemoryRelays(athena::io::MemoryR
return ret;
}
void CWorldLayers::ReadWorldLayers(athena::io::MemoryReader& r, int version, CAssetId mlvlId) {
std::optional<CWorldLayers> CWorldLayers::ReadWorldLayers(athena::io::MemoryReader& r, int version, CAssetId mlvlId) {
if (version <= 14) {
return;
return std::nullopt;
}
CWorldLayers ret;
@@ -104,6 +104,8 @@ void CWorldLayers::ReadWorldLayers(athena::io::MemoryReader& r, int version, CAs
CWorldState& wldState = g_GameState->StateForWorld(mlvlId);
wldState.GetLayerState()->InitializeWorldLayers(ret.m_areas);
return ret;
}
bool CDummyWorld::ICheckWorldComplete() {
@@ -148,7 +150,7 @@ bool CDummyWorld::ICheckWorldComplete() {
if (version > 12)
r.readString();
CWorldLayers::ReadWorldLayers(r, version, xc_mlvlId);
worldLayers = CWorldLayers::ReadWorldLayers(r, version, xc_mlvlId);
x30_loadToken.reset();
x34_loadBuf.reset();
@@ -188,6 +190,8 @@ std::string CDummyWorld::IGetDefaultAudioTrack() const { return {}; }
int CDummyWorld::IGetAreaCount() const { return x18_areas.size(); }
const std::optional<CWorldLayers>& CDummyWorld::GetWorldLayers() const { return worldLayers; }
CWorld::CWorld(IObjectStore& objStore, IFactory& resFactory, CAssetId mlvlId)
: x8_mlvlId(mlvlId)
, x60_objectStore(objStore)