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

Various bug fixes

Browse Source
This commit is contained in:
Jack Andersen
2018-11-17 18:01:29 -10:00
parent b099be63dd
commit 57c1196599
8 changed files with 56 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Runtime/Weapon/CPlayerGun.cpp
View File

@@ -1092,6 +1092,7 @@ void CPlayerGun::ProcessGunMorph(float dt, CStateManager& mgr)
break;
case CGunMorph::EGunState::InWipe:
case CGunMorph::EGunState::OutWipe:
x774_holoTransitionGen->SetGlobalScale(sGunScale);
x774_holoTransitionGen->SetGlobalTranslation(zeus::CVector3f(0.f, x678_morph.GetYLerp(), 0.f));
x774_holoTransitionGen->Update(dt);
break;
@@ -2442,11 +2443,7 @@ void CPlayerGun::DrawArm(const CStateManager& mgr, const zeus::CVector3f& pos, c
zeus::CVector3f CPlayerGun::ConvertToScreenSpace(const zeus::CVector3f& pos, const CGameCamera& cam) const
{
zeus::CVector3f camToPosLocal = cam.GetTransform().transposeRotate(pos - cam.GetTranslation());
if (!camToPosLocal.isZero())
return CGraphics::GetPerspectiveProjectionMatrix(false).multiplyOneOverW(camToPosLocal);
else
return {-1.f, -1.f, 1.f};
return cam.ConvertToScreenSpace(pos);
}
void CPlayerGun::CopyScreenTex()

2
Runtime/Weapon/CPlayerGun.hpp
View File

@@ -314,7 +314,7 @@ private:
};
mutable CTexturedQuadFilter m_screenQuad = {EFilterType::Blend, CGraphics::g_SpareTexture.get(),
CTexturedQuadFilter::ZTest::GEqual};
CTexturedQuadFilter::ZTest::GEqualZWrite};
mutable CAABoxShader m_aaboxShader = {true};
void InitBeamData();