isledecomp/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2026-02-03 13:41:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Refactor

Browse Source
This commit is contained in:
Christian Semmler 2025-01-03 12:14:30 -07:00
parent 3ecdb5480a
commit 60bc264bff
4 changed files with 143 additions and 133 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
LEGO1/lego/legoomni/src/actors/helicopter.cpp
View File

@ -482,7 +482,7 @@ void Helicopter::FUN_100042a0(const Matrix4& p_matrix)
m_unk0x1f0 = Timer()->GetTime(); m_unk0x1f0 = Timer()->GetTime();
m_unk0x1f4.Set(local48, local90); m_unk0x1f4.SetStartEnd(local48, local90);
m_unk0x1f4.NormalizeDirection(); m_unk0x1f4.NormalizeDirection();
} }

2
LEGO1/lego/legoomni/src/build/legocarbuild.cpp
View File

@ -358,7 +358,7 @@ void LegoCarBuild::VTable0x70()
m_unk0x2a0 = sqrt((MxDouble) DISTSQRD2(m_unk0x290, m_unk0x298)); 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 // FUNCTION: LEGO1 0x10023130

2
LEGO1/lego/legoomni/src/common/legoanimationmanager.cpp
View File

@ -2797,7 +2797,7 @@ void LegoAnimationManager::FUN_100648f0(LegoTranInfo* p_tranInfo, MxLong p_unk0x
LegoLocation* location = NavController()->GetLocation(p_tranInfo->m_location); LegoLocation* location = NavController()->GetLocation(p_tranInfo->m_location);
if (location != NULL) { if (location != NULL) {
CalcLocalTransform(location->m_position, location->m_direction, location->m_up, m_unk0x484); 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(); m_unk0x4cc.NormalizeDirection();
} }
else { else {

66
LEGO1/mxgeometry/mxquaternion.h
View File

@ -7,14 +7,34 @@
class MxQuaternionTransformer { class MxQuaternionTransformer {
public: public:
enum { enum {
c_startInit = 0x01, c_startSet = 0x01,
c_endInit = 0x02 c_endSet = 0x02
}; };
MxQuaternionTransformer() : m_flags(0) {} MxQuaternionTransformer() : m_flags(0) {}
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);
const Vector4& GetStartQuat() const { return m_startQuat; }
const Vector4& GetEndQuat() const { return m_endQuat; }
undefined4 GetFlags() const { return m_flags; }
private:
inline int Interpolate(Vector4& p_v, float p_f);
Mx4DPointFloat m_startQuat; // 0x00
Mx4DPointFloat m_endQuat; // 0x18
MxU32 m_flags; // 0x30
};
// FUNCTION: LEGO1 0x10004520 // FUNCTION: LEGO1 0x10004520
inline long NormalizeDirection() long MxQuaternionTransformer::NormalizeDirection()
{ {
if (!m_flags) { if (!m_flags) {
return -1; return -1;
@ -37,47 +57,43 @@ class MxQuaternionTransformer {
} }
// FUNCTION: BETA10 0x1004a9b0 // FUNCTION: BETA10 0x1004a9b0
void Set(Matrix4& p_m1, Matrix4& p_m2) void MxQuaternionTransformer::SetStartEnd(Matrix4& p_m1, Matrix4& p_m2)
{ {
SetStart(p_m1); SetStart(p_m1);
SetEnd(p_m2); SetEnd(p_m2);
} }
// FUNCTION: BETA10 0x1004a9f0 // FUNCTION: BETA10 0x1004a9f0
void SetStart(Matrix4& p_m) void MxQuaternionTransformer::SetStart(Matrix4& p_m)
{ {
p_m.ToQuaternion(m_startQuat); p_m.ToQuaternion(m_startQuat);
m_flags |= c_startInit; m_flags |= c_startSet;
} }
// FUNCTION: LEGO1 0x10004620 // FUNCTION: LEGO1 0x10004620
// FUNCTION: BETA10 0x1004aa30 // FUNCTION: BETA10 0x1004aa30
void SetEnd(Matrix4& p_m) void MxQuaternionTransformer::SetEnd(Matrix4& p_m)
{ {
p_m.ToQuaternion(m_endQuat); p_m.ToQuaternion(m_endQuat);
m_flags |= c_endInit; m_flags |= c_endSet;
} }
// FUNCTION: BETA10 0x10180b80 // FUNCTION: BETA10 0x10180b80
void SetStart(Vector4& p_v) void MxQuaternionTransformer::SetStart(Vector4& p_v)
{ {
m_startQuat = p_v; m_startQuat = p_v;
m_flags |= c_startInit; m_flags |= c_startSet;
} }
// FUNCTION: BETA10 0x10180bc0 // FUNCTION: BETA10 0x10180bc0
void SetEnd(Vector4& p_v) void MxQuaternionTransformer::SetEnd(Vector4& p_v)
{ {
m_endQuat = p_v; m_endQuat = p_v;
m_flags |= c_endInit; m_flags |= c_endSet;
} }
const Vector4& GetStartQuat() const { return m_startQuat; }
const Vector4& GetEndQuat() const { return m_endQuat; }
undefined4 GetFlags() const { return m_flags; }
// FUNCTION: BETA10 0x1004aaa0 // FUNCTION: BETA10 0x1004aaa0
inline int InterpolateToMatrix(Matrix4& p_matrix, float p_f) int MxQuaternionTransformer::InterpolateToMatrix(Matrix4& p_matrix, float p_f)
{ {
float data[4]; float data[4];
Vector4 v(data); Vector4 v(data);
@ -89,24 +105,23 @@ class MxQuaternionTransformer {
return -1; return -1;
} }
private:
// FUNCTION: LEGO1 0x100040a0 // FUNCTION: LEGO1 0x100040a0
// FUNCTION: BETA10 0x1004ab10 // FUNCTION: BETA10 0x1004ab10
inline int Interpolate(Vector4& p_v, float p_f) int MxQuaternionTransformer::Interpolate(Vector4& p_v, float p_f)
{ {
if (m_flags == c_startInit) { if (m_flags == c_startSet) {
p_v = m_startQuat; p_v = m_startQuat;
p_v[3] = (float) ((1.0 - p_f) * acos((double) p_v[3]) * 2.0); p_v[3] = (float) ((1.0 - p_f) * acos((double) p_v[3]) * 2.0);
return p_v.NormalizeQuaternion(); return p_v.NormalizeQuaternion();
} }
if (m_flags == c_endInit) { if (m_flags == c_endSet) {
p_v = m_endQuat; p_v = m_endQuat;
p_v[3] = (float) (p_f * acos((double) p_v[3]) * 2.0); p_v[3] = (float) (p_f * acos((double) p_v[3]) * 2.0);
return p_v.NormalizeQuaternion(); return p_v.NormalizeQuaternion();
} }
if (m_flags == (c_startInit | c_endInit)) { if (m_flags == (c_startSet | c_endSet)) {
int i; int i;
double d1 = p_v.Dot(m_startQuat, m_endQuat); double d1 = p_v.Dot(m_startQuat, m_endQuat);
double a; double a;
@ -147,9 +162,4 @@ class MxQuaternionTransformer {
return -1; return -1;
} }
Mx4DPointFloat m_startQuat; // 0x00 #endif // MXQUATERNION_H
Mx4DPointFloat m_endQuat; // 0x18
MxU32 m_flags; // 0x30
};
#endif // MXQUATERION_H