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 operators

Browse Source
This commit is contained in:
Christian Semmler 2025-01-03 11:43:20 -07:00
parent a885c3fab3
commit 3ac775d970
2 changed files with 4 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
LEGO1/realtime/vector.h
View File

@ -46,24 +46,8 @@ class Vector2 {
inline virtual void operator*=(const Vector2& p_other); // vtable+0x60 inline virtual void operator*=(const Vector2& p_other); // vtable+0x60
inline virtual void operator*=(const float& p_value); // vtable+0x5c inline virtual void operator*=(const float& p_value); // vtable+0x5c
inline virtual void operator/=(const float& p_value); // vtable+0x68 inline virtual void operator/=(const float& p_value); // vtable+0x68
inline virtual void SetVector(const float* p_other); // vtable+0x70 inline virtual void operator=(const float* p_other); // vtable+0x70
inline virtual void SetVector(const Vector2& p_other); // vtable+0x6c inline virtual void operator=(const Vector2& p_other); // vtable+0x6c
// Note: it's unclear whether Vector3::operator= has been defined explicitly
// with the same function body as Vector2& operator=. The BETA indicates that;
// however, it makes LEGO1 0x10010be0 disappear and worsens matches in
// at least these functions:
// LEGO1 0x100109b0
// LEGO1 0x10023130
// LEGO1 0x1002de10
// LEGO1 0x10050a80
// LEGO1 0x10053980
// LEGO1 0x100648f0
// LEGO1 0x10064b50
// LEGO1 0x10084030
// LEGO1 0x100a9410
// However, defining it as in the BETA improves at least these functions:
// LEGO1 0x10042300
// SYNTHETIC: LEGO1 0x10010be0 // SYNTHETIC: LEGO1 0x10010be0
// SYNTHETIC: BETA10 0x100121e0 // SYNTHETIC: BETA10 0x100121e0
@ -72,12 +56,6 @@ class Vector2 {
// SYNTHETIC: BETA10 0x1004af40 // SYNTHETIC: BETA10 0x1004af40
// Vector4::operator= // Vector4::operator=
Vector2& operator=(const Vector2& p_other)
{
Vector2::SetVector(p_other);
return *this;
}
// FUNCTION: BETA10 0x1001d140 // FUNCTION: BETA10 0x1001d140
float& operator[](int idx) { return m_data[idx]; } float& operator[](int idx) { return m_data[idx]; }

4
LEGO1/realtime/vector2d.h
View File

@ -189,14 +189,14 @@ void Vector2::operator/=(const float& p_value)
} }
// FUNCTION: LEGO1 0x10002250 // FUNCTION: LEGO1 0x10002250
void Vector2::SetVector(const float* p_other) void Vector2::operator=(const float* p_other)
{ {
EqualsImpl(p_other); EqualsImpl(p_other);
} }
// FUNCTION: LEGO1 0x10002260 // FUNCTION: LEGO1 0x10002260
// FUNCTION: BETA10 0x100110c0 // FUNCTION: BETA10 0x100110c0
void Vector2::SetVector(const Vector2& p_other) void Vector2::operator=(const Vector2& p_other)
{ {
EqualsImpl(p_other.m_data); EqualsImpl(p_other.m_data);
} }