AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #257 from lioncash/virt 

CWorld: Rename IMapWorld to IGetMapWorld()
This commit is contained in:
Phillip Stephens 2020-03-23 23:26:35 -07:00 committed by GitHub
parent 6c9d6bc38b 8a9e76a345
commit 6c7fdc11a0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Runtime/AutoMapper/CAutoMapper.cpp
View File

@ -216,7 +216,7 @@ bool CAutoMapper::CheckDummyWorldLoad(CStateManager& mgr) {
} }
xa0_curAreaId = aid; xa0_curAreaId = aid;
dummyWorld->IMapWorld()->RecalculateWorldSphere(mwInfo, *dummyWorld); dummyWorld->IGetMapWorld()->RecalculateWorldSphere(mwInfo, *dummyWorld);
BeginMapperStateTransition(EAutoMapperState::MapScreen, mgr); BeginMapperStateTransition(EAutoMapperState::MapScreen, mgr);
x32c_loadingDummyWorld = false; x32c_loadingDummyWorld = false;
return true; return true;
@ -378,7 +378,7 @@ void CAutoMapper::CompleteMapperStateTransition(const CStateManager& mgr) {
if (x1c0_nextState == EAutoMapperState::MapScreen) { if (x1c0_nextState == EAutoMapperState::MapScreen) {
const CMapWorldInfo& mwInfo = *g_GameState->StateForWorld(x24_world->IGetWorldAssetId()).MapWorldInfo(); const CMapWorldInfo& mwInfo = *g_GameState->StateForWorld(x24_world->IGetWorldAssetId()).MapWorldInfo();
x24_world->IMapWorld()->RecalculateWorldSphere(mwInfo, *x24_world); x24_world->IGetMapWorld()->RecalculateWorldSphere(mwInfo, *x24_world);
x1d8_flashTimer = 0.f; x1d8_flashTimer = 0.f;
x1dc_playerFlashPulse = 0.f; x1dc_playerFlashPulse = 0.f;
} }
@ -911,7 +911,7 @@ zeus::CVector2i CAutoMapper::GetMapScreenViewportSize() {
} }
float CAutoMapper::GetMapAreaMaxDrawDepth(const CStateManager&, TAreaId aid) const { float CAutoMapper::GetMapAreaMaxDrawDepth(const CStateManager&, TAreaId aid) const {
return x24_world->IMapWorld()->GetCurrentMapAreaDepth(*x24_world, aid); return x24_world->IGetMapWorld()->GetCurrentMapAreaDepth(*x24_world, aid);
} }
float CAutoMapper::GetMapAreaMiniMapDrawAlphaSurfaceVisited(const CStateManager& stateMgr) { float CAutoMapper::GetMapAreaMiniMapDrawAlphaSurfaceVisited(const CStateManager& stateMgr) {
@ -1224,7 +1224,7 @@ void CAutoMapper::Update(float dt, const CStateManager& mgr) {
else else
xa8_renderStates[1].x18_camDist -= 3.f; xa8_renderStates[1].x18_camDist -= 3.f;
} else if (x1bc_state != EAutoMapperState::MiniMap && x1c0_nextState != EAutoMapperState::MiniMap && x24_world) { } else if (x1bc_state != EAutoMapperState::MiniMap && x1c0_nextState != EAutoMapperState::MiniMap && x24_world) {
x24_world->IMapWorld()->RecalculateWorldSphere( x24_world->IGetMapWorld()->RecalculateWorldSphere(
*g_GameState->StateForWorld(x24_world->IGetWorldAssetId()).MapWorldInfo(), *x24_world); *g_GameState->StateForWorld(x24_world->IGetWorldAssetId()).MapWorldInfo(), *x24_world);
} }
} }
@ -1341,7 +1341,7 @@ void CAutoMapper::Draw(const CStateManager& mgr, const zeus::CTransform& xf, flo
if (x1bc_state != EAutoMapperState::MiniMap && x1c0_nextState != EAutoMapperState::MiniMap) { if (x1bc_state != EAutoMapperState::MiniMap && x1c0_nextState != EAutoMapperState::MiniMap) {
if (universeInterp < 1.f && x24_world) { if (universeInterp < 1.f && x24_world) {
const CMapWorldInfo& mwInfo = *g_GameState->StateForWorld(x24_world->IGetWorldAssetId()).MapWorldInfo(); const CMapWorldInfo& mwInfo = *g_GameState->StateForWorld(x24_world->IGetWorldAssetId()).MapWorldInfo();
CMapWorld* mw = x24_world->IMapWorld(); CMapWorld* mw = x24_world->IGetMapWorld();
float hintFlash = 0.f; float hintFlash = 0.f;
if (x1e0_hintSteps.size() && x1e0_hintSteps.front().x0_type == SAutoMapperHintStep::Type::ShowBeacon) { if (x1e0_hintSteps.size() && x1e0_hintSteps.front().x0_type == SAutoMapperHintStep::Type::ShowBeacon) {
if (xa0_curAreaId == mgr.GetNextAreaId() && x24_world == mgr.GetWorld()) { if (xa0_curAreaId == mgr.GetNextAreaId() && x24_world == mgr.GetWorld()) {
@ -1371,7 +1371,7 @@ void CAutoMapper::Draw(const CStateManager& mgr, const zeus::CTransform& xf, flo
xa8_renderStates[0].x30_drawDepth2, true); xa8_renderStates[0].x30_drawDepth2, true);
} }
} else if (IsInMapperState(EAutoMapperState::MiniMap)) { } else if (IsInMapperState(EAutoMapperState::MiniMap)) {
CMapWorld* mw = x24_world->IMapWorld(); CMapWorld* mw = x24_world->IGetMapWorld();
const CMapWorldInfo& mwInfo = *g_GameState->StateForWorld(x24_world->IGetWorldAssetId()).MapWorldInfo(); const CMapWorldInfo& mwInfo = *g_GameState->StateForWorld(x24_world->IGetWorldAssetId()).MapWorldInfo();
const CMapWorld::CMapWorldDrawParms parms(xa8_renderStates[0].x34_alphaSurfaceVisited * alphaInterp, const CMapWorld::CMapWorldDrawParms parms(xa8_renderStates[0].x34_alphaSurfaceVisited * alphaInterp,
xa8_renderStates[0].x38_alphaOutlineVisited * alphaInterp, xa8_renderStates[0].x38_alphaOutlineVisited * alphaInterp,
@ -1382,7 +1382,7 @@ void CAutoMapper::Draw(const CStateManager& mgr, const zeus::CTransform& xf, flo
mw->Draw(parms, xa0_curAreaId, xa4_otherAreaId, xa8_renderStates[0].x2c_drawDepth1, mw->Draw(parms, xa0_curAreaId, xa4_otherAreaId, xa8_renderStates[0].x2c_drawDepth1,
xa8_renderStates[0].x30_drawDepth2, false); xa8_renderStates[0].x30_drawDepth2, false);
} else { } else {
CMapWorld* mw = x24_world->IMapWorld(); CMapWorld* mw = x24_world->IGetMapWorld();
const CMapWorldInfo& mwInfo = *g_GameState->StateForWorld(x24_world->IGetWorldAssetId()).MapWorldInfo(); const CMapWorldInfo& mwInfo = *g_GameState->StateForWorld(x24_world->IGetWorldAssetId()).MapWorldInfo();
zeus::CTransform modelXf = planeXf * preXf; zeus::CTransform modelXf = planeXf * preXf;
const CMapWorld::CMapWorldDrawParms parms(xa8_renderStates[0].x34_alphaSurfaceVisited * alphaInterp, const CMapWorld::CMapWorldDrawParms parms(xa8_renderStates[0].x34_alphaSurfaceVisited * alphaInterp,

2
Runtime/CStateManager.cpp
View File

@ -2339,7 +2339,7 @@ void CStateManager::SetCurrentAreaId(TAreaId aid) {
if (x8c0_mapWorldInfo->IsAreaVisited(aid)) if (x8c0_mapWorldInfo->IsAreaVisited(aid))
return; return;
x8c0_mapWorldInfo->SetAreaVisited(aid, true); x8c0_mapWorldInfo->SetAreaVisited(aid, true);
x850_world->IMapWorld()->RecalculateWorldSphere(*x8c0_mapWorldInfo, *x850_world); x850_world->IGetMapWorld()->RecalculateWorldSphere(*x8c0_mapWorldInfo, *x850_world);
} }
void CStateManager::AreaUnloaded(TAreaId) { void CStateManager::AreaUnloaded(TAreaId) {

4
Runtime/World/CWorld.cpp
View File

@ -37,7 +37,7 @@ CAssetId CDummyWorld::IGetSaveWorldAssetId() const { return x14_savwId; }
const CMapWorld* CDummyWorld::IGetMapWorld() const { return x2c_mapWorld.GetObj(); } const CMapWorld* CDummyWorld::IGetMapWorld() const { return x2c_mapWorld.GetObj(); }
CMapWorld* CDummyWorld::IMapWorld() { return x2c_mapWorld.GetObj(); } CMapWorld* CDummyWorld::IGetMapWorld() { return x2c_mapWorld.GetObj(); }
const IGameArea* CDummyWorld::IGetAreaAlways(TAreaId id) const { return &x18_areas.at(id); } const IGameArea* CDummyWorld::IGetAreaAlways(TAreaId id) const { return &x18_areas.at(id); }
@ -210,7 +210,7 @@ CAssetId CWorld::IGetSaveWorldAssetId() const { return x10_savwId; }
const CMapWorld* CWorld::IGetMapWorld() const { return const_cast<CWorld*>(this)->GetMapWorld(); } const CMapWorld* CWorld::IGetMapWorld() const { return const_cast<CWorld*>(this)->GetMapWorld(); }
CMapWorld* CWorld::IMapWorld() { return const_cast<CMapWorld*>(GetMapWorld()); } CMapWorld* CWorld::IGetMapWorld() { return const_cast<CMapWorld*>(GetMapWorld()); }
const CGameArea* CWorld::GetAreaAlways(TAreaId id) const { return x18_areas.at(id).get(); } const CGameArea* CWorld::GetAreaAlways(TAreaId id) const { return x18_areas.at(id).get(); }

6
Runtime/World/CWorld.hpp
View File

@ -27,7 +27,7 @@ public:
virtual CAssetId IGetStringTableAssetId() const = 0; virtual CAssetId IGetStringTableAssetId() const = 0;
virtual CAssetId IGetSaveWorldAssetId() const = 0; virtual CAssetId IGetSaveWorldAssetId() const = 0;
virtual const CMapWorld* IGetMapWorld() const = 0; virtual const CMapWorld* IGetMapWorld() const = 0;
virtual CMapWorld* IMapWorld() = 0; virtual CMapWorld* IGetMapWorld() = 0;
virtual const IGameArea* IGetAreaAlways(TAreaId id) const = 0; virtual const IGameArea* IGetAreaAlways(TAreaId id) const = 0;
virtual TAreaId IGetCurrentAreaId() const = 0; virtual TAreaId IGetCurrentAreaId() const = 0;
virtual TAreaId IGetAreaId(CAssetId id) const = 0; virtual TAreaId IGetAreaId(CAssetId id) const = 0;
@ -62,7 +62,7 @@ public:
CAssetId IGetStringTableAssetId() const override; CAssetId IGetStringTableAssetId() const override;
CAssetId IGetSaveWorldAssetId() const override; CAssetId IGetSaveWorldAssetId() const override;
const CMapWorld* IGetMapWorld() const override; const CMapWorld* IGetMapWorld() const override;
CMapWorld* IMapWorld() override; CMapWorld* IGetMapWorld() override;
const IGameArea* IGetAreaAlways(TAreaId id) const override; const IGameArea* IGetAreaAlways(TAreaId id) const override;
TAreaId IGetCurrentAreaId() const override; TAreaId IGetCurrentAreaId() const override;
TAreaId IGetAreaId(CAssetId id) const override; TAreaId IGetAreaId(CAssetId id) const override;
@ -182,7 +182,7 @@ public:
CAssetId IGetStringTableAssetId() const override; CAssetId IGetStringTableAssetId() const override;
CAssetId IGetSaveWorldAssetId() const override; CAssetId IGetSaveWorldAssetId() const override;
const CMapWorld* IGetMapWorld() const override; const CMapWorld* IGetMapWorld() const override;
CMapWorld* IMapWorld() override; CMapWorld* IGetMapWorld() override;
const CGameArea* GetAreaAlways(TAreaId) const; const CGameArea* GetAreaAlways(TAreaId) const;
CGameArea* GetArea(TAreaId); CGameArea* GetArea(TAreaId);
s32 GetNumAreas() const { return x18_areas.size(); } s32 GetNumAreas() const { return x18_areas.size(); }