porting data types

Author: mateusfavarin

include/ctr/coll.h

@@ -41,5 +41,67 @@ typedef struct TestVertex
     SVec3 interpolationPoint;
 } TestVertex;
 
+typedef struct DriverQuadblockCollData
+{
+    SVec3 driverPos;
+    s16 driverHitRadius;
+    s32 driverHitRadiusSquared;
+    SVec3 driverNextPos;
+    u16 collFlags;
+    u16 searchFlags;
+    s16 unk0;
+    u32 skipCollNoQuadFlagsMatch;
+} DriverQuadblockCollData;
+
+typedef union CollInputData
+{
+    DriverQuadblockCollData quadblock;
+} CollInputData;
+
+typedef struct CollDCache
+{
+    SVec3 inputNextPos;
+    s16 inputHitRadius;
+    s32 inputHitRadiusSquared;
+    s16 unk0;
+    s16 unk1;
+    CollInputData collInput;
+    MeshInfo* meshInfo;
+    BoundingBox bbox;
+    s16 numVerticesTested;
+    s16 numTrianglesTouched;
+    s16 unk2;
+    s16 numInstancesCollided;
+    u32 unk3;
+    BSPNode* bspNodes;
+    TestVertex collIntersection;
+    u8 unk4;
+    u8 currTriangleIndex;
+    Quadblock* currQuadblock;
+    SVec3 collPos;
+    u16 normalDominantAxis_TriCollided;
+    SVec3 normalTriCollided;
+    s16 unk5;
+    SVec3 interpolationPoint;
+    u8 barycentricTest;
+    u8 collidedTriangleIndex;
+    Quadblock* collidedQuadblock;
+    s32 speedScale;
+    u8 unk6[0x44];
+    Vertex* collidedVertices[NUM_VERTICES_TRIANGLE];
+    CollVertex* currTestVertices[NUM_VERTICES_TRIANGLE];
+    SVec3 distInterpolationIntersection;
+    s16 unk7;
+    u16 quadblockThirdIndex;
+    u16 quadblockFouthIndex;
+    CollVertex quadblockCollVertices[NUM_VERTICES_QUADBLOCK];
+    u32 stepFlags;
+    s16 normalScale;
+    u8 normalBitshift;
+    u8 lodShift;
+} CollDCache;
+
+#define DCACHE_COLL (*(CollDCache*) 0x1f800000)
+
 void COLL_ProjectPointToEdge(SVec3* out, const SVec3* v1, const SVec3* v2, const SVec3* point);
 s32 COLL_BarycentricTest(TestVertex* t, const CollVertex* v1, const CollVertex* v2, const CollVertex* v3);

include/ctr/lev.h

@@ -2,6 +2,10 @@
 
 #include <ctr/macros.h>
 #include <ctr/math.h>
+#include <ctr/prim.h>
+
+#define NUM_VERTICES_QUADBLOCK 9
+#define NUM_VERTICES_TRIANGLE 3
 
 typedef union Color
 {
@@ -15,10 +19,98 @@ typedef union Color
     u32 color;
 } Color;
 
+typedef struct TextureLayout
+{
+    UV uv0;
+    CLUT clut;
+    UV uv1;
+    PolyTexpage texpage;
+    UV uv2;
+    UV uv3;
+} TextureLayout;
+
+typedef struct TextureGroup
+{
+	TextureLayout far;
+	TextureLayout middle;
+	TextureLayout near;
+	TextureLayout mosaic;
+} TextureGroup;
+
 typedef struct Vertex
 {
     SVec3 pos;
     u16 flags;
     Color colorHi;
     Color colorLo;
-} Vertex;
+} Vertex;
+
+typedef struct VisibleSet
+{
+	u32* visibleBSPNodes;
+	u32* visibleQuadblocks;
+	u32* visibleInstances;
+	u32* visibleExtra;
+} VisibleSet;
+
+typedef struct Quadblock
+{
+	u16 index[NUM_VERTICES_QUADBLOCK]; // 0x0
+	u16 flags; // 0x12
+	u32 drawOrderLow; // 0x14
+	u32 drawOrderHigh; // 0x18
+	u32 offMidTextures[4]; // 0x1C
+	BoundingBox bbox; // 0x2C
+	u8 terrain; // 0x38
+	u8 weatherIntensity; // 0x39
+	u8 weatherVanishRate; // 0x3A
+	s8 speedImpact; // 0x3B
+	u16 id; // 0x3C
+	u8 checkpointIndex; // 0x3E
+	u8 triNormalVecBitshift; // 0x3F
+	u32 offLowTexture; // 0x40
+	VisibleSet visibleSet; // 0x44
+	u16 triNormalVecDividend[NUM_VERTICES_QUADBLOCK + 1]; // 0x48
+} Quadblock;
+
+typedef struct BSPBranch
+{
+	u16 flags; // 0x0
+	u16 id; // 0x2
+	BoundingBox bbox; // 0x4
+	SVec3 axis; // 0x10
+	u16 likelyPadding; // 0x16
+	u16 leftChildID; // 0x18
+	u16 rightChildID; // 0x1A
+	u16 unk1; // 0x1C
+	u16 unk2; // 0x1E
+} BSPBranch;
+
+typedef struct BSPLeaf
+{
+	u16 flags; // 0x0
+	u16 id; // 0x2
+	BoundingBox bbox; // 0x4
+	u32 likelyPadding; // 0x10
+	u32 offHitbox; // 0x14
+	u32 numQuads; // 0x18
+	Quadblock* quadblocks; // 0x1C
+} BSPLeaf;
+
+typedef union BSPNode
+{
+    BSPBranch branch;
+    BSPLeaf leaf;
+} BSPNode;
+
+typedef struct MeshInfo
+{
+	u32 numQuadblocks; // 0x0
+	u32 numVertices; // 0x4
+	u32 unk1; // 0x8
+	Quadblock* quadblocks; // 0xC
+	Vertex* vertices; // 0x10
+	u32 unk2; // 0x14
+	BSPNode* bspNodes; // 0x18
+	u32 numBSPNodes; // 0x1C
+} MeshInfo;

include/ctr/math.h

@@ -69,11 +69,18 @@ typedef union Vec4
 	s32 v[4];
 } Vec4;
 
-typedef struct Matrix {
+typedef struct Matrix
+{
 	s16 m[3][3];
 	Vec3 t;
 } Matrix;
 
+typedef struct BoundingBox
+{
+	SVec3 min;
+	SVec3 max;
+} BoundingBox;
+
 typedef struct TrigTable
 {
     s16 sin;

include/ctr/prim.h

@@ -2,13 +2,13 @@
 
 #include <ctr/macros.h>
 
-enum VertexCount
+typedef enum VertexCount
 {
     VertexCount_Point = 1,
     VertexCount_Line = 2,
     VertexCount_Tri = 3,
     VertexCount_Quad = 4,
-};
+} VertexCount;
 
 typedef union Tag
 {
@@ -41,18 +41,18 @@ typedef union Texpage
     u32 self;
 } Texpage;
 
-typedef struct
+typedef struct TPage
 {
     Tag tag;
     Texpage texpage;
 } TPage;
 
-enum RenderCode
+typedef enum RenderCode
 {
     RenderCode_Polygon = 1,
     RenderCode_Line = 2,
     RenderCode_Rectangle = 3,
-};
+} RenderCode;
 
 typedef union PrimCode
 {
@@ -100,8 +100,6 @@ typedef union ColorCode
     u32 self;
 } ColorCode;
 
-typedef ColorCode Color;
-
 #define MakeColorCode(red, green, blue, renderCode) (ColorCode) { .r = red, .g = green, .b = blue, .code = renderCode }
 #define MakeColor(red, green, blue) (Color) { .r = red, .g = green, .b = blue }
 

rewrite/src/exe/coll.c

@@ -37,6 +37,8 @@ void COLL_ProjectPointToEdge(SVec3* out, const SVec3* v1, const SVec3* v2, const
     out->z = coords.z;
     TEST_COLL_ProjectPointToEdge(v1, v2, point, out);
 #ifdef TEST_COLL_IMPL
+    /* This is a hand written assembly function that breaks the ABI,
+    and some callers expect the argument registers to be untouched*/
     __asm__ volatile("move $a0, %0" : : "r"((u32)out));
     __asm__ volatile("move $a1, %0" : : "r"((u32)v1));
     __asm__ volatile("move $a2, %0" : : "r"((u32)v2));