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

Remove CVESPOS 

Fix CVEPSO*
This commit is contained in:
Phillip Stephens 2016-02-17 00:37:12 -08:00
parent ae88e719ff
commit f70577dc2b
3 changed files with 9 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Runtime/Particle/CParticleDataFactory.cpp
View File

@ -444,11 +444,6 @@ CVectorElement* CParticleDataFactory::GetVectorElement(CInputStream& in)
{ {
return new CVEParticleVelocity; return new CVEParticleVelocity;
} }
case SBIG('SPOS'):
{
CVectorElement* a = GetVectorElement(in);
return new CVESPOS(a);
}
case SBIG('PLCO'): case SBIG('PLCO'):
{ {
return new CVEPLCO; return new CVEPLCO;

24
Runtime/Particle/CVectorElement.cpp
View File

@ -268,12 +268,6 @@ bool CVEParticleVelocity::GetValue(int /*frame*/, Zeus::CVector3f& valOut) const
return false; return false;
} }
bool CVESPOS::GetValue(int frame, Zeus::CVector3f& valOut) const
{
/* TODO: Do */
return false;
}
bool CVEPLCO::GetValue(int /*frame*/, Zeus::CVector3f& valOut) const bool CVEPLCO::GetValue(int /*frame*/, Zeus::CVector3f& valOut) const
{ {
valOut = CParticleGlobals::g_particleMetrics->x10_plco; valOut = CParticleGlobals::g_particleMetrics->x10_plco;
@ -289,27 +283,27 @@ bool CVEPLOC::GetValue(int /*frame*/, Zeus::CVector3f& valOut) const
bool CVEPSOF::GetValue(int /*frame*/, Zeus::CVector3f& valOut) const bool CVEPSOF::GetValue(int /*frame*/, Zeus::CVector3f& valOut) const
{ {
Zeus::CTransform trans= CParticleGlobals::g_currentParticleSystem->x4_system->GetOrientation(); Zeus::CTransform trans= CParticleGlobals::g_currentParticleSystem->x4_system->GetOrientation();
valOut.x = trans.m_basis[0][0]; valOut.x = trans.m_basis[0].y;
valOut.y = trans.m_basis[1][1]; valOut.y = trans.m_basis[1].z;
valOut.z = trans.m_basis[2][2]; valOut.z = trans.m_origin.x;
return false; return false;
} }
bool CVEPSOU::GetValue(int /*frame*/, Zeus::CVector3f& valOut) const bool CVEPSOU::GetValue(int /*frame*/, Zeus::CVector3f& valOut) const
{ {
Zeus::CTransform trans= CParticleGlobals::g_currentParticleSystem->x4_system->GetOrientation(); Zeus::CTransform trans= CParticleGlobals::g_currentParticleSystem->x4_system->GetOrientation();
valOut.x = trans.m_basis[0][0]; valOut.x = trans.m_basis[0].z;
valOut.y = trans.m_basis[1][1]; valOut.y = trans.m_basis[1].x;
valOut.z = trans.m_basis[2][2]; valOut.z = trans.m_origin.y;
return false; return false;
} }
bool CVEPSOR::GetValue(int /*frame*/, Zeus::CVector3f& valOut) const bool CVEPSOR::GetValue(int /*frame*/, Zeus::CVector3f& valOut) const
{ {
Zeus::CTransform trans= CParticleGlobals::g_currentParticleSystem->x4_system->GetOrientation(); Zeus::CTransform trans= CParticleGlobals::g_currentParticleSystem->x4_system->GetOrientation();
valOut.x = trans.m_basis[0][0]; valOut.x = trans.m_basis[0].x;
valOut.y = trans.m_basis[1][1]; valOut.y = trans.m_basis[1].y;
valOut.z = trans.m_basis[2][2]; valOut.z = trans.m_basis[2].z;
return false; return false;
} }

9
Runtime/Particle/CVectorElement.hpp
View File

@ -147,15 +147,6 @@ public:
bool GetValue(int frame, Zeus::CVector3f& valOut) const; bool GetValue(int frame, Zeus::CVector3f& valOut) const;
}; };
class CVESPOS : public CVectorElement
{
std::unique_ptr<CVectorElement> x4_a;
public:
CVESPOS(CVectorElement* a)
: x4_a(a) {}
bool GetValue(int frame, Zeus::CVector3f& valOut) const;
};
class CVEPLCO : public CVectorElement class CVEPLCO : public CVectorElement
{ {
public: public: