Move matrix utils in to decomp dir

src/decomp/engine/guMtxF2L.c

@@ -0,0 +1,69 @@
+#include "guMtxF2L.h"
+
+#ifdef GBI_FLOATS
+#include <string.h>
+#endif
+
+#ifndef GBI_FLOATS
+void guMtxF2L(float mf[4][4], Mtx *m) {
+    int r, c;
+    s32 tmp1;
+    s32 tmp2;
+    s32 *m1 = &m->m[0][0];
+    s32 *m2 = &m->m[2][0];
+    for (r = 0; r < 4; r++) {
+        for (c = 0; c < 2; c++) {
+            tmp1 = mf[r][2 * c] * 65536.0f;
+            tmp2 = mf[r][2 * c + 1] * 65536.0f;
+            *m1++ = (tmp1 & 0xffff0000) | ((tmp2 >> 0x10) & 0xffff);
+            *m2++ = ((tmp1 << 0x10) & 0xffff0000) | (tmp2 & 0xffff);
+        }
+    }
+}
+void guMtxL2F(float mf[4][4], Mtx *m) {
+    int r, c;
+    u32 tmp1;
+    u32 tmp2;
+    u32 *m1;
+    u32 *m2;
+    s32 stmp1, stmp2;
+    m1 = (u32 *) &m->m[0][0];
+    m2 = (u32 *) &m->m[2][0];
+    for (r = 0; r < 4; r++) {
+        for (c = 0; c < 2; c++) {
+            tmp1 = (*m1 & 0xffff0000) | ((*m2 >> 0x10) & 0xffff);
+            tmp2 = ((*m1++ << 0x10) & 0xffff0000) | (*m2++ & 0xffff);
+            stmp1 = *(s32 *) &tmp1;
+            stmp2 = *(s32 *) &tmp2;
+            mf[r][c * 2 + 0] = stmp1 / 65536.0f;
+            mf[r][c * 2 + 1] = stmp2 / 65536.0f;
+        }
+    }
+}
+#else
+void guMtxF2L(float mf[4][4], Mtx *m) {
+    memcpy(m, mf, sizeof(Mtx));
+}
+#endif
+
+void guMtxIdentF(float mf[4][4]) {
+    int r, c;
+    for (r = 0; r < 4; r++) {
+        for (c = 0; c < 4; c++) {
+            if (r == c) {
+                mf[r][c] = 1.0f;
+            } else {
+                mf[r][c] = 0.0f;
+            }
+        }
+    }
+}
+void guMtxIdent(Mtx *m) {
+#ifndef GBI_FLOATS
+    float mf[4][4];
+    guMtxIdentF(mf);
+    guMtxF2L(mf, m);
+#else
+    guMtxIdentF(m->m);
+#endif
+}

src/decomp/engine/guMtxF2L.h

@@ -0,0 +1,9 @@
+#ifndef GUMTXF2L_H
+#define GUMTXF2L_H
+
+#include "../include/PR/gbi.h"
+
+extern void guMtxF2L(float mf[4][4], Mtx *m);
+extern void guMtxL2F(float mf[4][4], Mtx *m);
+
+#endif//GUMTXF2L_H

src/decomp/engine/math_util.c

@@ -3,7 +3,7 @@
 #include <math.h>
 #include "../shim.h"
 
-#include "../../guMtxF2L.h"
+#include "guMtxF2L.h"
 #include "../include/sm64.h"
 #include "graph_node.h"
 #include "surface_collision.h"