diff options
| author | MegaMech <MegaMech@users.noreply.github.com> | 2026-03-05 16:52:14 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-03-05 16:52:14 -0700 |
| commit | 376087be692801e8e2c7fd145fbfdfd720cdea16 (patch) | |
| tree | 27447311c1e5cd7a18dcee4157a218671eebb0ed /src/engine/tracks | |
| parent | 000c47e6100770a634fa01a1457c28ca8e2b860e (diff) | |
Fix Thwomp Collision and Better Interp Tagging for Actors (#665)
* Update actors.c
* Update actors.c
* actor
* Fix bounding box
* More interp fix
* Update KoopaTroopaBeach.cpp
* Update Thwomp.cpp
* Update actors.c
* Update render.inc.c
* Update render.inc.c
Diffstat (limited to 'src/engine/tracks')
| -rw-r--r-- | src/engine/tracks/KoopaTroopaBeach.cpp | 6 | ||||
| -rw-r--r-- | src/engine/tracks/KoopaTroopaBeach.h | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/src/engine/tracks/KoopaTroopaBeach.cpp b/src/engine/tracks/KoopaTroopaBeach.cpp index afa2f64c4..bd93462c7 100644 --- a/src/engine/tracks/KoopaTroopaBeach.cpp +++ b/src/engine/tracks/KoopaTroopaBeach.cpp @@ -112,6 +112,11 @@ KoopaTroopaBeach::KoopaTroopaBeach() { Props.Skybox.FloorTopLeft = {48, 152, 120}; Props.Sequence = MusicSeq::MUSIC_SEQ_KOOPA_TROOPA_BEACH; + mVtx[0].v.ob[0] = 129; mVtx[0].v.ob[1] = 1; mVtx[0].v.ob[2] = 2257; + mVtx[1].v.ob[0] = 112; mVtx[1].v.ob[1] = 1; mVtx[1].v.ob[2] = 2298; + mVtx[2].v.ob[0] = 129; mVtx[2].v.ob[1] = 40; mVtx[2].v.ob[2] = 2257; + mVtx[3].v.ob[0] = 112; mVtx[3].v.ob[1] = 40; mVtx[3].v.ob[2] = 2298; + Props.WaterLevel = 0.0f; gWaterVelocity = -0.1f; WaterVolumes.push_back({0.8f, 67.0f, 239.0f, 2233.0f, 2405.0f}); @@ -131,6 +136,7 @@ void KoopaTroopaBeach::Load() { InvertTriangleWindingByName(d_course_koopa_troopa_beach_packed_dl_2C0); InvertTriangleWindingByName(d_course_koopa_troopa_beach_packed_dl_9E70); } + add_vtx_from_quadrangle(mVtx, 4); parse_track_displaylists((TrackSections*)LOAD_ASSET_RAW(d_course_koopa_troopa_beach_addr)); func_80295C6C(); find_vtx_and_set_colours((Gfx*) d_course_koopa_troopa_beach_packed_dl_ADE0, 150, 255, 255, 255); diff --git a/src/engine/tracks/KoopaTroopaBeach.h b/src/engine/tracks/KoopaTroopaBeach.h index 5366be5a6..d6743553f 100644 --- a/src/engine/tracks/KoopaTroopaBeach.h +++ b/src/engine/tracks/KoopaTroopaBeach.h @@ -40,4 +40,5 @@ public: virtual void Tick() override; virtual void DrawTransparency(ScreenContext* screen, uint16_t pathCounter, uint16_t cameraRot, uint16_t playerDirection) override; virtual void Destroy() override; + Vtx mVtx[4]; }; |