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

Clean up matrix assignment

This commit is contained in:
Phillip Stephens 2016-07-08 13:25:38 -07:00
parent dd3a524bf4
commit 8b1f70c5cd
2 changed files with 26 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Editor/ViewManager.cpp
View File

@ -21,13 +21,13 @@ namespace urde
void ViewManager::BuildTestPART(urde::IObjectStore& objStore) void ViewManager::BuildTestPART(urde::IObjectStore& objStore)
{ {
m_modelTest = objStore.GetObj("gun_cmdl"); m_modelTest = objStore.GetObj("CMDL_InvPowerSuit3");
//m_modelTest = objStore.GetObj("CMDL_GameCube"); //m_modelTest = objStore.GetObj("CMDL_GameCube");
m_modelTest.Lock(); m_modelTest.Lock();
//m_partGenDesc = objStore.GetObj({hecl::FOURCC('PART'), 0x972A5CD2}); //m_partGenDesc = objStore.GetObj({hecl::FOURCC('PART'), 0x972A5CD2});
m_partGenDesc = objStore.GetObj("PowerCharge"); //m_partGenDesc = objStore.GetObj("PowerCharge");
m_partGenDesc.Lock(); //m_partGenDesc.Lock();
//m_partGen.reset(new urde::CElementGen(m_partGenDesc, //m_partGen.reset(new urde::CElementGen(m_partGenDesc,
// urde::CElementGen::EModelOrientationType::Normal, // urde::CElementGen::EModelOrientationType::Normal,
// urde::CElementGen::EOptionalSystemFlags::None)); // urde::CElementGen::EOptionalSystemFlags::None));
@ -76,7 +76,7 @@ void ViewManager::ParticleView::draw(boo::IGraphicsCommandQueue *gfxQ)
m_theta += 0.01f; m_theta += 0.01f;
CGraphics::SetModelMatrix(zeus::CTransform::RotateZ(m_theta) * zeus::CTransform::Scale(10.f)); CGraphics::SetModelMatrix(zeus::CTransform::RotateZ(m_theta) * zeus::CTransform::Scale(10.f));
//CGraphics::SetModelMatrix(zeus::CTransform::Identity()); //CGraphics::SetModelMatrix(zeus::CTransform::Identity());
CGraphics::SetViewPointMatrix(zeus::lookAt(zeus::CVector3f{0.f, -10.f, 4.f}, {0.f, 0.f, 0.f})); CGraphics::SetViewPointMatrix(zeus::lookAt(zeus::CVector3f{0.f, -30.f, 4.f}, {0.f, 0.f, 0.f}));
boo::SWindowRect windowRect = m_vm.m_mainWindow->getWindowFrame(); boo::SWindowRect windowRect = m_vm.m_mainWindow->getWindowFrame();
float aspect = windowRect.size[0] / float(windowRect.size[1]); float aspect = windowRect.size[0] / float(windowRect.size[1]);
CGraphics::SetPerspective(55.0, aspect, 0.001f, 1000.f); CGraphics::SetPerspective(55.0, aspect, 0.001f, 1000.f);

48
Runtime/Graphics/CModelBoo.cpp
View File

@ -329,22 +329,23 @@ void CBooModel::UVAnimationBuffer::ProcessAnimation(u8*& bufOut, const UVAnimati
{ {
case UVAnimation::Mode::MvInvNoTranslation: case UVAnimation::Mode::MvInvNoTranslation:
{ {
texMtxOut = CGraphics::g_ViewMatrix.inverse().multiplyIgnoreTranslation( texMtxOut = CGraphics::g_ViewMatrix.inverse().multiplyIgnoreTranslation(CGraphics::g_GXModelMatrix).toMatrix4f();
CGraphics::g_GXModelMatrix).toMatrix4f();
texMtxOut.vec[3].zeroOut(); texMtxOut.vec[3].zeroOut();
postMtxOut = zeus::CTransform(zeus::CMatrix3f(0.5, 0.0, 0.0, postMtxOut.vec[0].x = 0.5f;
0.0, 0.5, 0.0, postMtxOut.vec[1].y = 0.0f;
0.0, 0.0, 0.0), postMtxOut.vec[2].y = 0.5f;
zeus::CVector3f(0.5, 0.5, 1.0)).toMatrix4f(); postMtxOut.vec[3].x = 0.5f;
postMtxOut.vec[3].y = 0.5f;
break; break;
} }
case UVAnimation::Mode::MvInv: case UVAnimation::Mode::MvInv:
{ {
texMtxOut = (CGraphics::g_ViewMatrix.inverse() * CGraphics::g_GXModelMatrix).toMatrix4f(); texMtxOut = (CGraphics::g_ViewMatrix.inverse() * CGraphics::g_GXModelMatrix).toMatrix4f();
postMtxOut = zeus::CTransform(zeus::CMatrix3f(0.5, 0.0, 0.0, postMtxOut.vec[0].x = 0.5f;
0.0, 0.5, 0.0, postMtxOut.vec[1].y = 0.0f;
0.0, 0.0, 0.0), postMtxOut.vec[2].y = 0.5f;
zeus::CVector3f(0.5, 0.5, 1.0)).toMatrix4f(); postMtxOut.vec[3].x = 0.5f;
postMtxOut.vec[3].y = 0.5f;
break; break;
} }
case UVAnimation::Mode::Scroll: case UVAnimation::Mode::Scroll:
@ -369,36 +370,31 @@ void CBooModel::UVAnimationBuffer::ProcessAnimation(u8*& bufOut, const UVAnimati
case UVAnimation::Mode::HStrip: case UVAnimation::Mode::HStrip:
{ {
float value = anim.vals[0] * anim.vals[2] * (anim.vals[3] + CGraphics::GetSecondsMod900()); float value = anim.vals[0] * anim.vals[2] * (anim.vals[3] + CGraphics::GetSecondsMod900());
texMtxOut.vec[3].x = (float)(short)(float)(anim.vals[1] * fmod(value, 1.0f)) * anim.vals[2]; texMtxOut.vec[3].x = anim.vals[1] * fmod(value, 1.0f) * anim.vals[2];
break; break;
} }
case UVAnimation::Mode::VStrip: case UVAnimation::Mode::VStrip:
{ {
float value = anim.vals[0] * anim.vals[2] * (anim.vals[3] + CGraphics::GetSecondsMod900()); float value = anim.vals[0] * anim.vals[2] * (anim.vals[3] + CGraphics::GetSecondsMod900());
texMtxOut.vec[3].y = (float)(short)(float)(anim.vals[1] * fmod(value, 1.0f)) * anim.vals[2]; texMtxOut.vec[3].y = anim.vals[1] * fmod(value, 1.0f) * anim.vals[2];
break; break;
} }
case UVAnimation::Mode::Model: case UVAnimation::Mode::Model:
{ {
texMtxOut.vec[0].x = 0.5f; texMtxOut = CGraphics::g_GXModelMatrix.toMatrix4f();
texMtxOut.vec[1].y = 0.0f; texMtxOut.vec[3].zeroOut();
texMtxOut.vec[2].y = 0.5f;
texMtxOut.vec[3].x = CGraphics::g_GXModelMatrix.origin.x * 0.5f;
texMtxOut.vec[3].y = CGraphics::g_GXModelMatrix.origin.y * 0.5f;
postMtxOut = zeus::CTransform(zeus::CMatrix3f(0.5, 0.0, 0.0, postMtxOut.vec[0].x = 0.5f;
0.0, 0.0, 0.5, postMtxOut.vec[1].y = 0.0f;
0.0, 0.0, 0.0), postMtxOut.vec[2].y = 0.5f;
zeus::CVector3f(CGraphics::g_GXModelMatrix.origin.x * 0.50000001, postMtxOut.vec[3].x = CGraphics::g_GXModelMatrix.origin.x * 0.5f;
CGraphics::g_GXModelMatrix.origin.x * 0.50000001, postMtxOut.vec[3].y = CGraphics::g_GXModelMatrix.origin.y * 0.5f;
1.0)).toMatrix4f();
break; break;
} }
case UVAnimation::Mode::WhoMustNotBeNamed: case UVAnimation::Mode::WhoMustNotBeNamed:
{ {
zeus::CTransform texmtx = CGraphics::g_ViewMatrix.inverse() * CGraphics::g_GXModelMatrix; texMtxOut = (CGraphics::g_ViewMatrix.inverse() * CGraphics::g_GXModelMatrix).toMatrix4f();
texmtx.origin.zeroOut(); texMtxOut.vec[3].zeroOut();
texMtxOut = texmtx.toMatrix4f();
const zeus::CVector3f& viewOrigin = CGraphics::g_ViewMatrix.origin; const zeus::CVector3f& viewOrigin = CGraphics::g_ViewMatrix.origin;
float xy = (viewOrigin.x + viewOrigin.y) * 0.025f * anim.vals[1]; float xy = (viewOrigin.x + viewOrigin.y) * 0.025f * anim.vals[1];