Skip to content

Commit

Permalink
Refactor
Browse files Browse the repository at this point in the history
  • Loading branch information
@foxtacles
foxtacles committed Jan 3, 2025
1 parent 3ecdb54 commit 60bc264
Show file tree
Hide file tree
Showing 4 changed files with 130 additions and 120 deletions.
2 changes: 1 addition & 1 deletion LEGO1/lego/legoomni/src/actors/helicopter.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -482,7 +482,7 @@ void Helicopter::FUN_100042a0(const Matrix4& p_matrix)

m_unk0x1f0 = Timer()->GetTime();

m_unk0x1f4.Set(local48, local90);
m_unk0x1f4.SetStartEnd(local48, local90);
m_unk0x1f4.NormalizeDirection();
}

Expand Down
2 changes: 1 addition & 1 deletion LEGO1/lego/legoomni/src/build/legocarbuild.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -358,7 +358,7 @@ void LegoCarBuild::VTable0x70()

m_unk0x2a0 = sqrt((MxDouble) DISTSQRD2(m_unk0x290, m_unk0x298));

m_unk0x25c.Set(m_unk0x178, m_unk0x208);
m_unk0x25c.SetStartEnd(m_unk0x178, m_unk0x208);
}

// FUNCTION: LEGO1 0x10023130
Expand Down
2 changes: 1 addition & 1 deletion LEGO1/lego/legoomni/src/common/legoanimationmanager.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2797,7 +2797,7 @@ void LegoAnimationManager::FUN_100648f0(LegoTranInfo* p_tranInfo, MxLong p_unk0x
LegoLocation* location = NavController()->GetLocation(p_tranInfo->m_location);
if (location != NULL) {
CalcLocalTransform(location->m_position, location->m_direction, location->m_up, m_unk0x484);
m_unk0x4cc.Set(m_unk0x43c, m_unk0x484);
m_unk0x4cc.SetStartEnd(m_unk0x43c, m_unk0x484);
m_unk0x4cc.NormalizeDirection();
}
else {
Expand Down
244 changes: 127 additions & 117 deletions LEGO1/mxgeometry/mxquaternion.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,149 +7,159 @@
class MxQuaternionTransformer {
public:
enum {
c_startInit = 0x01,
c_endInit = 0x02
c_startSet = 0x01,
c_endSet = 0x02
};

MxQuaternionTransformer() : m_flags(0) {}

// FUNCTION: LEGO1 0x10004520
inline long NormalizeDirection()
{
if (!m_flags) {
return -1;
}

Mx4DPointFloat v1;
Mx4DPointFloat v2;
inline long NormalizeDirection();
inline void SetStartEnd(Matrix4& p_m1, Matrix4& p_m2);
inline void SetStart(Matrix4& p_m);
inline void SetEnd(Matrix4& p_m);
inline void SetStart(Vector4& p_v);
inline void SetEnd(Vector4& p_v);
inline int InterpolateToMatrix(Matrix4& p_matrix, float p_f);

v1 = m_startQuat;
v1 += m_endQuat;
const Vector4& GetStartQuat() const { return m_startQuat; }
const Vector4& GetEndQuat() const { return m_endQuat; }
undefined4 GetFlags() const { return m_flags; }

v2 = m_startQuat;
v2 -= m_endQuat;
private:
inline int Interpolate(Vector4& p_v, float p_f);

if (v1.Dot(v1, v1) < v2.Dot(v2, v2)) {
m_endQuat *= -1.0f;
}
Mx4DPointFloat m_startQuat; // 0x00
Mx4DPointFloat m_endQuat; // 0x18
MxU32 m_flags; // 0x30
};

return 0;
// FUNCTION: LEGO1 0x10004520
long MxQuaternionTransformer::NormalizeDirection()
{
if (!m_flags) {
return -1;
}

// FUNCTION: BETA10 0x1004a9b0
void Set(Matrix4& p_m1, Matrix4& p_m2)
{
SetStart(p_m1);
SetEnd(p_m2);
}
Mx4DPointFloat v1;
Mx4DPointFloat v2;

// FUNCTION: BETA10 0x1004a9f0
void SetStart(Matrix4& p_m)
{
p_m.ToQuaternion(m_startQuat);
m_flags |= c_startInit;
}
v1 = m_startQuat;
v1 += m_endQuat;

// FUNCTION: LEGO1 0x10004620
// FUNCTION: BETA10 0x1004aa30
void SetEnd(Matrix4& p_m)
{
p_m.ToQuaternion(m_endQuat);
m_flags |= c_endInit;
}
v2 = m_startQuat;
v2 -= m_endQuat;

// FUNCTION: BETA10 0x10180b80
void SetStart(Vector4& p_v)
{
m_startQuat = p_v;
m_flags |= c_startInit;
if (v1.Dot(v1, v1) < v2.Dot(v2, v2)) {
m_endQuat *= -1.0f;
}

// FUNCTION: BETA10 0x10180bc0
void SetEnd(Vector4& p_v)
{
m_endQuat = p_v;
m_flags |= c_endInit;
return 0;
}

// FUNCTION: BETA10 0x1004a9b0
void MxQuaternionTransformer::SetStartEnd(Matrix4& p_m1, Matrix4& p_m2)
{
SetStart(p_m1);
SetEnd(p_m2);
}

// FUNCTION: BETA10 0x1004a9f0
void MxQuaternionTransformer::SetStart(Matrix4& p_m)
{
p_m.ToQuaternion(m_startQuat);
m_flags |= c_startSet;
}

// FUNCTION: LEGO1 0x10004620
// FUNCTION: BETA10 0x1004aa30
void MxQuaternionTransformer::SetEnd(Matrix4& p_m)
{
p_m.ToQuaternion(m_endQuat);
m_flags |= c_endSet;
}

// FUNCTION: BETA10 0x10180b80
void MxQuaternionTransformer::SetStart(Vector4& p_v)
{
m_startQuat = p_v;
m_flags |= c_startSet;
}

// FUNCTION: BETA10 0x10180bc0
void MxQuaternionTransformer::SetEnd(Vector4& p_v)
{
m_endQuat = p_v;
m_flags |= c_endSet;
}

// FUNCTION: BETA10 0x1004aaa0
int MxQuaternionTransformer::InterpolateToMatrix(Matrix4& p_matrix, float p_f)
{
float data[4];
Vector4 v(data);

if (Interpolate(v, p_f) == 0) {
return p_matrix.FromQuaternion(v);
}

const Vector4& GetStartQuat() const { return m_startQuat; }
const Vector4& GetEndQuat() const { return m_endQuat; }
undefined4 GetFlags() const { return m_flags; }

// FUNCTION: BETA10 0x1004aaa0
inline int InterpolateToMatrix(Matrix4& p_matrix, float p_f)
{
float data[4];
Vector4 v(data);

if (Interpolate(v, p_f) == 0) {
return p_matrix.FromQuaternion(v);
}

return -1;
return -1;
}

// FUNCTION: LEGO1 0x100040a0
// FUNCTION: BETA10 0x1004ab10
int MxQuaternionTransformer::Interpolate(Vector4& p_v, float p_f)
{
if (m_flags == c_startSet) {
p_v = m_startQuat;
p_v[3] = (float) ((1.0 - p_f) * acos((double) p_v[3]) * 2.0);
return p_v.NormalizeQuaternion();
}

private:
// FUNCTION: LEGO1 0x100040a0
// FUNCTION: BETA10 0x1004ab10
inline int Interpolate(Vector4& p_v, float p_f)
{
if (m_flags == c_startInit) {
p_v = m_startQuat;
p_v[3] = (float) ((1.0 - p_f) * acos((double) p_v[3]) * 2.0);
return p_v.NormalizeQuaternion();
}

if (m_flags == c_endInit) {
p_v = m_endQuat;
p_v[3] = (float) (p_f * acos((double) p_v[3]) * 2.0);
return p_v.NormalizeQuaternion();
}
if (m_flags == c_endSet) {
p_v = m_endQuat;
p_v[3] = (float) (p_f * acos((double) p_v[3]) * 2.0);
return p_v.NormalizeQuaternion();
}

if (m_flags == (c_startInit | c_endInit)) {
int i;
double d1 = p_v.Dot(m_startQuat, m_endQuat);
double a;
double b;

if (d1 + 1.0 > 0.00001) {
if (1.0 - d1 > 0.00001) {
double d2 = acos(d1);
double denominator = sin(d2);
a = sin((1.0 - p_f) * d2) / denominator;
b = sin(p_f * d2) / denominator;
}
else {
a = 1.0 - p_f;
b = p_f;
}

for (i = 0; i < 4; i++) {
p_v[i] = (float) (m_startQuat[i] * a + m_endQuat[i] * b);
}
if (m_flags == (c_startSet | c_endSet)) {
int i;
double d1 = p_v.Dot(m_startQuat, m_endQuat);
double a;
double b;

if (d1 + 1.0 > 0.00001) {
if (1.0 - d1 > 0.00001) {
double d2 = acos(d1);
double denominator = sin(d2);
a = sin((1.0 - p_f) * d2) / denominator;
b = sin(p_f * d2) / denominator;
}
else {
p_v[0] = -m_startQuat[1];
p_v[1] = m_startQuat[0];
p_v[2] = -m_startQuat[3];
p_v[3] = m_startQuat[2];
a = sin((1.0 - p_f) * 1.570796326794895);
b = sin(p_f * 1.570796326794895);

for (i = 0; i < 3; i++) {
p_v[i] = (float) (m_startQuat[i] * a + p_v[i] * b);
}
a = 1.0 - p_f;
b = p_f;
}

return 0;
for (i = 0; i < 4; i++) {
p_v[i] = (float) (m_startQuat[i] * a + m_endQuat[i] * b);
}
}
else {
p_v[0] = -m_startQuat[1];
p_v[1] = m_startQuat[0];
p_v[2] = -m_startQuat[3];
p_v[3] = m_startQuat[2];
a = sin((1.0 - p_f) * 1.570796326794895);
b = sin(p_f * 1.570796326794895);

for (i = 0; i < 3; i++) {
p_v[i] = (float) (m_startQuat[i] * a + p_v[i] * b);
}
}

return -1;
return 0;
}

Mx4DPointFloat m_startQuat; // 0x00
Mx4DPointFloat m_endQuat; // 0x18
MxU32 m_flags; // 0x30
};
return -1;
}

#endif // MXQUATERION_H
#endif // MXQUATERNION_H

0 comments on commit 60bc264

Please sign in to comment.