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

MxRegion: initial implementation (#218)

Browse Source 
* MxRegion structures

* MxRegion structures

* Remove junk

* Refactor

* WIP

* Use MxRect32 ctor

* Refactor

* Add MxSize32, match MxRegion ctor

* Add two template annotations

* Fix missing instructions

* Fix another bug

* Refactor

* Add GetPoint

* Implement/match MxRegionTopBottom::MxRegionTopBottom

* Implement/match more functions

* More implementation

* Don't expose internal match

* Fix indent

* Add template annotations

* Implement remaining functions

* Fix comment

* Match loops

* Simplify function

* Merge

* Remove junk

* Format

* Format

* match MxRegion::vtable1c

* revert vtable1c match-hack

This reverts commit 7b88625988.

---------

Co-authored-by: Ramen2X <64166386+Ramen2X@users.noreply.github.com>
This commit is contained in:
Christian Semmler
2023-10-31 11:30:13 -04:00
committed by GitHub
parent cb286520e5
commit 9ac9fe2761
8 changed files with 393 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
LEGO1/mxregion.h
View File

@@ -4,6 +4,35 @@
#include "decomp.h"
#include "mxcore.h"
#include "mxrect32.h"
#include "mxregionlist.h"
// SIZE 0x0c
struct MxRegionTopBottom {
MxRegionTopBottom(MxRect32& p_rect);
MxRegionTopBottom(MxS32 m_top, MxS32 m_bottom);
MxRegionTopBottom* Clone();
void FUN_100c5280(MxS32 p_left, MxS32 p_right);
MxBool FUN_100c57b0(MxRect32& p_rect);
MxS32 m_top;
MxS32 m_bottom;
MxRegionLeftRightList* m_leftRightList;
};
// SIZE 0x08
struct MxRegionLeftRight {
MxRegionLeftRight(MxS32 p_left, MxS32 p_right)
{
m_left = p_left;
m_right = p_right;
}
MxRegionLeftRight* Clone() { return new MxRegionLeftRight(m_left, m_right); }
MxS32 m_left;
MxS32 m_right;
};
// VTABLE 0x100dcae8
// SIZE 0x1c
@@ -14,15 +43,13 @@ public:
virtual void Reset();
virtual void vtable18(MxRect32& p_rect);
virtual void vtable1c();
virtual MxBool vtable1c(MxRect32& p_rect);
virtual MxBool vtable20();
inline MxRect32& GetRect() { return this->m_rect; }
private:
// A container (probably MxList) holding MxRect32
// MxList<MxRect32*> *m_rects;
undefined4 m_unk08;
MxRegionList* m_list;
MxRect32 m_rect;
};