load vertice data decompiled

Author: mateusfavarin

include/ctr/coll.h

@@ -27,7 +27,7 @@ typedef struct CollVertex
 {
     SVec3 pos;
     u16 normalDominantAxis;
-    Vertex* levVertex;
+    const Vertex* levVertex;
     SVec3 triNormal;
     u16 planeDist;
 } CollVertex;
@@ -93,7 +93,7 @@ typedef struct CollDCache
     SVec3 distInterpolationIntersection;
     s16 unk7;
     u16 quadblockThirdIndex;
-    u16 quadblockFouthIndex;
+    u16 quadblockFourthIndex;
     CollVertex quadblockCollVertices[NUM_VERTICES_QUADBLOCK];
     u32 stepFlags;
     s16 normalScale;
@@ -104,4 +104,5 @@ typedef struct CollDCache
 #define DCACHE_COLL (*(CollDCache*) 0x1f800000)
 
 void COLL_ProjectPointToEdge(SVec3* out, const SVec3* v1, const SVec3* v2, const SVec3* point);
+void COLL_LoadVerticeData(CollDCache* cache);
 s32 COLL_BarycentricTest(TestVertex* t, const CollVertex* v1, const CollVertex* v2, const CollVertex* v3);

include/ctr/nd.h

@@ -29,4 +29,5 @@ 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_LoadVerticeData(CollDCache* cache);
 s32 ND_COLL_BarycentricTest(TestVertex* t, const CollVertex* v1, const CollVertex* v2, const CollVertex* v3);

include/ctr/test.h

@@ -66,8 +66,10 @@ force_inline void FlushCache()
 
 #ifdef TEST_COLL_IMPL
     void TEST_COLL_ProjectPointToEdge(const SVec3* v1, const SVec3* v2, const SVec3* point, const SVec3* ret);
+    void TEST_COLL_LoadVerticeData(CollDCache* cache);
     void TEST_COLL_BarycentricTest(TestVertex* t, const CollVertex* v1, const CollVertex* v2, const CollVertex* v3, const SVec3* pos, s32 ret);
 #else
     #define TEST_COLL_ProjectPointToEdge(out, v1, v2, point)
+    #define TEST_COLL_LoadVerticeData(cache)
     #define TEST_COLL_BarycentricTest(t, v1, v2, v3, pos, ret)
 #endif

rewrite/src/exe/coll.c

@@ -36,14 +36,33 @@ void COLL_ProjectPointToEdge(SVec3* out, const SVec3* v1, const SVec3* v2, const
     out->y = coords.y;
     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));
     __asm__ volatile("move $a3, %0" : : "r"((u32)point));
-#endif
+}
+
+/* Address: 0x8001f7f0 */
+void COLL_LoadVerticeData(CollDCache* cache)
+{
+    const Quadblock* quadblock = cache->currQuadblock;
+    const Vertex* vertices = cache->meshInfo->vertices;
+    for (u32 i = 0; i < NUM_VERTICES_QUADBLOCK; i++)
+    {
+        u16 index = quadblock->index[i];
+        const Vertex* vertex = &vertices[index];
+        cache->quadblockCollVertices[i].pos = vertex->pos;
+        cache->quadblockCollVertices[i].levVertex = vertex;
+    }
+    cache->quadblockThirdIndex = quadblock->index[2];
+    cache->quadblockFourthIndex = quadblock->index[3];
+    TEST_COLL_LoadVerticeData(cache);
+    /* 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)cache));
+    __asm__ volatile("move $t9, %0" : : "r"((u32)quadblock));
 }
 
 /* Address: 0x8001f928 */

rewrite/src/tests/test.c

@@ -31,6 +31,7 @@ FunctionPatch s_functions[] =
     TEST_FUNC(RNG_Random),
     TEST_FUNC(COLL_ProjectPointToEdge),
     TEST_FUNC(COLL_BarycentricTest),
+    TEST_FUNC(COLL_LoadVerticeData),
 };
 
 void LoadTestPatches()

rewrite/src/tests/test_coll.c

@@ -13,6 +13,37 @@ void TEST_COLL_ProjectPointToEdge(const SVec3* v1, const SVec3* v2, const SVec3*
     PatchFunction_End(index);
 }
 
+void TEST_COLL_LoadVerticeData(CollDCache* cache)
+{
+    CollVertex vertices[NUM_VERTICES_QUADBLOCK];
+    for (u32 i = 0; i < NUM_VERTICES_QUADBLOCK; i++)
+    {
+        vertices[i] = cache->quadblockCollVertices[i];
+    }
+    const u16 thirdIndex = cache->quadblockThirdIndex;
+    const u16 fourthIndex = cache->quadblockFourthIndex;
+    const u32 index = PatchFunction_Beg((u32*)(&ND_COLL_LoadVerticeData));
+
+    const u32 quadblock = (u32) cache->currQuadblock;
+    const u32 levVertices = (u32) cache->meshInfo->vertices;
+    __asm__ volatile("move $t9, %0" : : "r"(quadblock));
+    __asm__ volatile("move $t8, %0" : : "r"(levVertices));
+
+    typedef void (*Func)(CollDCache* cache);
+    Func func = (Func) TEST_WRAPPER;
+    func(cache);
+    for (u32 i = 0; i < NUM_VERTICES_QUADBLOCK; i++)
+    {
+        PrintSVectorDiff("COLL_LoadVerticeData", &cache->quadblockCollVertices[i].pos, &vertices[i].pos);
+        if (cache->quadblockCollVertices[i].levVertex != vertices[i].levVertex)
+        {
+            ND_printf("[COLL_LoadVerticeData] Test Failed: levVertex at index %d\n", i);
+        }
+    }
+    if (cache->quadblockThirdIndex != thirdIndex) { ND_printf("[COLL_LoadVerticeData] Test Failed:\nthirdIndex: %d\nResult:%d\n", cache->quadblockThirdIndex, thirdIndex); }
+    if (cache->quadblockFourthIndex != fourthIndex) { ND_printf("[COLL_LoadVerticeData] Test Failed:\nfourthIndex: %d\nResult:%d\n", cache->quadblockFourthIndex, fourthIndex);}
+    PatchFunction_End(index);
+}
 
 void TEST_COLL_BarycentricTest(TestVertex* t, const CollVertex* v1, const CollVertex* v2, const CollVertex* v3, const SVec3* pos, s32 ret)
 {

symbols/gcc-syms-rewrite.txt

@@ -68,7 +68,7 @@ ND_COLL_FIXED_QUADBLK_TestTriangles = 0x8001f41c;
 ND_COLL_FIXED_BSPLEAF_TestQuadblocks = 0x8001f5f0;
 ND_COLL_FIXED_QUADBLK_GetNormVecs_LoLOD = 0x8001f67c;
 ND_COLL_FIXED_QUADBLK_GetNormVecs_HiLOD = 0x8001f6f0;
-ND_COLL_FIXED_QUADBLK_LoadScratchpadVerts = 0x8001f7f0;
+ND_COLL_LoadVerticeData = 0x8001f7f0;
 ND_COLL_BarycentricTest = 0x8001f928;
 ND_COLL_MOVED_TRIANGL_TestPoint = 0x8001fc40;
 ND_COLL_MOVED_QUADBLK_TestTriangles = 0x80020064;