wip interp changeswipinterpchanges

6 files changed, 16 insertions, 8 deletions

diff --git a/src/os/guLookAtF.c b/src/os/guLookAtF.c
index 3163b89b4..bebd1b204 100644
--- a/src/os/guLookAtF.c
+++ b/src/os/guLookAtF.c
@@ -17,6 +17,7 @@ void guLookAtF(float mf[4][4], float xEye, float yEye, float zEye, float xAt, fl
                float yUp, float zUp) {
     float len, xLook, yLook, zLook, xRight, yRight, zRight;
 
+    FrameInterpolation_Record_guLookAt(mf, xEye, yEye, zEye, xAt, yAt, zAt, xUp, yUp, zUp);
     guMtxIdentF(mf);
 
     xLook = xAt - xEye;
@@ -74,8 +75,8 @@ void guLookAt(Mtx* m, float xEye, float yEye, float zEye, float xAt, float yAt,
               float zUp) {
     float mf[4][4];
 
+    //FrameInterpolation_RecordMatrixMtxFToMtx((MtxF*)mf, m);
     guLookAtF(mf, xEye, yEye, zEye, xAt, yAt, zAt, xUp, yUp, zUp);
-
-    guMtxF2L(mf, m);
     FrameInterpolation_RecordMatrixMtxFToMtx((MtxF*)mf, m);
+    guMtxF2L(mf, m);
 }
diff --git a/src/os/guOrthoF.c b/src/os/guOrthoF.c
index f38376b72..41271223d 100644
--- a/src/os/guOrthoF.c
+++ b/src/os/guOrthoF.c
@@ -1,8 +1,10 @@
 #include "libultra_internal.h"
+#include "src/port/interpolation/FrameInterpolation.h"
 
 void guOrthoF(float m[4][4], float left, float right, float bottom, float top, float near, float far, float scale) {
     int row;
     int col;
+    FrameInterpolation_Record_guOrtho(m, left, right, bottom, top, near, far, scale);
     guMtxIdentF(m);
     m[0][0] = 2 / (right - left);
     m[1][1] = 2 / (top - bottom);
@@ -19,7 +21,8 @@ void guOrthoF(float m[4][4], float left, float right, float bottom, float top, f
 }
 
 void guOrtho(Mtx* m, float left, float right, float bottom, float top, float near, float far, float scale) {
-    float sp28[4][4];
-    guOrthoF(sp28, left, right, bottom, top, near, far, scale);
-    guMtxF2L(sp28, m);
+    float mtxF[4][4];
+    guOrthoF(mtxF, left, right, bottom, top, near, far, scale);
+    FrameInterpolation_RecordMatrixMtxFToMtx(mtxF, m);
+    guMtxF2L(mtxF, m);
 }
diff --git a/src/os/guPerspectiveF.c b/src/os/guPerspectiveF.c
index fc65c6e80..745432c35 100644
--- a/src/os/guPerspectiveF.c
+++ b/src/os/guPerspectiveF.c
@@ -36,7 +36,8 @@ void guPerspectiveF(float mf[4][4], u16* perspNorm, float fovy, float aspect, fl
 
 void guPerspective(Mtx* m, u16* perspNorm, float fovy, float aspect, float near, float far, float scale) {
     float mat[4][4];
+    //FrameInterpolation_Record_guPerspective(mat, perspNorm, fovy, aspect, near, far, scale);
     guPerspectiveF(mat, perspNorm, fovy, aspect, near, far, scale);
-    guMtxF2L(mat, m);
     FrameInterpolation_RecordMatrixMtxFToMtx((MtxF*)mat, m);
+    guMtxF2L(mat, m);
 }
diff --git a/src/os/guRotateF.c b/src/os/guRotateF.c
index 0bdfad841..a731c94ad 100644
--- a/src/os/guRotateF.c
+++ b/src/os/guRotateF.c
@@ -39,7 +39,7 @@ void guRotateF(float m[4][4], float a, float x, float y, float z) {
 void guRotate(Mtx* m, float a, float x, float y, float z) {
     float mf[4][4];
     guRotateF(mf, a, x, y, z);
-    FrameInterpolation_Record_guRotate(mf, a, x, y, z);
+    //FrameInterpolation_Record_guRotate(mf, a, x, y, z);
     FrameInterpolation_RecordMatrixMtxFToMtx(mf, m);
     guMtxF2L(mf, m);
 }
diff --git a/src/os/guScaleF.c b/src/os/guScaleF.c
index 51aa4dfa4..f8334889e 100644
--- a/src/os/guScaleF.c
+++ b/src/os/guScaleF.c
@@ -12,7 +12,7 @@ void guScaleF(float mf[4][4], float x, float y, float z) {
 void guScale(Mtx* m, float x, float y, float z) {
     float mf[4][4];
     guScaleF(mf, x, y, z);
-    FrameInterpolation_Record_guScale(mf, x, y, z);
+    //FrameInterpolation_Record_guScale(mf, x, y, z);
     FrameInterpolation_RecordMatrixMtxFToMtx(mf, m);
     guMtxF2L(mf, m);
 }
diff --git a/src/os/guTranslateF.c b/src/os/guTranslateF.c
index d54af9165..f021087f9 100644
--- a/src/os/guTranslateF.c
+++ b/src/os/guTranslateF.c
@@ -1,4 +1,5 @@
 #include "libultra_internal.h"
+#include "src/port/interpolation/FrameInterpolation.h"
 
 void guTranslateF(float m[4][4], float x, float y, float z) {
     guMtxIdentF(m);
@@ -10,5 +11,7 @@ void guTranslateF(float m[4][4], float x, float y, float z) {
 void guTranslate(Mtx* m, float x, float y, float z) {
     float mf[4][4];
     guTranslateF(mf, x, y, z);
+    //FrameInterpolation_RecordMatrixTranslate(m, (Vec3f){x, y, z});
+    FrameInterpolation_RecordMatrixMtxFToMtx(mf, m);
     guMtxF2L(mf, m);
 }