diff options
| author | MegaMech <MegaMech@users.noreply.github.com> | 2026-03-06 20:10:07 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-03-06 20:10:07 -0700 |
| commit | 132357d9fb50d7962518e10b22db358c85d87ba5 (patch) | |
| tree | 428671c5f9d888bb6905fe20c07d26a70430b392 /src/engine/objects/Thwomp.cpp | |
| parent | 25d49df90fe1ab2c95c962d45ef146cb5cf0c794 (diff) | |
Big Interpolation Overhaul (#674)
* Fix FI
* FI statue
* Intepr fixes
* Improve
* More interp
* Fix compile
* More interp
* Fix text
Diffstat (limited to 'src/engine/objects/Thwomp.cpp')
| -rw-r--r-- | src/engine/objects/Thwomp.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/engine/objects/Thwomp.cpp b/src/engine/objects/Thwomp.cpp index 054d8d534..b176dca70 100644 --- a/src/engine/objects/Thwomp.cpp +++ b/src/engine/objects/Thwomp.cpp @@ -170,8 +170,6 @@ void OThwomp::Tick60fps() { // func_80081210 if (_idx == 0) { for (var_s4 = 0; var_s4 < gObjectParticle2_SIZE; var_s4++) { - FrameInterpolation_RecordOpenChild("Thwomp_smoke", (uintptr_t) (var_s4 << 5)); - objectIndex = gObjectParticle2[var_s4]; if (objectIndex == DELETED_OBJECT_ID) { continue; @@ -184,9 +182,6 @@ void OThwomp::Tick60fps() { // func_80081210 continue; } delete_object_wrapper(&gObjectParticle2[var_s4]); - - // @port Pop the transform id. - FrameInterpolation_RecordCloseChild(); } } } @@ -732,9 +727,11 @@ void OThwomp::Draw(s32 cameraId) { if (objectIndex != NULL_OBJECT_ID) { object = &gObjectList[objectIndex]; if ((object->state > 0) && (Behaviour == States::MOVE_FAR)) { + FrameInterpolation_RecordOpenChild("thwomp_particle2", (_idx << 12) | (i << 4) | cameraId); rsp_set_matrix_transformation(object->pos, object->orientation, object->sizeScaling); gSPVertex(gDisplayListHead++, (uintptr_t) D_0D005C00, 3, 0); gSPDisplayList(gDisplayListHead++, (Gfx*) D_0D006930); + FrameInterpolation_RecordCloseChild(); } } } @@ -753,7 +750,7 @@ void OThwomp::Draw(s32 cameraId) { if ((object->state >= 2) && (Behaviour == States::MOVE_AND_ROTATE)) { func_8004B138(0x000000FF, 0x000000FF, 0x000000FF, (s32) object->primAlpha); D_80183E80[1] = func_800418AC(object->pos[0], object->pos[2], camera->pos); - FrameInterpolation_RecordOpenChild("thwomp_particle", (i << 16) | (_idx << 6) | cameraId); + FrameInterpolation_RecordOpenChild("thwomp_particle", (_idx << 12) | (i << 4) | cameraId); func_800431B0(object->pos, D_80183E80, object->sizeScaling, (Vtx*) D_0D005AE0); FrameInterpolation_RecordCloseChild(); } |