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

Finish CInGameGuiManager

Browse Source
This commit is contained in:
Jack Andersen
2017-05-21 12:01:04 -04:00
parent c8d09f3de7
commit 4b048a0dff
34 changed files with 505 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
Runtime/AutoMapper/CAutoMapper.cpp
View File

@@ -1398,16 +1398,12 @@ void CAutoMapper::Draw(const CStateManager& mgr, const zeus::CTransform& xf, flo
}
else if (x1c0_nextState == EAutoMapperState::MiniMap)
{
float t = 0.f;
if (x1c4_interpDur > 0.f)
t = x1c8_interpTime / x1c4_interpDur;
float t = GetInterp();
alphaInterp = alpha * t + (1.f - t);
}
else if (x1bc_state == EAutoMapperState::MiniMap)
{
float t = 0.f;
if (x1c4_interpDur > 0.f)
t = x1c8_interpTime / x1c4_interpDur;
float t = GetInterp();
alphaInterp = alpha * (1.f - t) + t;
}
else
@@ -1429,24 +1425,13 @@ void CAutoMapper::Draw(const CStateManager& mgr, const zeus::CTransform& xf, flo
if (x1c0_nextState == EAutoMapperState::MapScreenUniverse)
{
if (x1bc_state == EAutoMapperState::MapScreenUniverse)
{
universeInterp = 1.f;
}
else
{
if (x1c4_interpDur > 0.f)
universeInterp = x1c8_interpTime / x1c4_interpDur;
else
universeInterp = 0.f;
}
universeInterp = GetInterp();
}
else if (x1bc_state == EAutoMapperState::MapScreenUniverse)
{
if (x1c4_interpDur > 0.f)
universeInterp = x1c8_interpTime / x1c4_interpDur;
else
universeInterp = 0.f;
universeInterp = 1.f - universeInterp;
universeInterp = 1.f - GetInterp();
}
zeus::CTransform preXf;
@@ -1642,7 +1627,7 @@ void CAutoMapper::Draw(const CStateManager& mgr, const zeus::CTransform& xf, flo
if (x1c0_nextState != EAutoMapperState::MiniMap)
{
if (x1c4_interpDur > 0.f)
frmeAlpha = x1c8_interpTime / x1c4_interpDur;
frmeAlpha = x1c8_interpTime / x1c4_interpDur;
}
else
{