Skip to content

Commit 1ab1c3d

Browse files
committed
fix critical bug in GTE macros, refactor test functions, add COLL_TestLeaf_Quadblocks
1 parent af2589f commit 1ab1c3d

File tree

11 files changed

+1722
-92
lines changed

11 files changed

+1722
-92
lines changed

include/ctr/coll.h

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -105,9 +105,6 @@ typedef struct CollDCache
105105

106106
#define DCACHE_COLL (*(CollDCache*) 0x1f800108)
107107

108-
void COLL_ProjectPointToEdge(SVec3* out, const SVec3* v1, const SVec3* v2, const SVec3* point);
109-
void COLL_LoadQuadblockData_LowLOD(CollDCache* cache, Quadblock* quadblock);
110-
void COLL_LoadQuadblockData_HighLOD(CollDCache* cache, Quadblock* quadblock);
111-
void COLL_TestTriangle(CollDCache* cache, const CollVertex* v1, const CollVertex* v2, const CollVertex* v3);
108+
void COLL_TestLeaf_Quadblock(const Quadblock* quadblock, CollDCache* cache);
112109

113110
extern u32 e_ignoreCollisionDoorFlagTerrain; // 0x8008d728

include/ctr/gte.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#pragma once
22

33
#include <ctr/math.h>
4-
#include <psn00bsdk/include/inline_c.h>
4+
#include <ctr/nugget/inline_n.h>
55

66
typedef enum GTE_ROW_INDEX
77
{

include/ctr/nd.h

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,10 @@ u32 ND_RNG_Random(RNGSeed* seed);
3030

3131
/* COLL */
3232
void ND_COLL_ProjectPointToEdge(SVec3* out, const SVec3* v1, const SVec3* v2, const SVec3* point);
33-
void ND_COLL_LoadQuadblockData_LowLOD(CollDCache* cache, Quadblock* quadblock);
34-
void ND_COLL_LoadQuadblockData_HighLOD(CollDCache* cache, Quadblock* quadblock);
33+
void ND_COLL_LoadQuadblockData_LowLOD(CollDCache* cache, const Quadblock* quadblock);
34+
void ND_COLL_LoadQuadblockData_HighLOD(CollDCache* cache, const Quadblock* quadblock);
3535
void ND_COLL_CalculateTrianglePlane(const CollDCache* cache, CollVertex* v1, const CollVertex* v2, const CollVertex* v3);
3636
void ND_COLL_LoadVerticeData(CollDCache* cache);
3737
s32 ND_COLL_BarycentricTest(TestVertex* t, const CollVertex* v1, const CollVertex* v2, const CollVertex* v3);
38-
void ND_COLL_TestTriangle(CollDCache* cache, const CollVertex* v1, const CollVertex* v2, const CollVertex* v3);
38+
void ND_COLL_TestTriangle(CollDCache* cache, const CollVertex* v1, const CollVertex* v2, const CollVertex* v3);
39+
void ND_COLL_TestLeaf_Quadblock(const Quadblock* quadblock, CollDCache* cache);

0 commit comments

Comments
 (0)