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

Refactor ResId into CAssetId

Browse Source
This commit is contained in:
Phillip Stephens
2017-08-12 22:26:14 -07:00
parent e0efcc0e5c
commit 870e8c80ee
176 changed files with 800 additions and 715 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Runtime/MP1/CArtifactDoll.cpp
View File

@@ -25,7 +25,7 @@ static const char* ArtifactPieceModels[] =
"CMDL_Piece12" // Newborn
};
static const ResId ArtifactHeadScans[] =
static const CAssetId ArtifactHeadScans[] =
{
0x32C9DDCE, // Truth
0xB45DAF60, // Strength
@@ -55,16 +55,16 @@ CArtifactDoll::CArtifactDoll()
x0_models.push_back(g_SimplePool->GetObj(ArtifactPieceModels[i]));
}
int CArtifactDoll::GetArtifactHeadScanIndex(ResId scanId)
int CArtifactDoll::GetArtifactHeadScanIndex(CAssetId scanId)
{
ResId orig = g_ResFactory->TranslateNewToOriginal(scanId);
CAssetId orig = g_ResFactory->TranslateNewToOriginal(scanId);
for (int i=0 ; i<12 ; ++i)
if (ArtifactHeadScans[i] == orig)
return i;
return -1;
}
ResId CArtifactDoll::GetArtifactHeadScanFromItemType(CPlayerState::EItemType item)
CAssetId CArtifactDoll::GetArtifactHeadScanFromItemType(CPlayerState::EItemType item)
{
if (item < CPlayerState::EItemType::ArtifactOfTruth || item > CPlayerState::EItemType::ArtifactOfNewborn)
return -1;
@@ -78,7 +78,7 @@ void CArtifactDoll::UpdateArtifactHeadScan(const CStateManager& mgr, float delta
{
if (mgr.GetPlayerState()->HasPowerUp(CPlayerState::EItemType(i + 29)))
{
ResId newId = g_ResFactory->TranslateOriginalToNew(ArtifactHeadScans[i]);
CAssetId newId = g_ResFactory->TranslateOriginalToNew(ArtifactHeadScans[i]);
playerState.SetScanTime(newId, std::min(playerState.GetScanTime(newId) + delta, 1.f));
}
}
@@ -115,7 +115,7 @@ void CArtifactDoll::Draw(float alpha, const CStateManager& mgr,
{
if (ArtifactHeadScans[i] != -1)
{
ResId newId = g_ResFactory->TranslateOriginalToNew(ArtifactHeadScans[i]);
CAssetId newId = g_ResFactory->TranslateOriginalToNew(ArtifactHeadScans[i]);
float interp = (playerState.GetScanTime(newId) - 0.5f) * 2.f;
if (interp < 0.5f)
color = zeus::CColor::lerp(ArtifactPreColor, zeus::CColor::skWhite, 2.f * interp);