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

Improve matches

Browse Source
This commit is contained in:
Christian Semmler 2024-03-12 13:13:58 -04:00
parent 3309d3ee86
commit c71f0e3fe1
4 changed files with 28 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
LEGO1/lego/sources/anim/legoanim.cpp
View File

@ -449,7 +449,7 @@ LegoResult LegoAnimNodeData::CreateLocalTransform(LegoFloat p_time, Matrix4& p_m
// FUNCTION: LEGO1 0x100a0600 // FUNCTION: LEGO1 0x100a0600
inline void LegoAnimNodeData::GetTranslation( inline void LegoAnimNodeData::GetTranslation(
LegoU32 p_numTranslationKeys, LegoU16 p_numTranslationKeys,
LegoTranslationKey* p_translationKeys, LegoTranslationKey* p_translationKeys,
LegoFloat p_time, LegoFloat p_time,
Matrix4& p_matrix, Matrix4& p_matrix,
@ -513,7 +513,7 @@ inline void LegoAnimNodeData::GetTranslation(
// FUNCTION: LEGO1 0x100a06f0 // FUNCTION: LEGO1 0x100a06f0
/*inline*/ void LegoAnimNodeData::GetRotation( /*inline*/ void LegoAnimNodeData::GetRotation(
LegoU32 p_numRotationKeys, LegoU16 p_numRotationKeys,
LegoRotationKey* p_rotationKeys, LegoRotationKey* p_rotationKeys,
LegoFloat p_time, LegoFloat p_time,
Matrix4& p_matrix, Matrix4& p_matrix,
@ -576,7 +576,7 @@ inline void LegoAnimNodeData::GetTranslation(
} }
inline void LegoAnimNodeData::GetScale( inline void LegoAnimNodeData::GetScale(
LegoU32 p_numScaleKeys, LegoU16 p_numScaleKeys,
LegoScaleKey* p_scaleKeys, LegoScaleKey* p_scaleKeys,
LegoFloat p_time, LegoFloat p_time,
Matrix4& p_matrix, Matrix4& p_matrix,

6
LEGO1/lego/sources/anim/legoanim.h
View File

@ -133,21 +133,21 @@ class LegoAnimNodeData : public LegoTreeNodeData {
LegoBool FUN_100a0990(LegoTime p_time) { return FUN_100a0990((LegoFloat) p_time); } LegoBool FUN_100a0990(LegoTime p_time) { return FUN_100a0990((LegoFloat) p_time); }
inline static void GetTranslation( inline static void GetTranslation(
LegoU32 p_numTranslationKeys, LegoU16 p_numTranslationKeys,
LegoTranslationKey* p_translationKeys, LegoTranslationKey* p_translationKeys,
LegoFloat p_time, LegoFloat p_time,
Matrix4& p_matrix, Matrix4& p_matrix,
LegoU32& p_old_index LegoU32& p_old_index
); );
/*inline*/ static void GetRotation( /*inline*/ static void GetRotation(
LegoU32 p_numRotationKeys, LegoU16 p_numRotationKeys,
LegoRotationKey* p_rotationKeys, LegoRotationKey* p_rotationKeys,
LegoFloat p_time, LegoFloat p_time,
Matrix4& p_matrix, Matrix4& p_matrix,
LegoU32& p_old_index LegoU32& p_old_index
); );
inline static void GetScale( inline static void GetScale(
LegoU32 p_numScaleKeys, LegoU16 p_numScaleKeys,
LegoScaleKey* p_scaleKeys, LegoScaleKey* p_scaleKeys,
LegoFloat p_time, LegoFloat p_time,
Matrix4& p_matrix, Matrix4& p_matrix,

3
LEGO1/library_msvc.h
View File

@ -18,6 +18,9 @@
// LIBRARY: LEGO1 0x1008b020 // LIBRARY: LEGO1 0x1008b020
// ___CxxFrameHandler // ___CxxFrameHandler
// LIBRARY: LEGO1 0x1008b3dc
// __CIacos
// LIBRARY: LEGO1 0x1008b400 // LIBRARY: LEGO1 0x1008b400
// _atol // _atol

38
LEGO1/mxgeometry/mxgeometry3d.h
View File

@ -124,46 +124,46 @@ inline int UnknownMx4DPointFloat::FUN_100040a0(Vector4& p_v, float p_f)
undefined4 state = m_unk0x30; undefined4 state = m_unk0x30;
if (state == 1) { if (state == 1) {
p_v.EqualsImpl(m_unk0x00.GetData()); p_v = m_unk0x00;
p_v[3] = acos(p_v[3]) * (1 - p_f) * 2.0; p_v[3] = (1.0 - p_f) * acos(p_v[3]) * 2.0;
return p_v.NormalizeQuaternion(); return p_v.NormalizeQuaternion();
} }
else if (state == 2) { else if (state == 2) {
p_v.EqualsImpl(m_unk0x18.GetData()); p_v = m_unk0x18;
p_v[3] = acos(p_v[3]) * p_f * 2.0; p_v[3] = p_f * acos(p_v[3]) * 2.0;
return p_v.NormalizeQuaternion(); return p_v.NormalizeQuaternion();
} }
else if (state == 3) { else if (state == 3) {
double d1 = p_v.Dot(&m_unk0x00, &m_unk0x18), d2; double d1 = p_v.Dot(&m_unk0x00, &m_unk0x18);
double d2;
if (d1 + 1 > 0.00001) { if (d1 + 1.0 > 0.00001) {
if (1 - d1 > 0.00001) { if (1.0 - d1 > 0.00001) {
double d = acos(d1); double d = acos(d1);
sin(d); sin(d);
d1 = sin((1 - p_f) * d) / sin(d); d1 = sin((1 - p_f) * d) / sin(d);
d2 = sin(p_f * d) / sin(d); d2 = sin(p_f * d) / sin(d);
} }
else { else {
d1 = 1 - p_f; d1 = 1.0 - p_f;
d2 = p_f; d2 = p_f;
} }
for (int i = 0; i < 4; i++) { for (int i = 0; i < 4; i++) {
p_v[i] = m_unk0x18[i] * d2 + m_unk0x00[i] * d1; p_v[i] = m_unk0x18[i] * d2 + m_unk0x00[i] * d1;
} }
return 0;
} }
else {
p_v[0] = -m_unk0x00[1];
p_v[1] = m_unk0x00[1];
p_v[2] = -m_unk0x00[3];
p_v[3] = m_unk0x00[2];
d1 = sin((1.0 - p_f) * 1.570796326794895);
d2 = sin(p_f * 1.570796326794895);
p_v[0] = -m_unk0x00[1]; for (int i = 0; i < 3; i++) {
p_v[1] = m_unk0x00[1]; p_v[i] = m_unk0x00[i] * d1 + p_v[i] * d2;
p_v[2] = -m_unk0x00[3]; }
p_v[3] = m_unk0x00[2];
d1 = sin((1 - p_f) * 1.570796326794895);
d2 = sin(p_f * 1.570796326794895);
for (int i = 0; i < 3; i++) {
p_v[i] = m_unk0x00[i] * d1 + p_v[i] * d2;
} }
return 0; return 0;