mirror of
https://github.com/AxioDL/metaforce.git
synced 2025-12-08 23:07:42 +00:00
New code style refactor
This commit is contained in:
Jack Andersen
@@ -5,255 +5,237 @@
|
||||
|
||||
/* Documentation at: http://www.metroid2002.com/retromodding/wiki/Particle_Script#Mod_Vector_Elements */
|
||||
|
||||
namespace urde
|
||||
{
|
||||
namespace urde {
|
||||
|
||||
bool CMVEImplosion::GetValue(int frame, zeus::CVector3f& pVel, zeus::CVector3f& pPos) const
|
||||
{
|
||||
zeus::CVector3f av;
|
||||
x4_implPoint->GetValue(frame, av);
|
||||
bool CMVEImplosion::GetValue(int frame, zeus::CVector3f& pVel, zeus::CVector3f& pPos) const {
|
||||
zeus::CVector3f av;
|
||||
x4_implPoint->GetValue(frame, av);
|
||||
|
||||
zeus::CVector3f dv = av - pPos;
|
||||
float dvm = dv.magnitude();
|
||||
zeus::CVector3f dv = av - pPos;
|
||||
float dvm = dv.magnitude();
|
||||
|
||||
float c;
|
||||
xc_maxMag->GetValue(frame, c);
|
||||
if (dvm > c)
|
||||
return false;
|
||||
|
||||
float d;
|
||||
x10_minMag->GetValue(frame, d);
|
||||
if (x14_enableMinMag && dvm < d)
|
||||
return true;
|
||||
|
||||
if (0.f == dvm)
|
||||
return false;
|
||||
|
||||
float b;
|
||||
x8_magScale->GetValue(frame, b);
|
||||
pVel += zeus::CVector3f(b / dvm) * dv;
|
||||
float c;
|
||||
xc_maxMag->GetValue(frame, c);
|
||||
if (dvm > c)
|
||||
return false;
|
||||
|
||||
float d;
|
||||
x10_minMag->GetValue(frame, d);
|
||||
if (x14_enableMinMag && dvm < d)
|
||||
return true;
|
||||
|
||||
if (0.f == dvm)
|
||||
return false;
|
||||
|
||||
float b;
|
||||
x8_magScale->GetValue(frame, b);
|
||||
pVel += zeus::CVector3f(b / dvm) * dv;
|
||||
return false;
|
||||
}
|
||||
|
||||
bool CMVEExponentialImplosion::GetValue(int frame, zeus::CVector3f& pVel, zeus::CVector3f& pPos) const
|
||||
{
|
||||
zeus::CVector3f av;
|
||||
x4_implPoint->GetValue(frame, av);
|
||||
bool CMVEExponentialImplosion::GetValue(int frame, zeus::CVector3f& pVel, zeus::CVector3f& pPos) const {
|
||||
zeus::CVector3f av;
|
||||
x4_implPoint->GetValue(frame, av);
|
||||
|
||||
zeus::CVector3f dv = av - pPos;
|
||||
float dvm = dv.magnitude();
|
||||
zeus::CVector3f dv = av - pPos;
|
||||
float dvm = dv.magnitude();
|
||||
|
||||
float c;
|
||||
xc_maxMag->GetValue(frame, c);
|
||||
if (dvm > c)
|
||||
return false;
|
||||
|
||||
float d;
|
||||
x10_minMag->GetValue(frame, d);
|
||||
if (x14_enableMinMag && dvm < d)
|
||||
return true;
|
||||
|
||||
if (0.f == dvm)
|
||||
return false;
|
||||
|
||||
float b;
|
||||
x8_magScale->GetValue(frame, b);
|
||||
pVel += zeus::CVector3f(b) * dv;
|
||||
float c;
|
||||
xc_maxMag->GetValue(frame, c);
|
||||
if (dvm > c)
|
||||
return false;
|
||||
|
||||
float d;
|
||||
x10_minMag->GetValue(frame, d);
|
||||
if (x14_enableMinMag && dvm < d)
|
||||
return true;
|
||||
|
||||
if (0.f == dvm)
|
||||
return false;
|
||||
|
||||
float b;
|
||||
x8_magScale->GetValue(frame, b);
|
||||
pVel += zeus::CVector3f(b) * dv;
|
||||
return false;
|
||||
}
|
||||
|
||||
bool CMVELinearImplosion::GetValue(int frame, zeus::CVector3f& pVel, zeus::CVector3f& pPos) const
|
||||
{
|
||||
zeus::CVector3f av;
|
||||
x4_implPoint->GetValue(frame, av);
|
||||
bool CMVELinearImplosion::GetValue(int frame, zeus::CVector3f& pVel, zeus::CVector3f& pPos) const {
|
||||
zeus::CVector3f av;
|
||||
x4_implPoint->GetValue(frame, av);
|
||||
|
||||
zeus::CVector3f dv = av - pPos;
|
||||
float dvm = dv.magnitude();
|
||||
zeus::CVector3f dv = av - pPos;
|
||||
float dvm = dv.magnitude();
|
||||
|
||||
float c;
|
||||
xc_maxMag->GetValue(frame, c);
|
||||
if (dvm > c)
|
||||
return false;
|
||||
|
||||
float d;
|
||||
x10_minMag->GetValue(frame, d);
|
||||
if (x14_enableMinMag && dvm < d)
|
||||
return true;
|
||||
|
||||
if (0.f == dvm)
|
||||
return false;
|
||||
|
||||
float b;
|
||||
x8_magScale->GetValue(frame, b);
|
||||
pVel = zeus::CVector3f(b / dvm) * dv;
|
||||
float c;
|
||||
xc_maxMag->GetValue(frame, c);
|
||||
if (dvm > c)
|
||||
return false;
|
||||
|
||||
float d;
|
||||
x10_minMag->GetValue(frame, d);
|
||||
if (x14_enableMinMag && dvm < d)
|
||||
return true;
|
||||
|
||||
if (0.f == dvm)
|
||||
return false;
|
||||
|
||||
float b;
|
||||
x8_magScale->GetValue(frame, b);
|
||||
pVel = zeus::CVector3f(b / dvm) * dv;
|
||||
return false;
|
||||
}
|
||||
|
||||
bool CMVETimeChain::GetValue(int frame, zeus::CVector3f& pVel, zeus::CVector3f& pPos) const
|
||||
{
|
||||
int v;
|
||||
xc_swFrame->GetValue(frame, v);
|
||||
if (frame >= v)
|
||||
return x8_b->GetValue(frame, pVel, pPos);
|
||||
else
|
||||
return x4_a->GetValue(frame, pVel, pPos);
|
||||
bool CMVETimeChain::GetValue(int frame, zeus::CVector3f& pVel, zeus::CVector3f& pPos) const {
|
||||
int v;
|
||||
xc_swFrame->GetValue(frame, v);
|
||||
if (frame >= v)
|
||||
return x8_b->GetValue(frame, pVel, pPos);
|
||||
else
|
||||
return x4_a->GetValue(frame, pVel, pPos);
|
||||
}
|
||||
|
||||
CMVEBounce::CMVEBounce(std::unique_ptr<CVectorElement>&& a, std::unique_ptr<CVectorElement>&& b,
|
||||
std::unique_ptr<CRealElement>&& c, std::unique_ptr<CRealElement>&& d, bool e)
|
||||
: x4_planePoint(std::move(a)), x8_planeNormal(std::move(b)), xc_friction(std::move(c)),
|
||||
x10_restitution(std::move(d)), x14_planePrecomputed(false), x15_dieOnPenetrate(e), x24_planeD(0.0)
|
||||
{
|
||||
if (x4_planePoint && x8_planeNormal && x4_planePoint->IsFastConstant() && x8_planeNormal->IsFastConstant())
|
||||
{
|
||||
/* Precompute Hesse normal form of plane (for penetration testing)
|
||||
* https://en.wikipedia.org/wiki/Hesse_normal_form */
|
||||
x14_planePrecomputed = true;
|
||||
x8_planeNormal->GetValue(0, x18_planeValidatedNormal);
|
||||
: x4_planePoint(std::move(a))
|
||||
, x8_planeNormal(std::move(b))
|
||||
, xc_friction(std::move(c))
|
||||
, x10_restitution(std::move(d))
|
||||
, x14_planePrecomputed(false)
|
||||
, x15_dieOnPenetrate(e)
|
||||
, x24_planeD(0.0) {
|
||||
if (x4_planePoint && x8_planeNormal && x4_planePoint->IsFastConstant() && x8_planeNormal->IsFastConstant()) {
|
||||
/* Precompute Hesse normal form of plane (for penetration testing)
|
||||
* https://en.wikipedia.org/wiki/Hesse_normal_form */
|
||||
x14_planePrecomputed = true;
|
||||
x8_planeNormal->GetValue(0, x18_planeValidatedNormal);
|
||||
|
||||
if (x18_planeValidatedNormal.magSquared() > 0.0)
|
||||
x18_planeValidatedNormal.normalize();
|
||||
zeus::CVector3f a;
|
||||
x4_planePoint->GetValue(0, a);
|
||||
x24_planeD = x18_planeValidatedNormal.dot(a);
|
||||
}
|
||||
if (x18_planeValidatedNormal.magSquared() > 0.0)
|
||||
x18_planeValidatedNormal.normalize();
|
||||
zeus::CVector3f a;
|
||||
x4_planePoint->GetValue(0, a);
|
||||
x24_planeD = x18_planeValidatedNormal.dot(a);
|
||||
}
|
||||
}
|
||||
|
||||
bool CMVEBounce::GetValue(int frame, zeus::CVector3f& pVel, zeus::CVector3f& pPos) const
|
||||
{
|
||||
if (!x14_planePrecomputed)
|
||||
{
|
||||
/* Compute Hesse normal form of plane (for penetration testing) */
|
||||
x8_planeNormal->GetValue(frame, const_cast<zeus::CVector3f&>(x18_planeValidatedNormal));
|
||||
const_cast<zeus::CVector3f&>(x18_planeValidatedNormal).normalize();
|
||||
bool CMVEBounce::GetValue(int frame, zeus::CVector3f& pVel, zeus::CVector3f& pPos) const {
|
||||
if (!x14_planePrecomputed) {
|
||||
/* Compute Hesse normal form of plane (for penetration testing) */
|
||||
x8_planeNormal->GetValue(frame, const_cast<zeus::CVector3f&>(x18_planeValidatedNormal));
|
||||
const_cast<zeus::CVector3f&>(x18_planeValidatedNormal).normalize();
|
||||
|
||||
zeus::CVector3f a;
|
||||
x4_planePoint->GetValue(frame, a);
|
||||
zeus::CVector3f a;
|
||||
x4_planePoint->GetValue(frame, a);
|
||||
|
||||
const_cast<float&>(x24_planeD) = x18_planeValidatedNormal.dot(a);
|
||||
}
|
||||
const_cast<float&>(x24_planeD) = x18_planeValidatedNormal.dot(a);
|
||||
}
|
||||
|
||||
float dot = x18_planeValidatedNormal.dot(pPos);
|
||||
if (dot - x24_planeD > 0.0f)
|
||||
return false;
|
||||
else if (x15_dieOnPenetrate)
|
||||
return true;
|
||||
|
||||
/* Deflection event */
|
||||
|
||||
if (pVel.dot(x18_planeValidatedNormal) >= 0.0f)
|
||||
return false;
|
||||
|
||||
zeus::CVector3f delta = pPos - pVel;
|
||||
pPos += (-(delta.dot(x18_planeValidatedNormal) - x24_planeD) / pVel.dot(x18_planeValidatedNormal) - 1.f) * pVel;
|
||||
|
||||
float d = 0.0f;
|
||||
x10_restitution->GetValue(frame, d);
|
||||
pVel -= d * pVel;
|
||||
|
||||
float c = 0.0f;
|
||||
xc_friction->GetValue(frame, c);
|
||||
pVel -= (1.f + c) * x18_planeValidatedNormal.dot(pVel) * x18_planeValidatedNormal;
|
||||
float dot = x18_planeValidatedNormal.dot(pPos);
|
||||
if (dot - x24_planeD > 0.0f)
|
||||
return false;
|
||||
}
|
||||
else if (x15_dieOnPenetrate)
|
||||
return true;
|
||||
|
||||
bool CMVEConstant::GetValue(int frame, zeus::CVector3f& pVel, zeus::CVector3f& /*pPos*/) const
|
||||
{
|
||||
float x, y, z;
|
||||
x4_x->GetValue(frame, x);
|
||||
x8_y->GetValue(frame, y);
|
||||
xc_z->GetValue(frame, z);
|
||||
pVel.assign(x, y, z);
|
||||
/* Deflection event */
|
||||
|
||||
if (pVel.dot(x18_planeValidatedNormal) >= 0.0f)
|
||||
return false;
|
||||
|
||||
zeus::CVector3f delta = pPos - pVel;
|
||||
pPos += (-(delta.dot(x18_planeValidatedNormal) - x24_planeD) / pVel.dot(x18_planeValidatedNormal) - 1.f) * pVel;
|
||||
|
||||
float d = 0.0f;
|
||||
x10_restitution->GetValue(frame, d);
|
||||
pVel -= d * pVel;
|
||||
|
||||
float c = 0.0f;
|
||||
xc_friction->GetValue(frame, c);
|
||||
pVel -= (1.f + c) * x18_planeValidatedNormal.dot(pVel) * x18_planeValidatedNormal;
|
||||
return false;
|
||||
}
|
||||
|
||||
bool CMVEFastConstant::GetValue(int /*frame*/, zeus::CVector3f& pVel, zeus::CVector3f& /*pPos*/) const
|
||||
{
|
||||
pVel = x4_val;
|
||||
return false;
|
||||
bool CMVEConstant::GetValue(int frame, zeus::CVector3f& pVel, zeus::CVector3f& /*pPos*/) const {
|
||||
float x, y, z;
|
||||
x4_x->GetValue(frame, x);
|
||||
x8_y->GetValue(frame, y);
|
||||
xc_z->GetValue(frame, z);
|
||||
pVel.assign(x, y, z);
|
||||
return false;
|
||||
}
|
||||
|
||||
bool CMVEGravity::GetValue(int frame, zeus::CVector3f& pVel, zeus::CVector3f& /*pPos*/) const
|
||||
{
|
||||
zeus::CVector3f grav;
|
||||
x4_a->GetValue(frame, grav);
|
||||
pVel += grav;
|
||||
return false;
|
||||
bool CMVEFastConstant::GetValue(int /*frame*/, zeus::CVector3f& pVel, zeus::CVector3f& /*pPos*/) const {
|
||||
pVel = x4_val;
|
||||
return false;
|
||||
}
|
||||
|
||||
bool CMVEExplode::GetValue(int frame, zeus::CVector3f& pVel, zeus::CVector3f& /*pPos*/) const
|
||||
{
|
||||
if (frame == 0)
|
||||
{
|
||||
CRandom16* rand = CRandom16::GetRandomNumber();
|
||||
zeus::CVector3f vec = {rand->Float() - 0.5f, rand->Float() - 0.5f, rand->Float() - 0.5f};
|
||||
vec.normalize();
|
||||
float a;
|
||||
x4_a->GetValue(frame, a);
|
||||
pVel = vec * a;
|
||||
}
|
||||
bool CMVEGravity::GetValue(int frame, zeus::CVector3f& pVel, zeus::CVector3f& /*pPos*/) const {
|
||||
zeus::CVector3f grav;
|
||||
x4_a->GetValue(frame, grav);
|
||||
pVel += grav;
|
||||
return false;
|
||||
}
|
||||
|
||||
bool CMVEExplode::GetValue(int frame, zeus::CVector3f& pVel, zeus::CVector3f& /*pPos*/) const {
|
||||
if (frame == 0) {
|
||||
CRandom16* rand = CRandom16::GetRandomNumber();
|
||||
zeus::CVector3f vec = {rand->Float() - 0.5f, rand->Float() - 0.5f, rand->Float() - 0.5f};
|
||||
vec.normalize();
|
||||
float a;
|
||||
x4_a->GetValue(frame, a);
|
||||
pVel = vec * a;
|
||||
} else {
|
||||
float b;
|
||||
x8_b->GetValue(frame, b);
|
||||
pVel *= zeus::CVector3f(b);
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
bool CMVESetPosition::GetValue(int frame, zeus::CVector3f& /*pVel*/, zeus::CVector3f& pPos) const {
|
||||
x4_a->GetValue(frame, pPos);
|
||||
return false;
|
||||
}
|
||||
|
||||
bool CMVEPulse::GetValue(int frame, zeus::CVector3f& pVel, zeus::CVector3f& pPos) const {
|
||||
int a, b;
|
||||
x4_aDuration->GetValue(frame, a);
|
||||
x8_bDuration->GetValue(frame, b);
|
||||
int cv = std::max(1, a + b + 1);
|
||||
|
||||
if (b >= 1) {
|
||||
int cv2 = frame % cv;
|
||||
if (cv2 >= a)
|
||||
x10_bVal->GetValue(frame, pVel, pPos);
|
||||
else
|
||||
{
|
||||
float b;
|
||||
x8_b->GetValue(frame, b);
|
||||
pVel *= zeus::CVector3f(b);
|
||||
}
|
||||
xc_aVal->GetValue(frame, pVel, pPos);
|
||||
} else
|
||||
xc_aVal->GetValue(frame, pVel, pPos);
|
||||
|
||||
return false;
|
||||
return false;
|
||||
}
|
||||
|
||||
bool CMVESetPosition::GetValue(int frame, zeus::CVector3f& /*pVel*/, zeus::CVector3f& pPos) const
|
||||
{
|
||||
x4_a->GetValue(frame, pPos);
|
||||
return false;
|
||||
bool CMVEWind::GetValue(int frame, zeus::CVector3f& pVel, zeus::CVector3f& /*pPos*/) const {
|
||||
zeus::CVector3f wVel;
|
||||
x4_velocity->GetValue(frame, wVel);
|
||||
float factor;
|
||||
x8_factor->GetValue(frame, factor);
|
||||
pVel += (wVel - pVel) * factor;
|
||||
return false;
|
||||
}
|
||||
|
||||
bool CMVEPulse::GetValue(int frame, zeus::CVector3f& pVel, zeus::CVector3f& pPos) const
|
||||
{
|
||||
int a, b;
|
||||
x4_aDuration->GetValue(frame, a);
|
||||
x8_bDuration->GetValue(frame, b);
|
||||
int cv = std::max(1, a + b + 1);
|
||||
bool CMVESwirl::GetValue(int frame, zeus::CVector3f& pVel, zeus::CVector3f& pPos) const {
|
||||
zeus::CVector3f a, b;
|
||||
x4_helixPoint->GetValue(frame, a);
|
||||
x8_curveBinormal->GetValue(frame, b);
|
||||
|
||||
if (b >= 1)
|
||||
{
|
||||
int cv2 = frame % cv;
|
||||
if (cv2 >= a)
|
||||
x10_bVal->GetValue(frame, pVel, pPos);
|
||||
else
|
||||
xc_aVal->GetValue(frame, pVel, pPos);
|
||||
}
|
||||
else
|
||||
xc_aVal->GetValue(frame, pVel, pPos);
|
||||
|
||||
return false;
|
||||
const zeus::CVector3f posToOrigin = a - pPos;
|
||||
const zeus::CVector3f posToHelix = posToOrigin - posToOrigin.dot(b) * b;
|
||||
float c = 0.0f, d = 0.0f;
|
||||
xc_filterGain->GetValue(frame, c);
|
||||
x10_tangentialVelocity->GetValue(frame, d);
|
||||
const zeus::CVector3f wetVel = (posToHelix.cross(b) * d + b * b.dot(pVel));
|
||||
pVel = c * wetVel + (1.f - c) * pVel;
|
||||
return false;
|
||||
}
|
||||
|
||||
bool CMVEWind::GetValue(int frame, zeus::CVector3f& pVel, zeus::CVector3f& /*pPos*/) const
|
||||
{
|
||||
zeus::CVector3f wVel;
|
||||
x4_velocity->GetValue(frame, wVel);
|
||||
float factor;
|
||||
x8_factor->GetValue(frame, factor);
|
||||
pVel += (wVel - pVel) * factor;
|
||||
return false;
|
||||
}
|
||||
|
||||
bool CMVESwirl::GetValue(int frame, zeus::CVector3f& pVel, zeus::CVector3f& pPos) const
|
||||
{
|
||||
zeus::CVector3f a, b;
|
||||
x4_helixPoint->GetValue(frame, a);
|
||||
x8_curveBinormal->GetValue(frame, b);
|
||||
|
||||
const zeus::CVector3f posToOrigin = a - pPos;
|
||||
const zeus::CVector3f posToHelix = posToOrigin - posToOrigin.dot(b) * b;
|
||||
float c = 0.0f, d = 0.0f;
|
||||
xc_filterGain->GetValue(frame, c);
|
||||
x10_tangentialVelocity->GetValue(frame, d);
|
||||
const zeus::CVector3f wetVel = (posToHelix.cross(b) * d + b * b.dot(pVel));
|
||||
pVel = c * wetVel + (1.f - c) * pVel;
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
} // namespace urde
|
||||
|
||||
Reference in New Issue
Block a user