mirrors/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2025-10-23 08:24:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Implement/match LegoAnimationManager::FUN_10064b50 (#926)

Browse Source
This commit is contained in:
Christian Semmler
2024-05-17 10:05:06 -04:00
committed by GitHub
parent 4419007355
commit 02c4aad33e
5 changed files with 45 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
LEGO1/mxgeometry/mxgeometry3d.h
View File

@@ -100,6 +100,7 @@ private:
undefined4 m_unk0x30; // 0x30
};
// FUNCTION: BETA10 0x1004aaa0
int UnknownMx4DPointFloat::Unknown_100040a0(Matrix4& p_matrix, float p_f)
{
float data[4];
@@ -114,6 +115,7 @@ int UnknownMx4DPointFloat::Unknown_100040a0(Matrix4& p_matrix, float p_f)
}
// FUNCTION: LEGO1 0x100040a0
// FUNCTION: BETA10 0x1004ab10
inline int UnknownMx4DPointFloat::FUN_100040a0(Vector4& p_v, float p_f)
{
undefined4 state = m_unk0x30;
@@ -136,7 +138,7 @@ inline int UnknownMx4DPointFloat::FUN_100040a0(Vector4& p_v, float p_f)
if (1.0 - d1 > 0.00001) {
double d = acos(d1);
sin(d);
d1 = sin((1 - p_f) * d) / sin(d);
d1 = sin((1.0 - p_f) * d) / sin(d);
d2 = sin(p_f * d) / sin(d);
}
else {
@@ -150,7 +152,7 @@ inline int UnknownMx4DPointFloat::FUN_100040a0(Vector4& p_v, float p_f)
}
else {
p_v[0] = -m_unk0x00[1];
p_v[1] = m_unk0x00[1];
p_v[1] = m_unk0x00[0];
p_v[2] = -m_unk0x00[3];
p_v[3] = m_unk0x00[2];
d1 = sin((1.0 - p_f) * 1.570796326794895);

2
LEGO1/mxgeometry/mxmatrix.h
View File

@@ -21,8 +21,6 @@ public:
// FUNCTION: LEGO1 0x10002850
void operator=(const Matrix4& p_matrix) override { Equals(p_matrix); } // vtable+0x28
// No idea why there's another equals. Maybe to some other type like the
// DirectX Retained Mode Matrix type which is also a float* alias?
// FUNCTION: LEGO1 0x10002860
virtual void operator=(const MxMatrix& p_matrix) { Equals(p_matrix); } // vtable+0x48