Implement/match LegoPathBoundary::FUN_100575b0 (#939)

This commit is contained in:
Christian Semmler
2024-05-19 15:41:07 -04:00
committed by GitHub
parent c8a0e4cf8d
commit fb16b2c896
9 changed files with 79 additions and 43 deletions

View File

@@ -23,12 +23,12 @@ LegoEdge::~LegoEdge()
}
// FUNCTION: LEGO1 0x1009a4d0
LegoEdge* LegoEdge::GetClockwiseEdge(LegoWEEdge* p_face)
LegoEdge* LegoEdge::GetClockwiseEdge(LegoWEEdge& p_face)
{
if (p_face == m_faceA) {
if (&p_face == m_faceA) {
return m_cwA;
}
else if (p_face == m_faceB) {
else if (&p_face == m_faceB) {
return m_cwB;
}
else {
@@ -37,12 +37,12 @@ LegoEdge* LegoEdge::GetClockwiseEdge(LegoWEEdge* p_face)
}
// FUNCTION: LEGO1 0x1009a4f0
LegoEdge* LegoEdge::GetCounterclockwiseEdge(LegoWEEdge* p_face)
LegoEdge* LegoEdge::GetCounterclockwiseEdge(LegoWEEdge& p_face)
{
if (p_face == m_faceA) {
if (&p_face == m_faceA) {
return m_ccwA;
}
else if (p_face == m_faceB) {
else if (&p_face == m_faceB) {
return m_ccwB;
}
else {
@@ -51,13 +51,13 @@ LegoEdge* LegoEdge::GetCounterclockwiseEdge(LegoWEEdge* p_face)
}
// FUNCTION: LEGO1 0x1009a510
Vector3* LegoEdge::GetOpposingPoint(LegoWEEdge* p_face)
Vector3* LegoEdge::GetOpposingPoint(LegoWEEdge& p_face)
{
return p_face == m_faceA ? m_pointB : m_pointA;
return &p_face == m_faceA ? m_pointB : m_pointA;
}
// FUNCTION: LEGO1 0x1009a530
Vector3* LegoEdge::GetPoint(LegoWEEdge* p_face)
Vector3* LegoEdge::CCWVertex(LegoWEEdge& p_face)
{
return p_face == m_faceB ? m_pointB : m_pointA;
return &p_face == m_faceB ? m_pointB : m_pointA;
}

View File

@@ -12,12 +12,12 @@ struct LegoEdge {
LegoEdge();
virtual ~LegoEdge(); // vtable+0x00
LegoEdge* GetClockwiseEdge(LegoWEEdge* face);
LegoEdge* GetCounterclockwiseEdge(LegoWEEdge* face);
Vector3* GetOpposingPoint(LegoWEEdge* face);
Vector3* GetPoint(LegoWEEdge* face);
LegoEdge* GetClockwiseEdge(LegoWEEdge& p_face);
LegoEdge* GetCounterclockwiseEdge(LegoWEEdge& p_face);
Vector3* GetOpposingPoint(LegoWEEdge& p_face);
Vector3* CCWVertex(LegoWEEdge& p_face);
LegoResult FUN_1002ddc0(LegoWEEdge* p_face, Vector3& p_point);
LegoResult FUN_1002ddc0(LegoWEEdge& p_face, Vector3& p_point);
// SYNTHETIC: LEGO1 0x1009a4a0
// LegoEdge::`scalar deleting destructor'

View File

@@ -27,12 +27,12 @@ public:
{
m_unk0x00 = NULL;
m_unk0x04 = 0;
m_unk0x08 = 0;
m_unk0x08 = 0.0f;
}
LegoPathStruct* m_unk0x00; // 0x00
undefined4 m_unk0x04; // 0x04
undefined4 m_unk0x08; // 0x08
float m_unk0x08; // 0x08
};
LegoWEGEdge();