diff options
| author | MegaMech <inkstudios1@hotmail.com> | 2025-05-16 22:23:15 -0600 |
|---|---|---|
| committer | MegaMech <inkstudios1@hotmail.com> | 2025-05-16 22:23:15 -0600 |
| commit | 881732eb8d1a5746c0fbb82d0319b5132d01419f (patch) | |
| tree | ec73844fc730e5ea8605164b47f99ed762fcee56 | |
| parent | 57a7a9a52d9a856efa11f0d999446bc39df4a713 (diff) | |
Interp Item box
| -rw-r--r-- | src/actors/item_box/render.inc.c | 7 | ||||
| -rw-r--r-- | src/engine/Matrix.cpp | 1 | ||||
| -rw-r--r-- | src/port/interpolation/FrameInterpolation.h | 4 |
3 files changed, 9 insertions, 3 deletions
diff --git a/src/actors/item_box/render.inc.c b/src/actors/item_box/render.inc.c index d4a96a0e3..0d02c3979 100644 --- a/src/actors/item_box/render.inc.c +++ b/src/actors/item_box/render.inc.c @@ -1,6 +1,7 @@ #include <actors.h> #include <main.h> #include <macros.h> +#include "port/interpolation/FrameInterpolation.h" /** * @brief Renders the item box actor. @@ -26,6 +27,9 @@ void render_actor_item_box(Camera* camera, struct ItemBox* item_box) { f32 temp_f2_2; f32 someMultiplier; + FrameInterpolation_RecordMatrixPush(someMatrix1); + FrameInterpolation_RecordMatrixPush(someMatrix2); + temp_f0 = is_within_render_distance(camera->pos, item_box->pos, camera->rot[1], 0.0f, gCameraZoom[camera - camera1], 4000000.0f); if (CVarGetInteger("gNoCulling", 0) == 1) { @@ -179,4 +183,7 @@ void render_actor_item_box(Camera* camera, struct ItemBox* item_box) { } gSPTexture(gDisplayListHead++, 0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON); } + + FrameInterpolation_RecordMatrixPop(someMatrix1); + FrameInterpolation_RecordMatrixPop(someMatrix2); } diff --git a/src/engine/Matrix.cpp b/src/engine/Matrix.cpp index e46804ad5..0104de47c 100644 --- a/src/engine/Matrix.cpp +++ b/src/engine/Matrix.cpp @@ -14,7 +14,6 @@ void AddMatrix(std::vector<Mtx>& stack, Mat4 mtx, s32 flags) { stack.emplace_back(); // Convert to a fixed-point matrix - FrameInterpolation_RecordMatrixMtxFToMtx((MtxF*)mtx, &stack.back()); guMtxF2L(mtx, &stack.back()); // Load the matrix diff --git a/src/port/interpolation/FrameInterpolation.h b/src/port/interpolation/FrameInterpolation.h index 93f4dd0a9..87012f66b 100644 --- a/src/port/interpolation/FrameInterpolation.h +++ b/src/port/interpolation/FrameInterpolation.h @@ -35,9 +35,9 @@ void FrameInterpolation_RecordActorPosRotMatrix(void); void FrameInterpolation_RecordMatrixPosRotXYZ(Mat4 out, Vec3f pos, Vec3s orientation); -void FrameInterpolation_RecordMatrixPush(Mat4* mtx); +void FrameInterpolation_RecordMatrixPush(Mat4* matrix); -void FrameInterpolation_RecordMatrixPop(Mat4* mtx); +void FrameInterpolation_RecordMatrixPop(Mat4* matrix); //void FrameInterpolation_RecordMatrixMult(Matrix* matrix, MtxF* mf, u8 mode); |