Merge branch 'renderview-2' into 'master'

renderview: add Force option, renders while paused

See merge request KartKrew/Kart!2226
This commit is contained in:
Gunla 2024-04-05 00:57:39 +00:00
commit 2e9b280000
2 changed files with 5 additions and 1 deletions

View file

@ -429,7 +429,7 @@ extern CV_PossibleValue_t cv_renderer_t[];
consvar_t cv_renderer = Player("renderer", "Software").flags(CV_NOLUA).values(cv_renderer_t).onchange(SCR_ChangeRenderer);
consvar_t cv_parallelsoftware = Player("parallelsoftware", "On").on_off();
consvar_t cv_renderview = Player("renderview", "On").on_off().dont_save();
consvar_t cv_renderview = Player("renderview", "On").values({{0, "Off"}, {1, "On"}, {2, "Force"}}).dont_save();
consvar_t cv_rollingdemos = Player("rollingdemos", "On").on_off();
consvar_t cv_scr_depth = Player("scr_depth", "16 bits").values({{8, "8 bits"}, {16, "16 bits"}, {24, "24 bits"}, {32, "32 bits"}});

View file

@ -1021,6 +1021,10 @@ void D_SRB2Loop(void)
};
auto can_skip = [&]
{
// Always do 3d rendering, even when paused.
if (cv_renderview.value == 2)
return false;
// Would interfere with "Advanced Frame" button in replays.
if (demo.playback)
return false;