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

Initial CScriptPlatform collision

Browse Source
This commit is contained in:
Jack Andersen
2018-06-23 16:39:53 -10:00
parent 4ddec7e10c
commit 186acae5d8
10 changed files with 38 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Runtime/AutoMapper/CAutoMapper.cpp
View File

@@ -42,8 +42,8 @@ void CAutoMapper::SAutoMapperRenderState::InterpolateWithClamp(const SAutoMapper
{
float easeB = eases[int(b.x44_viewportEase)];
float easeA = 1.f - easeB;
zeus::CVector2i vpA = a.m_getViewportSize();
zeus::CVector2i vpB = b.m_getViewportSize();
zeus::CVector2i vpA = a.GetViewportSize();
zeus::CVector2i vpB = b.GetViewportSize();
out.x0_viewportSize = zeus::CVector2i(vpB.x * easeB + vpA.x * easeA,
vpB.y * easeB + vpA.y * easeA);
}
@@ -1451,14 +1451,8 @@ void CAutoMapper::Draw(const CStateManager& mgr, const zeus::CTransform& xf, flo
alphaInterp = 1.f;
}
float aspect;
if (xa8_renderStates[0].m_getViewportSize)
{
zeus::CVector2i vp = xa8_renderStates[0].m_getViewportSize();
aspect = vp.x / float(vp.y);
}
else
aspect = xa8_renderStates[0].x0_viewportSize.x / float(xa8_renderStates[0].x0_viewportSize.y);
zeus::CVector2i vp = xa8_renderStates[0].GetViewportSize();
float aspect = vp.x / float(vp.y);
if (aspect > 1.78f)
aspect = 1.78f;
float yScale = xa8_renderStates[0].x18_camDist /

8
Runtime/AutoMapper/CAutoMapper.hpp
View File

@@ -85,6 +85,14 @@ public:
x54_depth2Ease = Ease::None;
x58_alphaEase = Ease::None;
}
zeus::CVector2i GetViewportSize() const
{
if (m_getViewportSize)
return m_getViewportSize();
else
return x0_viewportSize;
}
};
struct SAutoMapperHintStep