More Interp and Draw Visibility Options (#643)

* Update render.inc.c

* FI improvements

* Rename

* Update PortMenu.cpp

5 files changed, 125 insertions, 49 deletions

diff --git a/src/actors/palm_tree/render.inc.c b/src/actors/palm_tree/render.inc.c
index fbb16802f..cc76849ba 100644
--- a/src/actors/palm_tree/render.inc.c
+++ b/src/actors/palm_tree/render.inc.c
@@ -1,6 +1,7 @@
 #include <actors.h>
 #include <main.h>
 #include <assets/models/tracks/koopa_troopa_beach/koopa_troopa_beach_data.h>
+#include "port/interpolation/FrameInterpolation.h"
 
 /**
  * @brief Renders the palm tree actor.
@@ -28,6 +29,7 @@ void render_actor_palm_tree(Camera* camera, UNUSED Mat4 arg1, struct PalmTree* a
     }
 
     if (!(temp_f0 < 0.0f)) {
+        FrameInterpolation_RecordOpenChild("palm_tree", TAG_ITEM_ADDR( ( (uintptr_t)arg2 << 5 ) | camera->cameraId ));
         if (((temp_v0 & 0x400) == 0) && (temp_f0 < 250000.0f)) {
             func_8029794C(arg2->pos, arg2->rot, 2.0f);
         }
@@ -60,5 +62,6 @@ void render_actor_palm_tree(Camera* camera, UNUSED Mat4 arg1, struct PalmTree* a
                     break;
             }
         }
+        FrameInterpolation_RecordCloseChild();
     }
 }
diff --git a/src/code_80057C60.c b/src/code_80057C60.c
index 7e820f65b..b7aaa3342 100644
--- a/src/code_80057C60.c
+++ b/src/code_80057C60.c
@@ -4983,7 +4983,7 @@ void func_80066714(Player* player, UNUSED s32 arg1, s16 arg2, s8 arg3) {
     }
 }
 
-void func_80066998(Player* player, UNUSED s8 arg1, s16 arg2, s8 arg3) {
+void func_80066998(Player* player, s8 playerId, s16 arg2, s8 screenId) {
     Vec3f sp54;
     Vec3s sp4C;
     s16 red;
@@ -5000,8 +5000,9 @@ void func_80066998(Player* player, UNUSED s8 arg1, s16 arg2, s8 arg3) {
         sp54[1] = player->particlePool0[arg2].pos[1];
         sp54[2] = player->particlePool0[arg2].pos[2];
         sp4C[0] = 0x4000;
-        sp4C[1] = player->unk_048[arg3];
+        sp4C[1] = player->unk_048[screenId];
         sp4C[2] = 0;
+        FrameInterpolation_RecordOpenChild("some_ply_particle2", (arg2 << 8) | (playerId << 4) | screenId);
         func_800652D4(sp54, sp4C, player->particlePool0[arg2].scale * player->size);
         gSPDisplayList(gDisplayListHead++, D_0D008DB8);
         gDPLoadTextureBlock(gDisplayListHead++, D_8018D48C, G_IM_FMT_IA, G_IM_SIZ_8b, 32, 32, 0,
@@ -5009,6 +5010,7 @@ void func_80066998(Player* player, UNUSED s8 arg1, s16 arg2, s8 arg3) {
                             G_TX_NOLOD);
         func_8004B35C(red, green, blue, alpha);
         gSPDisplayList(gDisplayListHead++, D_0D008E48);
+        FrameInterpolation_RecordCloseChild();
         gMatrixEffectCount += 1;
     }
 }
@@ -5200,7 +5202,7 @@ void render_player_onomatopoeia_whrrrr(Player* player, UNUSED s8 arg1, f32 arg2,
     }
 }
 
-void render_player_speech_bubble(Player* player, s8 arg1, u8* texture, s8 arg3, f32 arg4, s32 arg5) {
+void render_player_speech_bubble(Player* player, s8 screenId, u8* texture, s8 arg3, f32 arg4, s32 arg5) {
     Vec3f sp7C;
     Vec3s sp74;
     f32 sp54[8] = { 0.0f, -1.2f, 0.1f, 1.2f, -1.7f, -0.8f, -0.2f, -1.9f };
@@ -5212,23 +5214,25 @@ void render_player_speech_bubble(Player* player, s8 arg1, u8* texture, s8 arg3,
 
     if (player->particlePool2[arg3].isAlive == 1) {
         sp74[0] = 0;
-        sp74[1] = player->unk_048[arg1];
+        sp74[1] = player->unk_048[screenId];
         sp74[2] = 0;
         sp7C[0] = player->pos[0] + (sins((0x4000 & 0xFFFFFFFF) - (player->rotation[1] + player->unk_0C0)) * arg4);
         sp7C[1] = player->pos[1] + player->boundingBoxSize - sp54[player->characterId] - 2.0f;
         sp7C[2] = player->pos[2] + (coss((0x4000 & 0xFFFFFFFF) - (player->rotation[1] + player->unk_0C0)) * arg4);
         func_800652D4(sp7C, sp74, player->particlePool2[arg3].scale * player->size);
+        FrameInterpolation_RecordOpenChild("speech_bubble", ((player - gPlayerOne) << 4) | screenId);
         gSPDisplayList(gDisplayListHead++, D_0D008DB8);
         gDPLoadTextureBlock(gDisplayListHead++, texture, G_IM_FMT_I, G_IM_SIZ_8b, 32, 32, 0, G_TX_NOMIRROR | G_TX_WRAP,
                             G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
 
         func_8004B414(red, green, blue, 0x000000FF);
         gSPDisplayList(gDisplayListHead++, D_0D008E20);
+        FrameInterpolation_RecordCloseChild();
         gMatrixEffectCount += 1;
     }
 }
 
-void render_music_note(Player* player, s8 arg1, u8* texture, s8 arg3, f32 arg4, s32 arg5) {
+void render_music_note(Player* player, s8 screenId, u8* texture, s8 arg3, f32 arg4, s32 arg5) {
     Vec3f sp7C;
     Vec3s sp74;
     f32 sp54[8] = { -0.7f, -1.9f, -0.6f, 0.4f, -2.5f, -1.6f, -0.95f, -2.7f };
@@ -5240,11 +5244,12 @@ void render_music_note(Player* player, s8 arg1, u8* texture, s8 arg3, f32 arg4,
 
     if (player->particlePool2[arg3].isAlive == 1) {
         sp74[0] = 0;
-        sp74[1] = player->unk_048[arg1];
+        sp74[1] = player->unk_048[screenId];
         sp74[2] = 0;
         sp7C[0] = player->pos[0] + (sins((0x4000 & 0xFFFFFFFF) - (player->rotation[1] + player->unk_0C0)) * arg4);
         sp7C[1] = player->pos[1] + player->boundingBoxSize - sp54[player->characterId] - 2.0f;
         sp7C[2] = player->pos[2] + (coss((0x4000 & 0xFFFFFFFF) - (player->rotation[1] + player->unk_0C0)) * arg4);
+        FrameInterpolation_RecordOpenChild("music_note", ((player - gPlayerOne) << 4) | screenId);
         func_800652D4(sp7C, sp74, player->particlePool2[arg3].scale * player->size * 0.8);
         gSPDisplayList(gDisplayListHead++, D_0D008DB8);
         gDPLoadTextureBlock(gDisplayListHead++, texture, G_IM_FMT_I, G_IM_SIZ_8b, 32, 32, 0, G_TX_NOMIRROR | G_TX_WRAP,
@@ -5252,6 +5257,7 @@ void render_music_note(Player* player, s8 arg1, u8* texture, s8 arg3, f32 arg4,
 
         func_8004B414(red, green, blue, 0x000000FF);
         gSPDisplayList(gDisplayListHead++, D_0D008E20);
+        FrameInterpolation_RecordCloseChild();
         gMatrixEffectCount += 1;
     }
 }
@@ -5586,7 +5592,7 @@ void func_8006A01C(Player* player, UNUSED s8 arg1, s16 arg2, s8 arg3) {
     }
 }
 
-void func_8006A280(Player* player, UNUSED s8 arg1, s16 arg2, s8 arg3) {
+void func_8006A280(Player* player, s8 playerId, s16 arg2, s8 screenId) {
     Vec3f sp5C;
     Vec3s sp54;
     s16 red;
@@ -5601,8 +5607,9 @@ void func_8006A280(Player* player, UNUSED s8 arg1, s16 arg2, s8 arg3) {
         sp5C[1] = player->particlePool0[arg2].pos[1];
         sp5C[2] = player->particlePool0[arg2].pos[2];
         sp54[0] = 0;
-        sp54[1] = player->unk_048[arg3];
+        sp54[1] = player->unk_048[screenId];
         sp54[2] = 0;
+        FrameInterpolation_RecordOpenChild("some_ply_particle", (arg2 << 8) | (playerId << 4) | screenId);
         func_800652D4(sp5C, sp54, player->particlePool0[arg2].scale * player->size);
         gSPDisplayList(gDisplayListHead++, D_0D008D58);
         gDPSetTextureLUT(gDisplayListHead++, G_TT_NONE);
@@ -5613,6 +5620,7 @@ void func_8006A280(Player* player, UNUSED s8 arg1, s16 arg2, s8 arg3) {
         gDPSetRenderMode(gDisplayListHead++, G_RM_ZB_CLD_SURF, G_RM_ZB_CLD_SURF2);
         gSPVertex(gDisplayListHead++, D_800E8780, 4, 0);
         gSPDisplayList(gDisplayListHead++, D_0D008DA0);
+        FrameInterpolation_RecordCloseChild();
         gMatrixEffectCount += 1;
     }
 }
@@ -6452,50 +6460,50 @@ void func_8006DC54(Player* player, s8 arg1, s8 arg2) {
     }
 }
 
-void func_8006DD3C(Player* player, s8 playerId, s8 arg2) {
+void func_8006DD3C(Player* player, s8 playerId, s8 screenId) {
     s16 temp_s0;
     s32 temp_v0;
 
-    temp_v0 = SIDE_OF_KART << (arg2 * 4);
+    temp_v0 = SIDE_OF_KART << (screenId * 4);
     if (temp_v0 == (player->unk_002 & temp_v0)) {
         for (temp_s0 = 0; temp_s0 < 10; ++temp_s0) {
             temp_v0 = player->particlePool0[temp_s0].type;
             if (temp_v0 != 3) {
                 if (temp_v0 == 5) {
-                    func_8006A280(player, playerId, temp_s0, arg2);
+                    func_8006A280(player, playerId, temp_s0, screenId);
                 }
             } else if (gActiveScreenMode == SCREEN_MODE_3P_4P_SPLITSCREEN) {
-                if (arg2 == playerId) {
-                    func_80066998(player, playerId, temp_s0, arg2);
+                if (screenId == playerId) {
+                    func_80066998(player, playerId, temp_s0, screenId);
                 }
             } else {
-                func_80066998(player, playerId, temp_s0, arg2);
+                func_80066998(player, playerId, temp_s0, screenId);
             }
         }
 
-        if (((player->type & PLAYER_HUMAN) == PLAYER_HUMAN) && (arg2 == playerId)) {
-            FrameInterpolation_RecordOpenChild("onomatopoeia", TAG_SMOKE_DUST((playerId << 8) | (arg2 << 4)));
+        if (((player->type & PLAYER_HUMAN) == PLAYER_HUMAN) && (screenId == playerId)) {
+            FrameInterpolation_RecordOpenChild("onomatopoeia", TAG_SMOKE_DUST((playerId << 8) | (screenId << 4)));
             switch (player->particlePool2[0].type) {
                 case 2:
-                    render_player_onomatopoeia_crash(player, playerId, player->particlePool2[0].scale, arg2, 0);
+                    render_player_onomatopoeia_crash(player, playerId, player->particlePool2[0].scale, screenId, 0);
                     break;
                 case 3:
-                    render_player_onomatopoeia_whrrrr(player, playerId, player->particlePool2[0].scale, arg2, 0);
+                    render_player_onomatopoeia_whrrrr(player, playerId, player->particlePool2[0].scale, screenId, 0);
                     break;
                 case 4:
-                    func_80068724(player, playerId, player->particlePool2[0].scale, arg2, 0);
+                    func_80068724(player, playerId, player->particlePool2[0].scale, screenId, 0);
                     break;
                 case 5:
-                    render_player_onomatopoeia_boing(player, playerId, player->particlePool2[0].scale, arg2, 0);
+                    render_player_onomatopoeia_boing(player, playerId, player->particlePool2[0].scale, screenId, 0);
                     break;
                 case 6:
-                    render_player_onomatopoeia_pomp(player, playerId, player->particlePool2[0].scale, arg2, 0);
+                    render_player_onomatopoeia_pomp(player, playerId, player->particlePool2[0].scale, screenId, 0);
                     break;
             }
             FrameInterpolation_RecordCloseChild();
             if (player->particlePool2[1].type == 5) {
-                render_player_speech_bubble(player, arg2, D_8018D480, 1, 1.6f, 0xFFFFFF);
-                render_music_note(player, arg2, D_8018D484, 1, 1.6f, 0xFF);
+                render_player_speech_bubble(player, screenId, D_8018D480, 1, 1.6f, 0xFFFFFF);
+                render_music_note(player, screenId, D_8018D484, 1, 1.6f, 0xFF);
             }
         }
     }
diff --git a/src/port/ui/PortMenu.cpp b/src/port/ui/PortMenu.cpp
index 494917e3a..9eb273f5e 100644
--- a/src/port/ui/PortMenu.cpp
+++ b/src/port/ui/PortMenu.cpp
@@ -534,6 +534,8 @@ void PortMenu::AddDevTools() {
         .CVar("gRenderCollisionMesh")
         .Options(CheckboxOptions().Tooltip("Draws the collision mesh instead of the track mesh"));
 
+    AddSceneVisibility();
+
     path = { "Developer", "Gfx Debugger", SECTION_COLUMN_1 };
     AddSidebarEntry("Developer", "Gfx Debugger", 1);
     AddWidget(path, "Popout Gfx Debugger", WIDGET_WINDOW_BUTTON)
@@ -559,6 +561,51 @@ void PortMenu::AddDevTools() {
         .WindowName("Console");
 }
 
+void PortMenu::AddSceneVisibility() {
+    WidgetPath path = { "Developer", "Scene Visibility", SECTION_COLUMN_1 };
+    AddSidebarEntry("Developer", "Scene Visibility", 1);
+
+    AddWidget(path, "Draw Track Geometry", WIDGET_CVAR_CHECKBOX)
+        .CVar("gDrawTrackGeometry")
+        .Options(UIWidgets::CheckboxOptions().DefaultValue(true));
+
+    AddWidget(path, "Draw Transparent Track", WIDGET_CVAR_CHECKBOX)
+        .CVar("gDrawTransparentTrack")
+        .Options(UIWidgets::CheckboxOptions().DefaultValue(true));
+
+    AddWidget(path, "Draw Players", WIDGET_CVAR_CHECKBOX)
+        .CVar("gDrawPlayers")
+        .Options(UIWidgets::CheckboxOptions().DefaultValue(true));
+
+    AddWidget(path, "Draw Item Boxes", WIDGET_CVAR_CHECKBOX)
+        .CVar("gDrawItemBoxes")
+        .Options(UIWidgets::CheckboxOptions().DefaultValue(true));
+
+    AddWidget(path, "Draw Original Actors", WIDGET_CVAR_CHECKBOX)
+        .CVar("gDrawCActors")
+        .Options(UIWidgets::CheckboxOptions().DefaultValue(true));
+
+    AddWidget(path, "Draw Rewrite Actors", WIDGET_CVAR_CHECKBOX)
+        .CVar("gDrawCPPActors")
+        .Options(UIWidgets::CheckboxOptions().DefaultValue(true));
+
+    AddWidget(path, "Draw Static Mesh", WIDGET_CVAR_CHECKBOX)
+        .CVar("gDrawStaticMeshActors")
+        .Options(UIWidgets::CheckboxOptions().DefaultValue(true));
+
+    AddWidget(path, "Draw Objects", WIDGET_CVAR_CHECKBOX)
+        .CVar("gDrawObjects")
+        .Options(UIWidgets::CheckboxOptions().DefaultValue(true));
+
+    AddWidget(path, "Draw Particles", WIDGET_CVAR_CHECKBOX)
+        .CVar("gDrawParticles")
+        .Options(UIWidgets::CheckboxOptions().DefaultValue(true));
+
+    AddWidget(path, "Draw HUD", WIDGET_CVAR_CHECKBOX)
+        .CVar("gDrawHUD")
+        .Options(UIWidgets::CheckboxOptions().DefaultValue(true));
+}
+
 PortMenu::PortMenu(const std::string& consoleVariable, const std::string& name)
     : Menu(consoleVariable, name, 0, UIWidgets::Colors::LightBlue) {
 }
diff --git a/src/port/ui/PortMenu.h b/src/port/ui/PortMenu.h
index f42133d99..55cf23996 100644
--- a/src/port/ui/PortMenu.h
+++ b/src/port/ui/PortMenu.h
@@ -74,6 +74,7 @@ class PortMenu : public Ship::Menu {
     void AddEnhancements();
       void AddRulesets();
     void AddDevTools();
+      void AddSceneVisibility();
 };
 } // namespace BenGui
 
diff --git a/src/racing/skybox_and_splitscreen.c b/src/racing/skybox_and_splitscreen.c
index b36a55772..aa3a46bf8 100644
--- a/src/racing/skybox_and_splitscreen.c
+++ b/src/racing/skybox_and_splitscreen.c
@@ -811,46 +811,63 @@ void render_screens(s32 mode, s32 cameraId, s32 playerId) {
     render_set_position(trackMatrix, 0);
 
     // Draw track geography
-    render_track(screen);
+
+    if (CVarGetInteger("gDrawTrackGeometry", true) == true) {
+        render_track(screen);
+    }
     FrameInterpolation_RecordCloseChild();
 
     // Draw dynamic game objects
-    render_course_actors(screen);
-    CM_DrawActors(camera);
-    CM_DrawStaticMeshActors();
-    render_object(screen);
+    if (CVarGetInteger("gDrawCActors", true) == true) {
+        render_course_actors(screen);
+    }
 
-    if (CM_IsTourEnabled() == false) {
-        render_players(camera, screenId);
+    if (CVarGetInteger("gDrawCPPActors", true) == true) {
+        CM_DrawActors(camera);
     }
 
-    // Track geography
-    draw_transparent_geography(screen, playerId);
+    if (CVarGetInteger("gDrawStaticMeshActors", true) == true) {
+        CM_DrawStaticMeshActors();
+    }
 
-    switch (playerId) { // Render player particles or some effect
-        case 0:
-            func_80021B0C();
-            break;
-        case 1:
-            func_80021C78();
-            break;
-        case 2:
-            func_80021D40();
-            break;
-        case 3:
-            func_80021DA8();
-            break;
-    };
+    if (CVarGetInteger("gDrawObjects", true) == true) {
+        render_object(screen);
+    }
+
+    if (CVarGetInteger("gDrawPlayers", true) == true) {
+        if (CM_IsTourEnabled() == false) {
+            render_players(camera, screenId);
+        }
+    }
+
+    if (CVarGetInteger("gDrawTransparentTrack", true) == true) {
+        // Track geography
+        draw_transparent_geography(screen, playerId);
+    }
+
+    if (CVarGetInteger("gDrawParticles", true) == true) {
+        switch (playerId) { // Render player particles or some effect
+            case 0: func_80021B0C(); break;
+            case 1: func_80021C78(); break;
+            case 2: func_80021D40(); break;
+            case 3: func_80021DA8(); break;
+        };
+    }
 
-    render_item_boxes(screen);
+    if (CVarGetInteger("gDrawItemBoxes", true) == true) {
+        render_item_boxes(screen);
+    }
     render_player_snow_effect(camera);
     func_80058BF4(); // Setup texture modes
     if (D_800DC5B8 != 0) {
         func_80058C20(mode); // Setup hud matrix
     }
     func_80093A5C(mode); // Perhaps pause render?
-    if (D_800DC5B8 != 0) {
-        render_hud(mode);
+
+    if (CVarGetInteger("gDrawHUD", true) == true) {
+        if (D_800DC5B8 != 0) {
+            render_hud(mode);
+        }
     }
 
     // Do not increment in single player mode