AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-11 01:07:42 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into hsh

Browse Source
This commit is contained in:
Luke Street
2021-04-19 01:10:28 -04:00
parent 34625d28d4 83fc649023
commit c675607d06
1495 changed files with 102495 additions and 4719 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Runtime/AutoMapper/CAutoMapper.cpp
View File

@@ -16,7 +16,7 @@
#include <zeus/CEulerAngles.hpp>
namespace urde {
namespace metaforce {
void CAutoMapper::SAutoMapperRenderState::InterpolateWithClamp(const SAutoMapperRenderState& a,
SAutoMapperRenderState& out,
@@ -217,6 +217,7 @@ bool CAutoMapper::CheckDummyWorldLoad(CStateManager& mgr) {
xa0_curAreaId = aid;
dummyWorld->IGetMapWorld()->RecalculateWorldSphere(mwInfo, *dummyWorld);
x24_world = dummyWorld.get();
BeginMapperStateTransition(EAutoMapperState::MapScreen, mgr);
x32c_loadingDummyWorld = false;
return true;
@@ -1558,8 +1559,8 @@ void CAutoMapper::SetupHintNavigation() {
for (const CGameHintInfo::SHintLocation& loc : nextHint.GetLocations()) {
if (loc.x0_mlvlId != curMlvl) {
x1e0_hintSteps.emplace_back(SAutoMapperHintStep::SwitchToUniverse{});
x1e0_hintSteps.emplace_back(SAutoMapperHintStep::PanToWorld{}, curMlvl);
x1e0_hintSteps.emplace_back(SAutoMapperHintStep::SwitchToWorld{}, curMlvl);
x1e0_hintSteps.emplace_back(SAutoMapperHintStep::PanToWorld{}, loc.x0_mlvlId);
x1e0_hintSteps.emplace_back(SAutoMapperHintStep::SwitchToWorld{}, loc.x0_mlvlId);
} else {
x1e0_hintSteps.emplace_back(SAutoMapperHintStep::ZoomOut{});
}
@@ -1626,4 +1627,4 @@ void CAutoMapper::OnNewInGameGuiState(EInGameGuiState state, CStateManager& mgr)
}
}
} // namespace urde
} // namespace metaforce

6
Runtime/AutoMapper/CAutoMapper.hpp
View File

@@ -17,7 +17,7 @@
#include <zeus/CVector2i.hpp>
#include <zeus/CVector3f.hpp>
namespace urde {
namespace metaforce {
class CMapWorldInfo;
class CStateManager;
class IWorld;
@@ -128,7 +128,7 @@ private:
ELoadPhase x4_loadPhase = ELoadPhase::LoadResources;
TLockedToken<CMapUniverse> x8_mapu;
std::vector<std::unique_ptr<IWorld>> x14_dummyWorlds;
CWorld* x24_world;
IWorld* x24_world;
TLockedToken<CGuiFrame> x28_frmeMapScreen; // Used to be ptr
bool m_frmeInitialized = false;
TLockedToken<CModel> x30_miniMapSamus;
@@ -275,4 +275,4 @@ public:
return 0.f;
}
};
} // namespace urde
} // namespace metaforce

5
Runtime/AutoMapper/CMapArea.cpp
View File

@@ -10,7 +10,7 @@
#include "Runtime/World/CGameArea.hpp"
#include "Runtime/World/CWorld.hpp"
namespace urde {
namespace metaforce {
constexpr std::array<zeus::CVector3f, 3> MinesPostTransforms{{
{0.f, 0.f, 200.f},
{0.f, 0.f, 0.f},
@@ -78,6 +78,7 @@ CMapArea::CMapArea(CInputStream& in, u32 size)
}
void CMapArea::PostConstruct() {
OPTICK_EVENT();
x38_moStart = x44_buf.get();
x3c_vertexStart = x38_moStart + (x28_mappableObjCount * 0x50);
x40_surfaceStart = x3c_vertexStart + (x2c_vertexCount * 12);
@@ -302,4 +303,4 @@ CFactoryFnReturn FMapAreaFactory(const SObjectTag& objTag, CInputStream& in, con
return TToken<CMapArea>::GetIObjObjectFor(std::make_unique<CMapArea>(in, size));
}
} // namespace urde
} // namespace metaforce

4
Runtime/AutoMapper/CMapArea.hpp
View File

@@ -12,7 +12,7 @@
#include "zeus/CAABox.hpp"
#include "zeus/CVector3f.hpp"
namespace urde {
namespace metaforce {
class IWorld;
class CMapArea {
public:
@@ -84,4 +84,4 @@ public:
};
CFactoryFnReturn FMapAreaFactory(const SObjectTag& objTag, CInputStream& in, const CVParamTransfer&, CObjectReference*);
} // namespace urde
} // namespace metaforce

4
Runtime/AutoMapper/CMapUniverse.cpp
View File

@@ -4,7 +4,7 @@
#include "Runtime/CGameState.hpp"
#include "Runtime/GameGlobalObjects.hpp"
namespace urde {
namespace metaforce {
CMapUniverse::CMapUniverse(CInputStream& in, u32 version) : x0_hexagonId(in.readUint32Big()) {
x4_hexagonToken = g_SimplePool->GetObj({FOURCC('MAPA'), x0_hexagonId});
@@ -121,4 +121,4 @@ CFactoryFnReturn FMapUniverseFactory(const SObjectTag&, CInputStream& in, const
return TToken<CMapUniverse>::GetIObjObjectFor(std::make_unique<CMapUniverse>(in, version));
}
} // namespace urde
} // namespace metaforce

4
Runtime/AutoMapper/CMapUniverse.hpp
View File

@@ -12,7 +12,7 @@
#include <zeus/CTransform.hpp>
#include <zeus/CVector3f.hpp>
namespace urde {
namespace metaforce {
class CStateManager;
class CMapUniverse {
public:
@@ -124,4 +124,4 @@ public:
CFactoryFnReturn FMapUniverseFactory(const SObjectTag& tag, CInputStream& in, const CVParamTransfer& vparms,
CObjectReference*);
} // namespace urde
} // namespace metaforce

4
Runtime/AutoMapper/CMapWorld.cpp
View File

@@ -9,7 +9,7 @@
#include "Runtime/AutoMapper/CMapWorldInfo.hpp"
#include "Runtime/World/CWorld.hpp"
namespace urde {
namespace metaforce {
namespace {
struct Support {
int x0_;
@@ -698,4 +698,4 @@ CFactoryFnReturn FMapWorldFactory(const SObjectTag& tag, CInputStream& in, const
return TToken<CMapWorld>::GetIObjObjectFor(std::make_unique<CMapWorld>(in));
}
} // namespace urde
} // namespace metaforce

4
Runtime/AutoMapper/CMapWorld.hpp
View File

@@ -11,7 +11,7 @@
#include <zeus/CTransform.hpp>
#include <zeus/CVector3f.hpp>
namespace urde {
namespace metaforce {
class CMapWorldInfo;
class CStateManager;
class IWorld;
@@ -167,4 +167,4 @@ public:
CFactoryFnReturn FMapWorldFactory(const SObjectTag& tag, CInputStream& in, const CVParamTransfer& param,
CObjectReference* selfRef);
} // namespace urde
} // namespace metaforce

4
Runtime/AutoMapper/CMapWorldInfo.cpp
View File

@@ -3,7 +3,7 @@
#include "Runtime/CMemoryCardSys.hpp"
#include "Runtime/GameGlobalObjects.hpp"
namespace urde {
namespace metaforce {
CMapWorldInfo::CMapWorldInfo(CBitStreamReader& reader, const CSaveWorld& savw, CAssetId mlvlId) {
const CSaveWorldMemory& worldMem = g_MemoryCardSys->GetSaveWorldMemory(mlvlId);
@@ -117,4 +117,4 @@ bool CMapWorldInfo::IsAnythingSet() const {
return x38_mapStationUsed;
}
} // namespace urde
} // namespace metaforce

4
Runtime/AutoMapper/CMapWorldInfo.hpp
View File

@@ -5,7 +5,7 @@
#include "Runtime/RetroTypes.hpp"
namespace urde {
namespace metaforce {
class CSaveWorld;
class CMapWorldInfo {
@@ -31,4 +31,4 @@ public:
bool IsAnythingSet() const;
void SetMapStationUsed(bool isUsed) { x38_mapStationUsed = isUsed; }
};
} // namespace urde
} // namespace metaforce

4
Runtime/AutoMapper/CMappableObject.cpp
View File

@@ -7,7 +7,7 @@
#include "Runtime/GameGlobalObjects.hpp"
#include "Runtime/Graphics/CTexture.hpp"
namespace urde {
namespace metaforce {
std::array<CMapSurfaceShader::Vert, 8> CMappableObject::skDoorVerts{};
constexpr std::array<u32, 24> DoorIndices{
@@ -262,4 +262,4 @@ void CMappableObject::Shutdown() {
g_doorVbo.reset();
g_doorIbo.reset();
}
} // namespace urde
} // namespace metaforce

4
Runtime/AutoMapper/CMappableObject.hpp
View File

@@ -13,7 +13,7 @@
#include <zeus/CAABox.hpp>
#include <zeus/CTransform.hpp>
namespace urde {
namespace metaforce {
class CMapWorldInfo;
class CStateManager;
@@ -96,4 +96,4 @@ public:
}
static void Shutdown();
};
} // namespace urde
} // namespace metaforce