isledecomp/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2026-01-21 07:11:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Improve Matrix4::ToQuaternion match

Browse Source
This commit is contained in:
Christian Semmler 2024-12-25 12:40:53 -07:00
parent 0622056f4c
commit 987bdb06f3
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
LEGO1/lego/legoomni/src/video/legoanimpresenter.cpp
View File

@ -716,7 +716,7 @@ MxResult LegoAnimPresenter::FUN_1006b140(LegoROI* p_roi)
for (i = 1; i <= m_roiMapSize; i++) { for (i = 1; i <= m_roiMapSize; i++) {
if (m_roiMap[i] == p_roi) { if (m_roiMap[i] == p_roi) {
if (local5c[i].Unknown(local58) != SUCCESS) { if (local5c[i].BETA_1005a590(local58) != SUCCESS) {
goto done; goto done;
} }

17
LEGO1/realtime/matrix.h
View File

@ -179,7 +179,7 @@ class Matrix4 {
} }
} }
inline int Unknown(Matrix4& p_mat); inline int BETA_1005a590(Matrix4& p_mat);
// FUNCTION: LEGO1 0x1006b500 // FUNCTION: LEGO1 0x1006b500
void Swap(int p_d1, int p_d2) void Swap(int p_d1, int p_d2)
@ -202,9 +202,11 @@ class Matrix4 {
// FUNCTION: BETA10 0x100101c0 // FUNCTION: BETA10 0x100101c0
inline void Matrix4::ToQuaternion(Vector4& p_outQuat) inline void Matrix4::ToQuaternion(Vector4& p_outQuat)
{ {
float trace = m_data[0][0] + m_data[1][1] + m_data[2][2]; float trace;
if (trace > 0) { float localc = m_data[0][0] + m_data[1][1] + m_data[2][2];
trace = sqrt(trace + 1.0);
if (localc > 0) {
trace = sqrt(localc + 1.0);
p_outQuat[3] = trace * 0.5f; p_outQuat[3] = trace * 0.5f;
trace = 0.5f / trace; trace = 0.5f / trace;
p_outQuat[0] = (m_data[2][1] - m_data[1][2]) * trace; p_outQuat[0] = (m_data[2][1] - m_data[1][2]) * trace;
@ -212,7 +214,6 @@ inline void Matrix4::ToQuaternion(Vector4& p_outQuat)
p_outQuat[2] = (m_data[1][0] - m_data[0][1]) * trace; p_outQuat[2] = (m_data[1][0] - m_data[0][1]) * trace;
} }
else { else {
// GLOBAL: LEGO1 0x100d4090 // GLOBAL: LEGO1 0x100d4090
static int rotateIndex[] = {1, 2, 0}; static int rotateIndex[] = {1, 2, 0};
@ -228,13 +229,13 @@ inline void Matrix4::ToQuaternion(Vector4& p_outQuat)
int next = rotateIndex[largest]; int next = rotateIndex[largest];
int nextNext = rotateIndex[next]; int nextNext = rotateIndex[next];
float trace = sqrt(*Element(largest, largest) - (*Element(nextNext, nextNext) + *Element(next, next)) + 1.0); trace = sqrt(*Element(largest, largest) - (*Element(nextNext, nextNext) + *Element(next, next)) + 1.0);
p_outQuat[largest] = trace * 0.5f; p_outQuat[largest] = trace * 0.5f;
trace = 0.5f / trace; trace = 0.5f / trace;
p_outQuat[3] = (*Element(nextNext, next) - *Element(next, nextNext)) * trace; p_outQuat[3] = (*Element(nextNext, next) - *Element(next, nextNext)) * trace;
p_outQuat[next] = (*Element(largest, next) + *Element(next, largest)) * trace; p_outQuat[next] = (*Element(largest, next) - *Element(next, largest)) * trace;
p_outQuat[nextNext] = (*Element(largest, nextNext) + *Element(nextNext, largest)) * trace; p_outQuat[nextNext] = (*Element(largest, nextNext) + *Element(nextNext, largest)) * trace;
} }
} }
@ -292,7 +293,7 @@ inline int Matrix4::FromQuaternion(const Vector4& p_vec)
} }
// FUNCTION: BETA10 0x1005a590 // FUNCTION: BETA10 0x1005a590
inline int Matrix4::Unknown(Matrix4& p_mat) inline int Matrix4::BETA_1005a590(Matrix4& p_mat)
{ {
float local5c[4][4]; float local5c[4][4];
Matrix4 localc(local5c); Matrix4 localc(local5c);