From bd15ff4fca82963ca5955d6a6c551e83166a5684 Mon Sep 17 00:00:00 2001 From: MegaMech Date: Fri, 30 May 2025 21:55:26 -0600 Subject: [PATCH] Fix logo interp --- src/os/guLookAtF.c | 2 +- src/os/guOrthoF.c | 7 ++++--- src/os/guPerspectiveF.c | 2 +- src/os/guRotateF.c | 1 + src/os/guScaleF.c | 1 + src/os/guTranslateF.c | 1 + 6 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/os/guLookAtF.c b/src/os/guLookAtF.c index 3163b89b4..4980c76e4 100644 --- a/src/os/guLookAtF.c +++ b/src/os/guLookAtF.c @@ -76,6 +76,6 @@ void guLookAt(Mtx* m, float xEye, float yEye, float zEye, float xAt, float yAt, 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..9b9e2cff2 100644 --- a/src/os/guOrthoF.c +++ b/src/os/guOrthoF.c @@ -19,7 +19,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 mf[4][4]; + guOrthoF(mf, left, right, bottom, top, near, far, scale); + FrameInterpolation_RecordMatrixMtxFToMtx((MtxF*)mf, m); + guMtxF2L(mf, m); } diff --git a/src/os/guPerspectiveF.c b/src/os/guPerspectiveF.c index fc65c6e80..7d682b8f9 100644 --- a/src/os/guPerspectiveF.c +++ b/src/os/guPerspectiveF.c @@ -37,6 +37,6 @@ 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]; 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 aaebf6cfe..f649183ce 100644 --- a/src/os/guRotateF.c +++ b/src/os/guRotateF.c @@ -38,5 +38,6 @@ 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_RecordMatrixMtxFToMtx((MtxF*)mf, m); guMtxF2L(mf, m); } diff --git a/src/os/guScaleF.c b/src/os/guScaleF.c index 51ee2ac8f..89ed8206e 100644 --- a/src/os/guScaleF.c +++ b/src/os/guScaleF.c @@ -11,5 +11,6 @@ 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_RecordMatrixMtxFToMtx((MtxF*)mf, m); guMtxF2L(mf, m); } diff --git a/src/os/guTranslateF.c b/src/os/guTranslateF.c index d54af9165..7ef8cda8d 100644 --- a/src/os/guTranslateF.c +++ b/src/os/guTranslateF.c @@ -10,5 +10,6 @@ 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_RecordMatrixMtxFToMtx((MtxF*)mf, m); guMtxF2L(mf, m); }