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

Fix warnings in various header files, improve match

Browse Source
This commit is contained in:
jonschz 2024-12-25 15:23:36 +01:00
parent 4346d0b704
commit 0a2f071017
4 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
LEGO1/lego/sources/misc/legostorage.h
View File

@ -138,7 +138,7 @@ class LegoFile : public LegoStorage {
const char* data = p_str.GetData(); const char* data = p_str.GetData();
LegoU32 fullLength = strlen(data); LegoU32 fullLength = strlen(data);
LegoU16 limitedLength = fullLength; LegoU16 limitedLength = (LegoU16) fullLength;
Write(&limitedLength, sizeof(limitedLength)); Write(&limitedLength, sizeof(limitedLength));
Write((char*) data, (LegoS16) fullLength); Write((char*) data, (LegoS16) fullLength);

8
LEGO1/mxgeometry/mxgeometry3d.h
View File

@ -198,12 +198,12 @@ inline int UnknownMx4DPointFloat::FUN_100040a0(Vector4& p_v, float p_f)
{ {
if (m_unk0x30 == c_bit1) { if (m_unk0x30 == c_bit1) {
p_v = m_unk0x00; p_v = m_unk0x00;
p_v[3] = (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();
} }
else if (m_unk0x30 == c_bit2) { else if (m_unk0x30 == c_bit2) {
p_v = m_unk0x18; p_v = m_unk0x18;
p_v[3] = 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();
} }
else if (m_unk0x30 == (c_bit1 | c_bit2)) { else if (m_unk0x30 == (c_bit1 | c_bit2)) {
@ -225,7 +225,7 @@ inline int UnknownMx4DPointFloat::FUN_100040a0(Vector4& p_v, float p_f)
} }
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
p_v[i] = m_unk0x00[i] * a + m_unk0x18[i] * b; p_v[i] = (float) (m_unk0x00[i] * a + m_unk0x18[i] * b);
} }
} }
else { else {
@ -237,7 +237,7 @@ inline int UnknownMx4DPointFloat::FUN_100040a0(Vector4& p_v, float p_f)
b = sin(p_f * 1.570796326794895); b = sin(p_f * 1.570796326794895);
for (i = 0; i < 3; i++) { for (i = 0; i < 3; i++) {
p_v[i] = m_unk0x00[i] * a + p_v[i] * b; p_v[i] = (float) (m_unk0x00[i] * a + p_v[i] * b);
} }
} }

17
LEGO1/realtime/matrix.h
View File

@ -204,7 +204,7 @@ inline void Matrix4::ToQuaternion(Vector4& p_outQuat)
{ {
float trace = m_data[0][0] + m_data[1][1] + m_data[2][2]; float trace = m_data[0][0] + m_data[1][1] + m_data[2][2];
if (trace > 0) { if (trace > 0) {
trace = sqrt(trace + 1.0); trace = (float) sqrt(trace + 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;
@ -228,7 +228,8 @@ 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); float trace =
(float) (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;
@ -276,14 +277,14 @@ inline int Matrix4::FromQuaternion(const Vector4& p_vec)
m_data[1][2] = v24 - v13; m_data[1][2] = v24 - v13;
m_data[2][2] = 1.0f - (v18 + v17); m_data[2][2] = 1.0f - (v18 + v17);
m_data[3][0] = 0; m_data[3][0] = 0.0f;
m_data[3][1] = 0; m_data[3][1] = 0.0f;
m_data[3][2] = 0; m_data[3][2] = 0.0f;
m_data[3][3] = 1.0f; m_data[3][3] = 1.0f;
m_data[0][3] = 0; m_data[0][3] = 0.0f;
m_data[1][3] = 0; m_data[1][3] = 0.0f;
m_data[2][3] = 0; m_data[2][3] = 0.0f;
return 0; return 0;
} }

6
LEGO1/tgl/tglvector.h
View File

@ -10,15 +10,15 @@ namespace Tgl
namespace Constant namespace Constant
{ {
const float Pi = 3.14159265358979323846; const double Pi = 3.14159265358979323846;
}; };
inline float DegreesToRadians(float degrees) inline double DegreesToRadians(double degrees)
{ {
return Constant::Pi * (degrees / 180.0); return Constant::Pi * (degrees / 180.0);
} }
inline float RadiansToDegrees(float radians) inline double RadiansToDegrees(double radians)
{ {
return (radians / Constant::Pi) * 180.0; return (radians / Constant::Pi) * 180.0;
} }