AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Vulkan matrix experiment

This commit is contained in:
Jack Andersen 2016-07-26 20:14:05 -10:00
parent dcd41271c3
commit 8d2c711265
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Editor/ViewManager.cpp
View File

@ -109,7 +109,7 @@ void ViewManager::ParticleView::draw(boo::IGraphicsCommandQueue *gfxQ)
m_thermColdFilter.setScale(std::sin(m_theta) * 0.5f + 0.5f); m_thermColdFilter.setScale(std::sin(m_theta) * 0.5f + 0.5f);
m_thermColdFilter.setShift(m_random.Next() % 32); m_thermColdFilter.setShift(m_random.Next() % 32);
m_thermColdFilter.draw(); //m_thermColdFilter.draw();
} }
if (m_vm.m_partGen) if (m_vm.m_partGen)
{ {

6
Runtime/Graphics/CGraphics.cpp
View File

@ -138,7 +138,7 @@ static const zeus::CMatrix4f PlusOneZ(1.f, 0.f, 0.f, 0.f,
static const zeus::CMatrix4f PlusOneZFlip(1.f, 0.f, 0.f, 0.f, static const zeus::CMatrix4f PlusOneZFlip(1.f, 0.f, 0.f, 0.f,
0.f, -1.f, 0.f, 0.f, 0.f, -1.f, 0.f, 0.f,
0.f, 0.f, 1.f, 1.f, 0.f, 0.f, 0.5f, 0.5f,
0.f, 0.f, 0.f, 1.f); 0.f, 0.f, 0.f, 1.f);
zeus::CMatrix4f CGraphics::CalculatePerspectiveMatrix(float fovy, float aspect, zeus::CMatrix4f CGraphics::CalculatePerspectiveMatrix(float fovy, float aspect,
@ -193,7 +193,7 @@ zeus::CMatrix4f CGraphics::CalculatePerspectiveMatrix(float fovy, float aspect,
{ {
zeus::CMatrix4f mat2(2.f * st.x14_near / rml, 0.f, rpl / rml, 0.f, zeus::CMatrix4f mat2(2.f * st.x14_near / rml, 0.f, rpl / rml, 0.f,
0.f, 2.f * st.x14_near / tmb, tpb / tmb, 0.f, 0.f, 2.f * st.x14_near / tmb, tpb / tmb, 0.f,
0.f, 0.f, st.x18_far / fmn, st.x14_near * st.x18_far / fmn, 0.f, 0.f, -fpn / fmn, -2.f * st.x18_far * st.x14_near / fmn,
0.f, 0.f, -1.f, 0.f); 0.f, 0.f, -1.f, 0.f);
return PlusOneZFlip * mat2; return PlusOneZFlip * mat2;
} }
@ -241,7 +241,7 @@ zeus::CMatrix4f CGraphics::GetPerspectiveProjectionMatrix(bool forRenderer)
{ {
zeus::CMatrix4f mat2(2.f * g_Proj.x14_near / rml, 0.f, rpl / rml, 0.f, zeus::CMatrix4f mat2(2.f * g_Proj.x14_near / rml, 0.f, rpl / rml, 0.f,
0.f, 2.f * g_Proj.x14_near / tmb, tpb / tmb, 0.f, 0.f, 2.f * g_Proj.x14_near / tmb, tpb / tmb, 0.f,
0.f, 0.f, g_Proj.x18_far / fmn, g_Proj.x14_near * g_Proj.x18_far / fmn, 0.f, 0.f, -fpn / fmn, -2.f * g_Proj.x18_far * g_Proj.x14_near / fmn,
0.f, 0.f, -1.f, 0.f); 0.f, 0.f, -1.f, 0.f);
return PlusOneZFlip * mat2; return PlusOneZFlip * mat2;
} }