AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

CScriptMazeNode: Signed fixes & cleanup

This commit is contained in:
Luke Street 2020-09-20 16:36:24 -04:00
parent eb124a9470
commit c23a047a93
2 changed files with 108 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

187
Runtime/World/CScriptMazeNode.cpp
View File

@ -9,7 +9,7 @@
namespace urde { namespace urde {
std::array<s32, 300> CScriptMazeNode::sMazeSeeds{}; std::array<s32, 300> sMazeSeeds;
CScriptMazeNode::CScriptMazeNode(TUniqueId uid, std::string_view name, const CEntityInfo& info, CScriptMazeNode::CScriptMazeNode(TUniqueId uid, std::string_view name, const CEntityInfo& info,
const zeus::CTransform& xf, bool active, s32 w1, s32 w2, s32 w3, const zeus::CTransform& xf, bool active, s32 w1, s32 w2, s32 w3,
@ -248,109 +248,97 @@ void CScriptMazeNode::SendScriptMsgs(CStateManager& mgr, EScriptObjectMessage ms
void CScriptMazeState::Reset(s32 seed) { void CScriptMazeState::Reset(s32 seed) {
x0_rand.SetSeed(seed); x0_rand.SetSeed(seed);
x94_24_initialized = false; x94_24_initialized = false;
x4_arr.fill({}); x4_cells.fill({});
std::array<size_t, 4> local_20{}; std::array<s32, 4> states{};
size_t i = skMazeColumns * skMazeRows - 1; s32 cellIdx = 0;
size_t iVar7 = 0; for (u32 i = skMazeColumns * skMazeRows - 1; i != 0;) {
while (i != 0) { u32 acc = 0;
size_t acc = 0; if (cellIdx - skMazeColumns > 0) {
if (iVar7 - 9 > 0) { auto& cell = GetCell(cellIdx - skMazeColumns);
auto& cell = x4_arr[iVar7 - skMazeColumns];
if (!cell.x0_24_ && !cell.x0_25_ && !cell.x0_26_ && !cell.x0_27_) { if (!cell.x0_24_ && !cell.x0_25_ && !cell.x0_26_ && !cell.x0_27_) {
acc = 1; states[acc++] = 0;
local_20[0] = 0;
} }
} }
size_t uVar6 = acc; if (cellIdx < x4_cells.size() - 2 && (cellIdx + 1) % skMazeColumns != 0) {
size_t iVar8 = iVar7 + 1; auto& cell = GetCell(cellIdx + 1);
if (iVar7 < 61 && iVar8 % skMazeColumns != 0) {
auto& cell = x4_arr[iVar8];
if (!cell.x0_24_ && !cell.x0_25_ && !cell.x0_26_ && !cell.x0_27_) { if (!cell.x0_24_ && !cell.x0_25_ && !cell.x0_26_ && !cell.x0_27_) {
uVar6 = acc + 1; states[acc++] = 1;
local_20[acc] = 1;
} }
} }
acc = uVar6; if (cellIdx + skMazeColumns < x4_cells.size()) {
if (iVar7 + skMazeColumns < 63) { auto& cell = GetCell(cellIdx + skMazeColumns);
auto& cell = x4_arr[iVar7 + skMazeColumns];
if (!cell.x0_24_ && !cell.x0_25_ && !cell.x0_26_ && !cell.x0_27_) { if (!cell.x0_24_ && !cell.x0_25_ && !cell.x0_26_ && !cell.x0_27_) {
acc = uVar6 + 1; states[acc++] = 2;
local_20[uVar6] = 2;
} }
} }
uVar6 = acc; if (cellIdx > 0 && cellIdx % skMazeColumns != 0) {
if (iVar7 > 0 && iVar7 % skMazeColumns != 0) { auto& cell = GetCell(cellIdx - 1);
auto& cell = x4_arr[iVar7 - 1];
if (!cell.x0_24_ && !cell.x0_25_ && !cell.x0_26_ && !cell.x0_27_) { if (!cell.x0_24_ && !cell.x0_25_ && !cell.x0_26_ && !cell.x0_27_) {
uVar6 = acc + 1; states[acc++] = 3;
local_20[acc] = 3;
} }
} }
if (uVar6 == 0) { if (acc == 0) {
bool cont; while (true) {
do { cellIdx++;
iVar7++; if (cellIdx > x4_cells.size() - 1) {
if (iVar7 > 62) { cellIdx = 0;
iVar7 = 0;
} }
cont = false; auto& cell = GetCell(cellIdx);
auto& cell = x4_arr[iVar7]; if (cell.x0_24_ || cell.x0_25_ || cell.x0_26_ || cell.x0_27_) {
if (!cell.x0_24_ && !cell.x0_25_ && !cell.x0_26_ && !cell.x0_27_) { break;
cont = true;
} }
} while (cont); };
} else { } else {
i--; i--;
s32 rand = x0_rand.Next(); s32 state = states[x0_rand.Next() % acc];
s32 iVar5 = local_20[rand - (rand / uVar6) * uVar6]; if (state == 2) {
if (iVar5 == 2) { GetCell(cellIdx).x0_26_ = true;
x4_arr[iVar7].x0_26_ = true; GetCell(cellIdx + skMazeColumns).x0_24_ = true;
x4_arr[iVar7 + skMazeColumns].x0_24_ = true; cellIdx += skMazeColumns;
iVar7 += skMazeColumns; } else if (state == 0) {
} else if (iVar5 == 0) { GetCell(cellIdx).x0_24_ = true;
x4_arr[iVar7].x0_24_ = true; GetCell(cellIdx - skMazeColumns).x0_26_ = true;
x4_arr[iVar7 - skMazeColumns].x0_26_ = true; cellIdx -= skMazeColumns;
iVar7 -= skMazeColumns; } else if (state == 1) {
} else if (iVar5 == 1) { GetCell(cellIdx).x0_25_ = true;
x4_arr[iVar7].x0_25_ = true; GetCell(cellIdx + 1).x0_27_ = true;
x4_arr[iVar7 + 1].x0_27_ = true; cellIdx++;
iVar7++; } else if (state == 3) {
} else if (iVar5 == 3) { GetCell(cellIdx).x0_27_ = true;
x4_arr[iVar7].x0_27_ = true; GetCell(cellIdx - 1).x0_25_ = true;
x4_arr[iVar7 - 1].x0_25_ = true; cellIdx--;
iVar7--;
} }
} }
} }
} }
void CScriptMazeState::Initialize() { void CScriptMazeState::Initialize() {
std::array<size_t, 66> arr{}; std::array<s32, skMazeRows * skMazeColumns> arr{};
arr[0] = x84_ + x88_ * skMazeColumns; arr[0] = x84_startCol + x88_startRow * skMazeColumns;
x4_arr[arr[0]].x1_26_ = true; GetCell(arr[0]).x1_26_ = true;
size_t i = 1; s32 i = 1;
while (arr[0] != x8c_ + x90_ * skMazeColumns) { while (arr[0] != x8c_endCol + x90_endRow * skMazeColumns) {
if (x4_arr[arr[0]].x0_24_) { if (GetCell(arr[0]).x0_24_) {
if (!x4_arr[arr[0] - skMazeColumns].x1_26_) { if (!GetCell(arr[0] - skMazeColumns).x1_26_) {
arr[i] = arr[0] - skMazeColumns; arr[i] = arr[0] - skMazeColumns;
i++; i++;
} }
} }
if (x4_arr[arr[0]].x0_25_) { if (GetCell(arr[0]).x0_25_) {
if (!x4_arr[arr[0] + 1].x1_26_) { if (!GetCell(arr[0] + 1).x1_26_) {
arr[i] = arr[0] + 1; arr[i] = arr[0] + 1;
i++; i++;
} }
} }
if (x4_arr[arr[0]].x0_26_) { if (GetCell(arr[0]).x0_26_) {
if (!x4_arr[arr[0] + skMazeColumns].x1_26_) { if (!GetCell(arr[0] + skMazeColumns).x1_26_) {
arr[i] = arr[0] + skMazeColumns; arr[i] = arr[0] + skMazeColumns;
i++; i++;
} }
} }
if (x4_arr[arr[0]].x0_27_) { if (GetCell(arr[0]).x0_27_) {
if (!x4_arr[arr[0] - 1].x1_26_) { if (!GetCell(arr[0] - 1).x1_26_) {
arr[i] = arr[0] - 1; arr[i] = arr[0] - 1;
i++; i++;
} }
@ -359,14 +347,14 @@ void CScriptMazeState::Initialize() {
i--; i--;
} }
arr[0] = arr[i - 1]; arr[0] = arr[i - 1];
x4_arr[arr[0]].x1_26_ = true; GetCell(arr[0]).x1_26_ = true;
} }
size_t* v = &arr[i]; s32* v = &arr[i];
while (i != 0) { while (i != 0) {
i--; i--;
v--; v--;
if (x4_arr[*v].x1_26_) { if (GetCell(*v).x1_26_) {
x4_arr[*v].x1_25_ = true; GetCell(*v).x1_25_ = true;
} }
} }
x94_24_initialized = true; x94_24_initialized = true;
@ -387,63 +375,62 @@ void CScriptMazeState::sub_802899c8() {
s32 rand4 = GetRandom(13); s32 rand4 = GetRandom(13);
s32 rand5 = GetRandom(29); s32 rand5 = GetRandom(29);
u32 uVar10 = -1; u32 state = -1;
s32 idx = 0; s32 idx = 0;
s32 prevCol = x84_; s32 prevCol = x84_startCol;
s32 prevRow = x88_; s32 prevRow = x88_startRow;
s32 col = x84_; s32 col = x84_startCol;
s32 row = x88_; s32 row = x88_startRow;
s32 nextCol; while (col != x8c_endCol || row != x90_endRow) {
while (col != x8c_ || row != x90_) {
if (idx == rand1 || idx == rand2 || idx == rand3) { if (idx == rand1 || idx == rand2 || idx == rand3) {
if (uVar10 == 2) { if (state == 2) {
GetCell(col, row).x0_28_ = true; GetCell(col, row).x0_28_ = true;
GetCell(prevCol, prevRow).x0_30_ = true; GetCell(prevCol, prevRow).x0_30_ = true;
} else if (uVar10 == 0) { } else if (state == 0) {
GetCell(col, row).x0_30_ = true; GetCell(col, row).x0_30_ = true;
GetCell(prevCol, prevRow).x0_28_ = true; GetCell(prevCol, prevRow).x0_28_ = true;
} else if (uVar10 == 1) { } else if (state == 1) {
GetCell(col, row).x0_31_ = true; GetCell(col, row).x0_31_ = true;
GetCell(prevCol, prevRow).x0_29_ = true; GetCell(prevCol, prevRow).x0_29_ = true;
} else if (uVar10 == 3) { } else if (state == 3) {
GetCell(col, row).x0_29_ = true; GetCell(col, row).x0_29_ = true;
GetCell(prevCol, prevRow).x0_31_ = true; GetCell(prevCol, prevRow).x0_31_ = true;
} }
} }
nextCol = col; s32 nextCol = col;
s32 nextRow; s32 nextRow = -1;
if (row < 1 || uVar10 == 2 || !GetCell(col, row).x0_24_ || !GetCell(col, row - 1).x1_25_) { if (row < 1 || state == 2 || !GetCell(col, row).x0_24_ || !GetCell(col, row - 1).x1_25_) {
if (row < 6 && uVar10 != 0 && GetCell(col, row).x0_26_ && GetCell(col, row + 1).x1_25_) { if (row < 6 && state != 0 && GetCell(col, row).x0_26_ && GetCell(col, row + 1).x1_25_) {
uVar10 = 2; state = 2;
nextRow = row + 1; nextRow = row + 1;
} else { } else {
nextRow = row; nextRow = row;
if (col < 1 || uVar10 == 1 || !GetCell(col, row).x0_27_ || !x4_arr[(col + row * skMazeColumns) - 1].x1_25_) { if (col < 1 || state == 1 || !GetCell(col, row).x0_27_ || !GetCell((col + row * skMazeColumns) - 1).x1_25_) {
if (col > skMazeRows) { if (col > skMazeRows) {
return; return;
} }
if (uVar10 == 3) { if (state == 3) {
return; return;
} }
s32 iVar4_ = col + row * skMazeColumns; s32 iVar4_ = col + row * skMazeColumns;
if (!x4_arr[iVar4_].x0_25_) { if (!GetCell(iVar4_).x0_25_) {
return; return;
} }
if (!x4_arr[iVar4_ + 1].x1_25_) { if (!GetCell(iVar4_ + 1).x1_25_) {
return; return;
} }
uVar10 = 1; state = 1;
nextCol = col + 1; nextCol = col + 1;
} else { } else {
uVar10 = 3; state = 3;
nextCol = col - 1; nextCol = col - 1;
} }
} }
} else { } else {
uVar10 = 0; state = 0;
nextRow = row - 1; nextRow = row - 1;
} }
if (idx == rand4 || idx == rand5) { if (idx == rand4 || idx == rand5) {
@ -456,16 +443,16 @@ void CScriptMazeState::sub_802899c8() {
} else { } else {
auto& cell = GetCell(col, row); auto& cell = GetCell(col, row);
cell.x1_24_ = true; cell.x1_24_ = true;
if (uVar10 == 2) { if (state == 2) {
GetCell(nextCol, nextRow).x0_24_ = false; GetCell(nextCol, nextRow).x0_24_ = false;
cell.x0_26_ = false; cell.x0_26_ = false;
} else if (uVar10 == 0) { } else if (state == 0) {
GetCell(nextCol, nextRow).x0_26_ = false; GetCell(nextCol, nextRow).x0_26_ = false;
cell.x0_24_ = false; cell.x0_24_ = false;
} else if (uVar10 == 1) { } else if (state == 1) {
GetCell(nextCol, nextRow).x0_27_ = false; GetCell(nextCol, nextRow).x0_27_ = false;
cell.x0_25_ = false; cell.x0_25_ = false;
} else if (uVar10 == 3) { } else if (state == 3) {
GetCell(nextCol, nextRow).x0_25_ = false; GetCell(nextCol, nextRow).x0_25_ = false;
cell.x0_27_ = false; cell.x0_27_ = false;
} }

33
Runtime/World/CScriptMazeNode.hpp
View File

@ -1,6 +1,7 @@
#pragma once #pragma once
#include <array> #include <array>
#include <cassert>
#include <string_view> #include <string_view>
#include "Runtime/CRandom16.hpp" #include "Runtime/CRandom16.hpp"
@ -10,8 +11,8 @@
#include <zeus/CVector3f.hpp> #include <zeus/CVector3f.hpp>
namespace urde { namespace urde {
constexpr u32 skMazeRows = 7; constexpr s32 skMazeRows = 7;
constexpr u32 skMazeColumns = 9; constexpr s32 skMazeColumns = 9;
struct CScriptMazeStateCell { struct CScriptMazeStateCell {
bool x0_24_ : 1 = false; bool x0_24_ : 1 = false;
@ -29,27 +30,35 @@ struct CScriptMazeStateCell {
class CScriptMazeState { class CScriptMazeState {
CRandom16 x0_rand{0}; CRandom16 x0_rand{0};
std::array<CScriptMazeStateCell, skMazeRows * skMazeColumns> x4_arr{}; std::array<CScriptMazeStateCell, skMazeRows * skMazeColumns> x4_cells{};
s32 x84_; s32 x84_startCol;
s32 x88_; s32 x88_startRow;
s32 x8c_; s32 x8c_endCol;
s32 x90_; s32 x90_endRow;
bool x94_24_initialized : 1 = false; bool x94_24_initialized : 1 = false;
public: public:
CScriptMazeState(s32 w1, s32 w2, s32 w3, s32 w4) : x84_(w1), x88_(w2), x8c_(w3), x90_(w4) {} CScriptMazeState(s32 w1, s32 w2, s32 w3, s32 w4) : x84_startCol(w1), x88_startRow(w2), x8c_endCol(w3), x90_endRow(w4) {}
void Reset(s32 seed); void Reset(s32 seed);
void Initialize(); void Initialize();
void sub_802899c8(); void sub_802899c8();
[[nodiscard]] CScriptMazeStateCell& GetCell(u32 col, u32 row) { return x4_arr[col + row * skMazeColumns]; } [[nodiscard]] CScriptMazeStateCell& GetCell(u32 col, u32 row) {
[[nodiscard]] const CScriptMazeStateCell& GetCell(u32 col, u32 row) const { #ifndef NDEBUG
return x4_arr[col + row * skMazeColumns]; assert(col < skMazeColumns);
assert(row < skMazeRows);
#endif
return x4_cells[col + row * skMazeColumns];
}
[[nodiscard]] CScriptMazeStateCell& GetCell(u32 idx) {
#ifndef NDEBUG
assert(idx < x4_cells.size());
#endif
return x4_cells[idx];
} }
}; };
class CScriptMazeNode : public CActor { class CScriptMazeNode : public CActor {
static std::array<s32, 300> sMazeSeeds;
s32 xe8_col; s32 xe8_col;
s32 xec_row; s32 xec_row;
s32 xf0_; s32 xf0_;