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

Parameter renaming and minor bug fixes

Browse Source
This commit is contained in:
Jack Andersen
2016-02-28 17:03:11 -10:00
parent 02d605cbb9
commit c1af78e7ed
8 changed files with 58 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Runtime/Particle/CEmitterElement.cpp
View File

@@ -21,9 +21,9 @@ bool CEESimpleEmitter::GetValue(int frame, Zeus::CVector3f& pPos, Zeus::CVector3
bool CVESphere::GetValue(int frame, Zeus::CVector3f& pPos, Zeus::CVector3f& pVel) const
{
Zeus::CVector3f a;
x4_a->GetValue(frame, a);
x4_sphereOrigin->GetValue(frame, a);
float b;
x8_b->GetValue(frame, b);
x8_sphereRadius->GetValue(frame, b);
CRandom16* rand = CRandom16::GetRandomNumber();
int rand1 = rand->Range(-100, 100);
int rand2 = rand->Range(-100, 100);
@@ -42,7 +42,7 @@ bool CVESphere::GetValue(int frame, Zeus::CVector3f& pPos, Zeus::CVector3f& pVel
normVec2.normalize();
float c;
xc_c->GetValue(frame, c);
xc_velocityMag->GetValue(frame, c);
pVel = c * normVec2;
return false;
@@ -51,17 +51,17 @@ bool CVESphere::GetValue(int frame, Zeus::CVector3f& pPos, Zeus::CVector3f& pVel
bool CVEAngleSphere::GetValue(int frame, Zeus::CVector3f& pPos, Zeus::CVector3f& pVel) const
{
Zeus::CVector3f a;
x4_a->GetValue(frame, a);
x4_sphereOrigin->GetValue(frame, a);
float b, d, e, f, g;
x8_b->GetValue(frame, b);
x10_d->GetValue(frame, d);
x14_e->GetValue(frame, e);
x18_f->GetValue(frame, f);
x1c_g->GetValue(frame, g);
x8_sphereRadius->GetValue(frame, b);
x10_angleXBias->GetValue(frame, d);
x14_angleYBias->GetValue(frame, e);
x18_angleXRange->GetValue(frame, f);
x1c_angleYRange->GetValue(frame, g);
CRandom16* rand = CRandom16::GetRandomNumber();
d = (d + ((0.5f * (f * rand->Float())) - f)) * M_PI / 180.f;
e = (e + ((0.5f * (f * rand->Float())) - f)) * M_PI / 180.f;
e = (e + ((0.5f * (g * rand->Float())) - g)) * M_PI / 180.f;
float cosD = Zeus::Math::fastCosR(d);
pPos.x = a.x + (b * (-Zeus::Math::fastSinR(e) * cosD));
@@ -70,7 +70,7 @@ bool CVEAngleSphere::GetValue(int frame, Zeus::CVector3f& pPos, Zeus::CVector3f&
Zeus::CVector3f normVec = (pPos - a).normalized();
float c;
xc_c->GetValue(frame, c);
xc_velocityMag->GetValue(frame, c);
pVel = c * normVec;
return false;
}