Skip to content

fix critical bug in GTE macros, refactor test functions, add one more func #233

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

Merged
mateusfavarin merged 3 commits into from
Sep 28, 2025
Merged

fix critical bug in GTE macros, refactor test functions, add one more func #233

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1ab1c3d
fix critical bug in GTE macros, refactor test functions, add COLL_Tes…
mateusfavarin Sep 28, 2025
6c68cb3
address code review
mateusfavarin Sep 28, 2025
8a925a5
add missing defs
mateusfavarin Sep 28, 2025
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
5 changes: 1 addition & 4 deletions include/ctr/coll.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,9 +105,6 @@ typedef struct CollDCache

#define DCACHE_COLL (*(CollDCache*) 0x1f800108)
Copy link
Contributor

@TheUbMunster TheUbMunster Sep 28, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there no memory overlap behavior for the scratchpad within a namespace (i.e., we had unions in the OG scratchpad because several namespaces used it), but I thought even within a single namespace (e.g., coll), that there was still memory usage overlap.

Copy link
Collaborator Author

@mateusfavarin mateusfavarin Sep 28, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I haven't seen any overlap yet


void COLL_ProjectPointToEdge(SVec3* out, const SVec3* v1, const SVec3* v2, const SVec3* point);
void COLL_LoadQuadblockData_LowLOD(CollDCache* cache, Quadblock* quadblock);
void COLL_LoadQuadblockData_HighLOD(CollDCache* cache, Quadblock* quadblock);
void COLL_TestTriangle(CollDCache* cache, const CollVertex* v1, const CollVertex* v2, const CollVertex* v3);
void COLL_TestLeaf_Quadblock(const Quadblock* quadblock, CollDCache* cache);

extern u32 e_ignoreCollisionDoorFlagTerrain; // 0x8008d728
2 changes: 1 addition & 1 deletion include/ctr/gte.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#pragma once

#include <ctr/math.h>
#include <psn00bsdk/include/inline_c.h>
#include <ctr/nugget/inline_n.h>
Copy link
Contributor

@TheUbMunster TheUbMunster Sep 28, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are you more sure that this doesn't have bugs in it like psn00bsdk? If it does have bugs, will we have to manually vet gte instructions ourselves?

Copy link
Collaborator Author

@mateusfavarin mateusfavarin Sep 28, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This one doesn't, yea


typedef enum GTE_ROW_INDEX
{
Expand Down
14 changes: 14 additions & 0 deletions include/ctr/macros.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,20 @@ typedef int16_t s16;
typedef uint8_t u8;
typedef int8_t s8;

#define U32_MAX UINT32_MAX
#define S32_MAX INT32_MAX
#define U16_MAX UINT16_MAX
#define S16_MAX INT16_MAX
#define U8_MAX UINT8_MAX
#define S8_MAX INT8_MAX

#define U32_MIN UINT32_MIN
#define S32_MIN INT32_MIN
#define U16_MIN UINT16_MIN
#define S16_MIN INT16_MIN
#define U8_MIN UINT8_MIN
#define S8_MIN INT8_MIN

#define AugReview 805
#define SepReview 903
#define UsaRetail 926
Expand Down
7 changes: 4 additions & 3 deletions include/ctr/nd.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,10 @@ u32 ND_RNG_Random(RNGSeed* seed);

/* COLL */
void ND_COLL_ProjectPointToEdge(SVec3* out, const SVec3* v1, const SVec3* v2, const SVec3* point);
void ND_COLL_LoadQuadblockData_LowLOD(CollDCache* cache, Quadblock* quadblock);
void ND_COLL_LoadQuadblockData_HighLOD(CollDCache* cache, Quadblock* quadblock);
void ND_COLL_LoadQuadblockData_LowLOD(CollDCache* cache, const Quadblock* quadblock);
void ND_COLL_LoadQuadblockData_HighLOD(CollDCache* cache, const Quadblock* quadblock);
void ND_COLL_CalculateTrianglePlane(const CollDCache* cache, CollVertex* v1, const CollVertex* v2, const CollVertex* v3);
void ND_COLL_LoadVerticeData(CollDCache* cache);
s32 ND_COLL_BarycentricTest(TestVertex* t, const CollVertex* v1, const CollVertex* v2, const CollVertex* v3);
void ND_COLL_TestTriangle(CollDCache* cache, const CollVertex* v1, const CollVertex* v2, const CollVertex* v3);
void ND_COLL_TestTriangle(CollDCache* cache, const CollVertex* v1, const CollVertex* v2, const CollVertex* v3);
void ND_COLL_TestLeaf_Quadblock(const Quadblock* quadblock, CollDCache* cache);
Loading