Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use virtual operators in vector.h #1287

Merged
merged 2 commits into from
Dec 27, 2024
Merged

Use virtual operators in vector.h #1287

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ddaf80d
Use virtual operators in vector.h
foxtacles Dec 27, 2024
2450f62
Remove public
foxtacles Dec 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 9 additions & 24 deletions LEGO1/realtime/vector.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,35 +121,33 @@ class Vector2 {
return -1;
} // vtable+0x44

private:
// FUNCTION: LEGO1 0x100021c0
virtual void Add(float p_value) { AddImpl(p_value); } // vtable+0x50
virtual void operator+=(float p_value) { AddImpl(p_value); } // vtable+0x50

// FUNCTION: LEGO1 0x100021d0
virtual void Add(const float* p_other) { AddImpl(p_other); } // vtable+0x4c
virtual void operator+=(const float* p_other) { AddImpl(p_other); } // vtable+0x4c

// FUNCTION: LEGO1 0x100021e0
virtual void Add(const Vector2& p_other) { AddImpl(p_other.m_data); } // vtable+0x48
virtual void operator+=(const Vector2& p_other) { AddImpl(p_other.m_data); } // vtable+0x48

// FUNCTION: LEGO1 0x100021f0
virtual void Sub(const float* p_other) { SubImpl(p_other); } // vtable+0x58
virtual void operator-=(const float* p_other) { SubImpl(p_other); } // vtable+0x58

// FUNCTION: LEGO1 0x10002200
virtual void Sub(const Vector2& p_other) { SubImpl(p_other.m_data); } // vtable+0x54
virtual void operator-=(const Vector2& p_other) { SubImpl(p_other.m_data); } // vtable+0x54

// FUNCTION: LEGO1 0x10002210
virtual void Mul(const float* p_other) { MulImpl(p_other); } // vtable+0x64
virtual void operator*=(const float* p_other) { MulImpl(p_other); } // vtable+0x64

// FUNCTION: LEGO1 0x10002220
virtual void Mul(const Vector2& p_other) { MulImpl(p_other.m_data); } // vtable+0x60
virtual void operator*=(const Vector2& p_other) { MulImpl(p_other.m_data); } // vtable+0x60

// FUNCTION: LEGO1 0x10002230
virtual void Mul(const float& p_value) { MulImpl(p_value); } // vtable+0x5c
virtual void operator*=(const float& p_value) { MulImpl(p_value); } // vtable+0x5c

// FUNCTION: LEGO1 0x10002240
virtual void Div(const float& p_value) { DivImpl(p_value); } // vtable+0x68
virtual void operator/=(const float& p_value) { DivImpl(p_value); } // vtable+0x68

public:
// FUNCTION: LEGO1 0x10002250
virtual void SetVector(const float* p_other) { EqualsImpl(p_other); } // vtable+0x70

Expand Down Expand Up @@ -192,19 +190,6 @@ class Vector2 {
// FUNCTION: BETA10 0x1001d170
const float& operator[](int idx) const { return m_data[idx]; }

void operator+=(float p_value) { Add(p_value); }
void operator+=(const float* p_other) { Add(p_other); }
void operator+=(const Vector2& p_other) { Add(p_other); }

void operator-=(const float* p_other) { Sub(p_other); }
void operator-=(const Vector2& p_other) { Sub(p_other); }

void operator*=(const float* p_other) { Mul(p_other); }
void operator*=(const Vector2& p_other) { Mul(p_other); }
void operator*=(const float& p_value) { Mul(p_value); }

void operator/=(const float& p_value) { Div(p_value); }

protected:
float* m_data; // 0x04
};
Expand Down
Loading