AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-09 20:27:42 +00:00
Code Issues Projects Releases Wiki Activity

Fix command line args on macOS when passed via open, implement CScriptCameraPitchVolume

Browse Source
This commit is contained in:
Phillip Stephens
2017-01-23 02:13:36 -08:00
parent afd852f1a4
commit a8f5efb6e5
12 changed files with 33 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Runtime/Particle/CParticleDataFactory.cpp
View File

@@ -630,11 +630,11 @@ CRealElement* CParticleDataFactory::GetRealElement(CInputStream& in)
}
case SBIG('PSLL'):
{
return new CREPSLL;
return new CREParticleSizeOrLineLength;
}
case SBIG('PRLW'):
{
return new CREPRLW;
return new CREParticleRotationOrLineWidth;
}
case SBIG('SUB_'):
{

10
Runtime/Particle/CParticleElectric.cpp
View File

@@ -38,14 +38,14 @@ CParticleElectric::CParticleElectric(const TToken<CElectricDescription>& token)
else
x2c_LIFE = 0x7FFFFF;
if (desc->x40_SSWH.m_found)
if (desc->x40_SSWH)
{
x450_27_HaveSSWH = true;
for (int i = 0 ; i < x154_SCNT ; i++)
x1e0_lineManagers[i].SSWH.reset(new CParticleSwoosh(desc->x40_SSWH.m_token, x150_SSEG));
}
if (desc->x50_GPSM.m_found)
if (desc->x50_GPSM)
{
x450_25_HaveGPSM = true;
for (int i = 0 ; i < x154_SCNT ; i++)
@@ -54,7 +54,7 @@ CParticleElectric::CParticleElectric(const TToken<CElectricDescription>& token)
CElementGen::EOptionalSystemFlags::One));
}
if (desc->x60_EPSM.m_found)
if (desc->x60_EPSM)
{
x450_26_HaveEPSM = true;
for (int i = 0 ; i < x154_SCNT ; i++)
@@ -135,8 +135,8 @@ void CParticleElectric::SetGlobalScale(const zeus::CVector3f& scale)
void CParticleElectric::SetLocalScale(const zeus::CVector3f& scale)
{
xec_localScale = scale;
x450_28 = true;
if (x450_26_HaveEPSM)
x450_29 = true;
if (x450_27_HaveSSWH)
{
}
}

1
Runtime/Particle/CParticleElectric.hpp
View File

@@ -35,6 +35,7 @@ private:
float x128 = 0.f;
float x12c = 0.f;
zeus::CVector3f x130;
zeus::CVector3f x13c;
CRandom16 x14c_randState;
int x150_SSEG = 8;
int x154_SCNT = 1;

4
Runtime/Particle/CRealElement.cpp
View File

@@ -281,13 +281,13 @@ bool CREParticleAccessParam8::GetValue(int /*frame*/, float& valOut) const
return false;
}
bool CREPSLL::GetValue(int /*frame*/, float& valOut) const
bool CREParticleSizeOrLineLength::GetValue(int /*frame*/, float& valOut) const
{
valOut = CElementGen::g_currentParticle->x2c_lineLengthOrSize;
return false;
}
bool CREPRLW::GetValue(int /*frame*/, float& valOut) const
bool CREParticleRotationOrLineWidth::GetValue(int /*frame*/, float& valOut) const
{
valOut = CElementGen::g_currentParticle->x30_lineWidthOrRota;
return false;

4
Runtime/Particle/CRealElement.hpp
View File

@@ -237,13 +237,13 @@ public:
bool GetValue(int frame, float& valOut) const;
};
class CREPSLL : public CRealElement
class CREParticleSizeOrLineLength : public CRealElement
{
public:
bool GetValue(int frame, float& valOut) const;
};
class CREPRLW : public CRealElement
class CREParticleRotationOrLineWidth : public CRealElement
{
public:
bool GetValue(int frame, float& valOut) const;