diff options
| author | MegaMech <MegaMech@users.noreply.github.com> | 2026-02-24 14:51:25 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-02-24 14:51:25 -0700 |
| commit | 548ccf0063f6c4d6608cf87f46a347c71079c0bd (patch) | |
| tree | 42708916b67dc1dd553c70199339541a401dca15 /src/main.c | |
| parent | 321d440089fc7424002879c9b2e74a4b0ffe9a8d (diff) | |
Impl Sky and SkyActors (#630)
* Create Cloud.cpp
* Create Cloud.h
* Fix the cloud
* Cleanup
* More cleanup
* Update Track.h
* Refactor SkyboxCloud position calculations
* Update SkyboxStar.cpp
* Update SkyboxStar.cpp
* Refactor SkyboxStar.cpp by removing redundant code
* Update SkyboxCloud.cpp
* Refactor SkyboxSnow.cpp by reordering includes
* Update SkyboxCloud.h
* Refactor SkyboxStar.h for improved formatting
* Impl skyboxcloud
* Update comment
* update comment
* Work now
* Fully impl Sky
* Fix define
* Fix args
Diffstat (limited to 'src/main.c')
| -rw-r--r-- | src/main.c | 51 |
1 files changed, 25 insertions, 26 deletions
diff --git a/src/main.c b/src/main.c index 2fe0b453d..b682244e3 100644 --- a/src/main.c +++ b/src/main.c @@ -740,50 +740,49 @@ void race_logic_loop(void) { switch (gActiveScreenMode) { case SCREEN_MODE_1P: - render_screens(RENDER_SCREEN_MODE_1P_PLAYER_ONE, 0, 0); + render_screens(gScreenOneCtx, RENDER_SCREEN_MODE_1P_PLAYER_ONE, 0, 0); break; case SCREEN_MODE_2P_SPLITSCREEN_HORIZONTAL: if (gPlayerWinningIndex == 0) { // In VS Mode the winning player's viewport takes over the whole screen. // Rendering the winning player last places their screen above the other screens - render_screens(RENDER_SCREEN_MODE_2P_HORIZONTAL_PLAYER_TWO, 1, 1); - render_screens(RENDER_SCREEN_MODE_2P_HORIZONTAL_PLAYER_ONE, 0, 0); + render_screens(gScreenTwoCtx, RENDER_SCREEN_MODE_2P_HORIZONTAL_PLAYER_TWO, 4, 1); + render_screens(gScreenOneCtx, RENDER_SCREEN_MODE_2P_HORIZONTAL_PLAYER_ONE, 3, 0); } else { - render_screens(RENDER_SCREEN_MODE_2P_HORIZONTAL_PLAYER_ONE, 0, 0); - render_screens(RENDER_SCREEN_MODE_2P_HORIZONTAL_PLAYER_TWO, 1, 1); + render_screens(gScreenOneCtx, RENDER_SCREEN_MODE_2P_HORIZONTAL_PLAYER_ONE, 3, 0); + render_screens(gScreenTwoCtx, RENDER_SCREEN_MODE_2P_HORIZONTAL_PLAYER_TWO, 4, 1); } break; case SCREEN_MODE_2P_SPLITSCREEN_VERTICAL: if (gPlayerWinningIndex == 0) { - render_screens(RENDER_SCREEN_MODE_2P_VERTICAL_PLAYER_TWO, 1, 1); - render_screens(RENDER_SCREEN_MODE_2P_VERTICAL_PLAYER_ONE, 0, 0); + render_screens(gScreenTwoCtx, RENDER_SCREEN_MODE_2P_VERTICAL_PLAYER_TWO, 2, 1); + render_screens(gScreenOneCtx, RENDER_SCREEN_MODE_2P_VERTICAL_PLAYER_ONE, 1, 0); } else { - render_screens(RENDER_SCREEN_MODE_2P_VERTICAL_PLAYER_ONE, 0, 0); - render_screens(RENDER_SCREEN_MODE_2P_VERTICAL_PLAYER_TWO, 1, 1); + render_screens(gScreenOneCtx, RENDER_SCREEN_MODE_2P_VERTICAL_PLAYER_ONE, 1, 0); + render_screens(gScreenTwoCtx, RENDER_SCREEN_MODE_2P_VERTICAL_PLAYER_TWO, 2, 1); } break; case SCREEN_MODE_3P_4P_SPLITSCREEN: if (gPlayerWinningIndex == 0) { - render_screens(RENDER_SCREEN_MODE_3P_4P_PLAYER_TWO, 1, 1); - render_screens(RENDER_SCREEN_MODE_3P_4P_PLAYER_THREE, 2, 2); - render_screens(RENDER_SCREEN_MODE_3P_4P_PLAYER_FOUR, 3, 3); - render_screens(RENDER_SCREEN_MODE_3P_4P_PLAYER_ONE, 0, 0); + render_screens(gScreenTwoCtx, RENDER_SCREEN_MODE_3P_4P_PLAYER_TWO, 9, 1); + render_screens(gScreenThreeCtx, RENDER_SCREEN_MODE_3P_4P_PLAYER_THREE, 10, 2); + render_screens(gScreenFourCtx, RENDER_SCREEN_MODE_3P_4P_PLAYER_FOUR, 11, 3); + render_screens(gScreenOneCtx, RENDER_SCREEN_MODE_3P_4P_PLAYER_ONE, 8, 0); } else if (gPlayerWinningIndex == 1) { - render_screens(RENDER_SCREEN_MODE_3P_4P_PLAYER_ONE, 0, 0); - render_screens(RENDER_SCREEN_MODE_3P_4P_PLAYER_THREE, 2, 2); - render_screens(RENDER_SCREEN_MODE_3P_4P_PLAYER_FOUR, 3, 3); - render_screens(RENDER_SCREEN_MODE_3P_4P_PLAYER_TWO, 1, 1); + render_screens(gScreenOneCtx, RENDER_SCREEN_MODE_3P_4P_PLAYER_ONE, 8, 0); + render_screens(gScreenThreeCtx, RENDER_SCREEN_MODE_3P_4P_PLAYER_THREE, 10, 2); + render_screens(gScreenFourCtx, RENDER_SCREEN_MODE_3P_4P_PLAYER_FOUR, 11, 3); + render_screens(gScreenTwoCtx, RENDER_SCREEN_MODE_3P_4P_PLAYER_TWO, 9, 1); } else if (gPlayerWinningIndex == 2) { - - render_screens(RENDER_SCREEN_MODE_3P_4P_PLAYER_ONE, 0, 0); - render_screens(RENDER_SCREEN_MODE_3P_4P_PLAYER_TWO, 1, 1); - render_screens(RENDER_SCREEN_MODE_3P_4P_PLAYER_FOUR, 3, 3); - render_screens(RENDER_SCREEN_MODE_3P_4P_PLAYER_THREE, 2, 2); + render_screens(gScreenOneCtx, RENDER_SCREEN_MODE_3P_4P_PLAYER_ONE, 8, 0); + render_screens(gScreenTwoCtx, RENDER_SCREEN_MODE_3P_4P_PLAYER_TWO, 9, 1); + render_screens(gScreenFourCtx, RENDER_SCREEN_MODE_3P_4P_PLAYER_FOUR, 11, 3); + render_screens(gScreenThreeCtx, RENDER_SCREEN_MODE_3P_4P_PLAYER_THREE, 10, 2); } else { - render_screens(RENDER_SCREEN_MODE_3P_4P_PLAYER_ONE, 0, 0); - render_screens(RENDER_SCREEN_MODE_3P_4P_PLAYER_TWO, 1, 1); - render_screens(RENDER_SCREEN_MODE_3P_4P_PLAYER_THREE, 2, 2); - render_screens(RENDER_SCREEN_MODE_3P_4P_PLAYER_FOUR, 3, 3); + render_screens(gScreenOneCtx, RENDER_SCREEN_MODE_3P_4P_PLAYER_ONE, 8, 0); + render_screens(gScreenTwoCtx, RENDER_SCREEN_MODE_3P_4P_PLAYER_TWO, 9, 1); + render_screens(gScreenThreeCtx, RENDER_SCREEN_MODE_3P_4P_PLAYER_THREE, 10, 2); + render_screens(gScreenFourCtx, RENDER_SCREEN_MODE_3P_4P_PLAYER_FOUR, 11, 3); } break; } |
