From e7d18580527656e6ba177ed39795a55282a5658f Mon Sep 17 00:00:00 2001 From: Alug Date: Sun, 21 Jul 2024 14:20:54 +0200 Subject: [PATCH 01/11] port director from RR --- src/Makefile | 1 + src/d_netcmd.c | 6 + src/d_netcmd.h | 3 + src/k_director.c | 371 +++++++++++++++++++++++++++++++++++++++++++++++ src/k_director.h | 21 +++ src/k_kart.c | 6 + src/p_setup.c | 3 + src/p_tick.c | 3 + 8 files changed, 414 insertions(+) create mode 100644 src/k_director.c create mode 100644 src/k_director.h diff --git a/src/Makefile b/src/Makefile index 9951ca91d..ee2e90cbc 100644 --- a/src/Makefile +++ b/src/Makefile @@ -494,6 +494,7 @@ OBJS:=$(i_main_o) \ $(OBJDIR)/hu_stuff.o \ $(OBJDIR)/y_inter.o \ $(OBJDIR)/st_stuff.o \ + $(OBJDIR)/k_director.o \ $(OBJDIR)/k_kart.o \ $(OBJDIR)/m_aatree.o \ $(OBJDIR)/m_anigif.o \ diff --git a/src/d_netcmd.c b/src/d_netcmd.c index 3cf64d065..4f5717106 100644 --- a/src/d_netcmd.c +++ b/src/d_netcmd.c @@ -554,6 +554,9 @@ consvar_t cv_perfstats = {"perfstats", "Off", CV_CALL, perfstats_cons_t, PS_Perf consvar_t cv_ps_thinkframe_page = {"ps_thinkframe_page", "1", CV_CALL, CV_Natural, PS_ThinkFrame_Page_OnChange, 0, NULL, NULL, 0, 0, NULL}; +consvar_t cv_director = {"director", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; + + static CV_PossibleValue_t ps_samplesize_cons_t[] = { {1, "MIN"}, {1000, "MAX"}, {0, NULL}}; consvar_t cv_ps_samplesize = {"ps_samplesize", "1", CV_CALL, ps_samplesize_cons_t, PS_SampleSize_OnChange, 0, NULL, NULL, 0, 0, NULL}; @@ -979,6 +982,9 @@ void D_RegisterClientCommands(void) CV_RegisterVar(&cv_showtrackaddon); CV_RegisterVar(&cv_showviewpointtext); + CV_RegisterVar(&cv_director); + + CV_RegisterVar(&cv_luaimmersion); CV_RegisterVar(&cv_fakelocalskin); diff --git a/src/d_netcmd.h b/src/d_netcmd.h index b02b68f00..e3d306315 100644 --- a/src/d_netcmd.h +++ b/src/d_netcmd.h @@ -201,6 +201,9 @@ extern consvar_t cv_ps_thinkframe_page; extern consvar_t cv_ps_samplesize; extern consvar_t cv_ps_descriptor; +extern consvar_t cv_director; + + extern consvar_t cv_showtrackaddon; extern consvar_t cv_showspecstuff; diff --git a/src/k_director.c b/src/k_director.c new file mode 100644 index 000000000..0c2cef1d3 --- /dev/null +++ b/src/k_director.c @@ -0,0 +1,371 @@ +// SONIC ROBO BLAST 2 KART +//----------------------------------------------------------------------------- +/// \file k_director.c +/// \brief SRB2kart automatic spectator camera. + +//#include "k_kart.h" +#include "doomdef.h" +#include "g_game.h" +#include "v_video.h" +#include "k_director.h" +#include "d_netcmd.h" +#include "p_local.h" + +#define SWITCHTIME TICRATE * 5 // cooldown between unforced switches +#define BOREDOMTIME 3 * TICRATE / 2 // how long until players considered far apart? +#define TRANSFERTIME TICRATE // how long to delay reaction shots? +#define BREAKAWAYDIST 4000 // how *far* until players considered far apart? +#define WALKBACKDIST 600 // how close should a trailing player be before we switch? +#define PINCHDIST 30000 // how close should the leader be to be considered "end of race"? + +struct directorinfo directorinfo; + +static fixed_t P_ScaleFromMap(fixed_t n, fixed_t scale) +{ + return FixedMul(n, FixedDiv(scale, mapobjectscale)); +} + +void K_InitDirector(void) +{ + INT32 playernum; + + directorinfo.cooldown = SWITCHTIME; + directorinfo.freeze = 0; + directorinfo.attacker = 0; + directorinfo.maxdist = 0; + + for (playernum = 0; playernum < MAXPLAYERS; playernum++) + { + directorinfo.sortedplayers[playernum] = -1; + directorinfo.gap[playernum] = INT32_MAX; + directorinfo.boredom[playernum] = 0; + } +} + +/*static fixed_t K_GetFinishGap(INT32 leader, INT32 follower) +{ + fixed_t dista = players[follower].distancetofinish; + fixed_t distb = players[leader].distancetofinish; + + if (players[follower].position < players[leader].position) + { + return distb - dista; + } + else + { + return dista - distb; + } +}*/ + +static fixed_t K_GetDistanceToFinish(player_t player) +{ + mobj_t *mo; + fixed_t dist = 0; + int maxMoveCount = -1; + int maxAngle = -1; + + if (!(mapheaderinfo[gamemap - 1]->levelflags & LF_SECTIONRACE)) + { + for (mo = waypointcap; mo != NULL; mo = mo->tracer) + { + if (mo->spawnpoint->angle != 0) + continue; + + dist = P_AproxDistance(P_AproxDistance(mo->x - player.mo->x, + mo->y - player.mo->y), + mo->z - player.mo->z) / FRACUNIT; + + break; + } + } + else + { + for (mo = waypointcap; mo != NULL; mo = mo->tracer) + { + if (mo->movecount > maxMoveCount) + maxMoveCount = mo->movecount; + if (mo->spawnpoint->angle > maxAngle) + maxAngle = mo->spawnpoint->angle; + + if (!(mo->movecount == maxMoveCount && mo->spawnpoint->angle == maxAngle)) // sprint maps finishline waypoint is the one with highest movecount AND angle + continue; + + dist = P_AproxDistance(P_AproxDistance(mo->x - player.mo->x, + mo->y - player.mo->y), + mo->z - player.mo->z) / FRACUNIT; + + break; + } + } + + CONS_Printf("dist %d \n", dist); + CONS_Printf("last movecount %d \n", maxMoveCount); + CONS_Printf("last angle %d \n", maxAngle); + + return dist; +} + +static fixed_t K_GetFinishGap(INT32 leader, INT32 follower) +{ + fixed_t dista = K_GetDistanceToFinish(players[follower]); + fixed_t distb = K_GetDistanceToFinish(players[leader]); + + CONS_Printf("dista %d \n", dista); + CONS_Printf("distb %d \n", distb); + + if (players[follower].kartstuff[k_position] < players[leader].kartstuff[k_position]) + { + return distb - dista; + } + else + { + return dista - distb; + } +} + +static void K_UpdateDirectorPositions(void) +{ + INT32 playernum; + INT32 position; + player_t* target; + + memset(directorinfo.sortedplayers, -1, sizeof(directorinfo.sortedplayers)); + + for (playernum = 0; playernum < MAXPLAYERS; playernum++) + { + target = &players[playernum]; + + if (playeringame[playernum] && !target->spectator && target->kartstuff[k_position] > 0) + { + directorinfo.sortedplayers[target->kartstuff[k_position] - 1] = playernum; + } + } + + for (position = 0; position < MAXPLAYERS - 1; position++) + { + directorinfo.gap[position] = INT32_MAX; + + if (directorinfo.sortedplayers[position] == -1 || directorinfo.sortedplayers[position + 1] == -1) + { + continue; + } + + directorinfo.gap[position] = P_ScaleFromMap(K_GetFinishGap(directorinfo.sortedplayers[position], directorinfo.sortedplayers[position + 1]), FRACUNIT); + + if (directorinfo.gap[position] >= BREAKAWAYDIST) + { + directorinfo.boredom[position] = min(BOREDOMTIME * 2, directorinfo.boredom[position] + 1); + } + else if (directorinfo.boredom[position] > 0) + { + directorinfo.boredom[position]--; + } + } + + directorinfo.maxdist = P_ScaleFromMap(K_GetDistanceToFinish(players[directorinfo.sortedplayers[0]]), FRACUNIT); +} + +static boolean K_CanSwitchDirector(void) +{ + /*INT32 *displayplayerp = &displayplayers[0]; + + if (players[*displayplayerp].trickpanel > 0) + { + return false; + }*/ + + if (directorinfo.cooldown > 0) + { + return false; + } + + return true; +} + +static void K_DirectorSwitch(INT32 player, boolean force) +{ + if (P_IsDisplayPlayer(&players[player])) + { + return; + } + + if (players[player].exiting) + { + return; + } + + if (!force && !K_CanSwitchDirector()) + { + return; + } + + G_ResetView(1, player, true); + directorinfo.cooldown = SWITCHTIME; +} + +static void K_DirectorForceSwitch(INT32 player, INT32 time) +{ + if (players[player].exiting) + { + return; + } + + directorinfo.attacker = player; + directorinfo.freeze = time; +} + +void K_DirectorFollowAttack(player_t *player, mobj_t *inflictor, mobj_t *source) +{ + if (!P_IsDisplayPlayer(player)) + { + return; + } + + if (inflictor && inflictor->player) + { + K_DirectorForceSwitch(inflictor->player - players, TRANSFERTIME); + } + else if (source && source->player) + { + K_DirectorForceSwitch(source->player - players, TRANSFERTIME); + } +} + +/*void K_DrawDirectorDebugger(void) +{ + INT32 position; + INT32 leader; + INT32 follower; + INT32 ytxt; + + if (!cv_kartdebugdirector.value) + { + return; + } + + V_DrawThinString(10, 0, V_70TRANS, va("PLACE")); + V_DrawThinString(40, 0, V_70TRANS, va("CONF?")); + V_DrawThinString(80, 0, V_70TRANS, va("GAP")); + V_DrawThinString(120, 0, V_70TRANS, va("BORED")); + V_DrawThinString(150, 0, V_70TRANS, va("COOLDOWN: %d", directorinfo.cooldown)); + V_DrawThinString(230, 0, V_70TRANS, va("MAXDIST: %d", directorinfo.maxdist)); + + for (position = 0; position < MAXPLAYERS - 1; position++) + { + ytxt = 10 * (position + 1); + leader = directorinfo.sortedplayers[position]; + follower = directorinfo.sortedplayers[position + 1]; + + if (leader == -1 || follower == -1) + break; + + V_DrawThinString(10, ytxt, V_70TRANS, va("%d", position)); + V_DrawThinString(20, ytxt, V_70TRANS, va("%d", position + 1)); + + if (players[leader].positiondelay) + { + V_DrawThinString(40, ytxt, V_70TRANS, va("NG")); + } + + V_DrawThinString(80, ytxt, V_70TRANS, va("%d", directorinfo.gap[position])); + + if (directorinfo.boredom[position] >= BOREDOMTIME) + { + V_DrawThinString(120, ytxt, V_70TRANS, va("BORED")); + } + else + { + V_DrawThinString(120, ytxt, V_70TRANS, va("%d", directorinfo.boredom[position])); + } + + V_DrawThinString(150, ytxt, V_70TRANS, va("%s", player_names[leader])); + V_DrawThinString(230, ytxt, V_70TRANS, va("%s", player_names[follower])); + } +}*/ + +void K_UpdateDirector(void) +{ + INT32 *displayplayerp = &displayplayers[0]; + INT32 targetposition; + + if (!cv_director.value) + { + return; + } + + K_UpdateDirectorPositions(); + + if (directorinfo.cooldown > 0) { + directorinfo.cooldown--; + } + + // handle pending forced switches + if (directorinfo.freeze > 0) + { + if (!(--directorinfo.freeze)) + K_DirectorSwitch(directorinfo.attacker, true); + + return; + } + + // if there's only one player left in the list, just switch to that player + if (directorinfo.sortedplayers[0] != -1 && directorinfo.sortedplayers[1] == -1) + { + K_DirectorSwitch(directorinfo.sortedplayers[0], false); + return; + } + + // aaight, time to walk through the standings to find the first interesting pair + // NB: targetposition/sortedplayers is 0-indexed, aiming at the "back half" of a given pair by default. + // we adjust for this when comparing to player->position or when looking at the leading player, Don't Freak Out + for (targetposition = 1; targetposition < MAXPLAYERS; targetposition++) + { + INT32 target; + + // you are out of players, try again + if (directorinfo.sortedplayers[targetposition] == -1) + { + break; + } + + // pair too far apart? try the next one + if (directorinfo.boredom[targetposition - 1] >= BOREDOMTIME) + { + continue; + } + + // pair finished? try the next one + if (players[directorinfo.sortedplayers[targetposition]].exiting) + { + continue; + } + + // don't risk switching away from forward pairs at race end, might miss something! + if (directorinfo.maxdist > PINCHDIST) + { + // if the "next" player is close enough, they should be able to see everyone fine! + // walk back through the standings to find a vantage that gets everyone in frame. + // (also creates a pretty cool effect w/ overtakes at speed) + while (targetposition < MAXPLAYERS && directorinfo.gap[targetposition] < WALKBACKDIST) + { + targetposition++; + } + } + + target = directorinfo.sortedplayers[targetposition]; + + // if we're certain the back half of the pair is actually in this position, try to switch + if (*displayplayerp != target /*&& !players[target].positiondelay*/) + { + K_DirectorSwitch(target, false); + } + + // even if we're not certain, if we're certain we're watching the WRONG player, try to switch + if (players[*displayplayerp].kartstuff[k_position] != targetposition+1 /*&& !players[target].positiondelay*/) + { + K_DirectorSwitch(target, false); + } + + break; + } +} diff --git a/src/k_director.h b/src/k_director.h new file mode 100644 index 000000000..db19fbe8b --- /dev/null +++ b/src/k_director.h @@ -0,0 +1,21 @@ +// SONIC ROBO BLAST 2 KART +//----------------------------------------------------------------------------- +/// \file k_director.h +/// \brief SRB2kart automatic spectator camera. + +extern struct directorinfo +{ + tic_t cooldown; // how long has it been since we last switched? + tic_t freeze; // when nonzero, fixed switch pending, freeze logic! + INT32 attacker; // who to switch to when freeze delay elapses + INT32 maxdist; // how far is the closest player from finishing? + + INT32 sortedplayers[MAXPLAYERS]; // position-1 goes in, player index comes out. + INT32 gap[MAXPLAYERS]; // gap between a given position and their closest pursuer + INT32 boredom[MAXPLAYERS]; // how long has a given position had no credible attackers? +} directorinfo; + +void K_InitDirector(void); +void K_UpdateDirector(void); +void K_DrawDirectorDebugger(void); +void K_DirectorFollowAttack(player_t *player, mobj_t *inflictor, mobj_t *source); \ No newline at end of file diff --git a/src/k_kart.c b/src/k_kart.c index 1ce92dc30..fb955cde2 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -31,6 +31,7 @@ #include "z_zone.h" #include "m_misc.h" #include "m_cond.h" +#include "k_director.h" #include "k_kart.h" #include "f_finale.h" #include "lua_hud.h" // For Lua hud checks @@ -2233,6 +2234,7 @@ void K_SpinPlayer(player_t *player, mobj_t *source, INT32 type, mobj_t *inflicto // PS: Inflictor is unused for all purposes here and is actually only ever relevant to Lua. It may be nil too. boolean force = false; // Used to check if Lua ShouldSpin should get us damaged reguardless of flashtics or heck knows what. UINT8 shouldForce = LUAh_ShouldSpin(player, inflictor, source); + if (P_MobjWasRemoved(player->mo)) return; // mobj was removed (in theory that shouldn't happen) if (shouldForce == 1) @@ -2240,6 +2242,8 @@ void K_SpinPlayer(player_t *player, mobj_t *source, INT32 type, mobj_t *inflicto else if (shouldForce == 2) return; + K_DirectorFollowAttack(player, inflictor, source); + if (!trapitem && G_BattleGametype()) { if (K_IsPlayerWanted(player)) @@ -2490,6 +2494,8 @@ void K_ExplodePlayer(player_t *player, mobj_t *source, mobj_t *inflictor) // A b else if (shouldForce == 2) return; + K_DirectorFollowAttack(player, inflictor, source); + if (G_BattleGametype()) { if (K_IsPlayerWanted(player)) diff --git a/src/p_setup.c b/src/p_setup.c index b5c92bdbc..f27816c07 100644 --- a/src/p_setup.c +++ b/src/p_setup.c @@ -82,6 +82,7 @@ #include "p_slopes.h" // SRB2Kart +#include "k_director.h" // K_InitDirector #include "k_kart.h" // @@ -2956,6 +2957,8 @@ boolean P_SetupLevel(boolean skipprecip) G_BeginRecording(); //this has to move here, since dedicated servers dont run got_mapcmd } + K_InitDirector(); + wantedcalcdelay = wantedfrequency*2; indirectitemcooldown = 0; hyubgone = 0; diff --git a/src/p_tick.c b/src/p_tick.c index af187bbea..6bf32f1c3 100644 --- a/src/p_tick.c +++ b/src/p_tick.c @@ -23,6 +23,7 @@ #include "m_random.h" #include "lua_script.h" #include "lua_hook.h" +#include "k_director.h" #include "k_kart.h" #include "i_system.h" #include "r_main.h" @@ -589,6 +590,8 @@ void P_Ticker(boolean run) PS_STOP_TIMING(ps_lua_postthinkframe_time); } + K_UpdateDirector(); + // Always move the camera. P_RunChaseCameras(); From 3f412373bc155ac616dbe5d8e28448943ab71f28 Mon Sep 17 00:00:00 2001 From: Alug Date: Sun, 21 Jul 2024 14:42:17 +0200 Subject: [PATCH 02/11] fix crash if everyone spectates --- src/k_director.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/k_director.c b/src/k_director.c index 0c2cef1d3..54b1c1d60 100644 --- a/src/k_director.c +++ b/src/k_director.c @@ -98,10 +98,6 @@ static fixed_t K_GetDistanceToFinish(player_t player) } } - CONS_Printf("dist %d \n", dist); - CONS_Printf("last movecount %d \n", maxMoveCount); - CONS_Printf("last angle %d \n", maxAngle); - return dist; } @@ -110,9 +106,6 @@ static fixed_t K_GetFinishGap(INT32 leader, INT32 follower) fixed_t dista = K_GetDistanceToFinish(players[follower]); fixed_t distb = K_GetDistanceToFinish(players[leader]); - CONS_Printf("dista %d \n", dista); - CONS_Printf("distb %d \n", distb); - if (players[follower].kartstuff[k_position] < players[leader].kartstuff[k_position]) { return distb - dista; @@ -162,6 +155,12 @@ static void K_UpdateDirectorPositions(void) } } + if (directorinfo.sortedplayers[0] == -1) + { + directorinfo.maxdist = -1; + return; + } + directorinfo.maxdist = P_ScaleFromMap(K_GetDistanceToFinish(players[directorinfo.sortedplayers[0]]), FRACUNIT); } From b94776063f805cc58ced582b9dc884774930cc90 Mon Sep 17 00:00:00 2001 From: Alug Date: Sun, 21 Jul 2024 14:42:48 +0200 Subject: [PATCH 03/11] only update director if consoleplayers specs or in demo playback dont need to update this ever if we dont even use it lol --- src/p_tick.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/p_tick.c b/src/p_tick.c index 6bf32f1c3..f61484a1a 100644 --- a/src/p_tick.c +++ b/src/p_tick.c @@ -590,7 +590,8 @@ void P_Ticker(boolean run) PS_STOP_TIMING(ps_lua_postthinkframe_time); } - K_UpdateDirector(); + if (gamestate == GS_LEVEL && (!playeringame[consoleplayer] || players[consoleplayer].spectator || demo.playback)) + K_UpdateDirector(); // Always move the camera. P_RunChaseCameras(); From bfcb906b1270261cb059c0f2b29ed91be27329cb Mon Sep 17 00:00:00 2001 From: Alug Date: Sun, 21 Jul 2024 15:11:01 +0200 Subject: [PATCH 04/11] add stuff for directordebugger i forgor --- src/d_netcmd.c | 8 ++++---- src/d_netcmd.h | 3 +-- src/k_director.c | 8 ++++---- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/src/d_netcmd.c b/src/d_netcmd.c index 4f5717106..b864cb9d7 100644 --- a/src/d_netcmd.c +++ b/src/d_netcmd.c @@ -554,9 +554,6 @@ consvar_t cv_perfstats = {"perfstats", "Off", CV_CALL, perfstats_cons_t, PS_Perf consvar_t cv_ps_thinkframe_page = {"ps_thinkframe_page", "1", CV_CALL, CV_Natural, PS_ThinkFrame_Page_OnChange, 0, NULL, NULL, 0, 0, NULL}; -consvar_t cv_director = {"director", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; - - static CV_PossibleValue_t ps_samplesize_cons_t[] = { {1, "MIN"}, {1000, "MAX"}, {0, NULL}}; consvar_t cv_ps_samplesize = {"ps_samplesize", "1", CV_CALL, ps_samplesize_cons_t, PS_SampleSize_OnChange, 0, NULL, NULL, 0, 0, NULL}; @@ -564,6 +561,9 @@ static CV_PossibleValue_t ps_descriptor_cons_t[] = { {1, "Average"}, {2, "SD"}, {3, "Minimum"}, {4, "Maximum"}, {0, NULL}}; consvar_t cv_ps_descriptor = {"ps_descriptor", "Average", 0, ps_descriptor_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}; +consvar_t cv_director = {"director", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; +consvar_t cv_kartdebugdirector = {"director", "Off", 0, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; + consvar_t cv_showtrackaddon = {"showtrackaddon", "Yes", CV_SAVE, CV_YesNo, NULL, 0, NULL, NULL, 0, 0, NULL}; static CV_PossibleValue_t skinselectmenu_t[] = {{SKINMENUTYPE_SCROLL, "Scroll"}, {SKINMENUTYPE_2D, "2d"}, {SKINMENUTYPE_GRID, "Grid"}, {SKINMENUTYPE_EXTENDED, "Extended"}, {0, NULL}}; @@ -983,7 +983,7 @@ void D_RegisterClientCommands(void) CV_RegisterVar(&cv_showviewpointtext); CV_RegisterVar(&cv_director); - + CV_RegisterVar(&cv_kartdebugdirector); CV_RegisterVar(&cv_luaimmersion); CV_RegisterVar(&cv_fakelocalskin); diff --git a/src/d_netcmd.h b/src/d_netcmd.h index e3d306315..ad4789313 100644 --- a/src/d_netcmd.h +++ b/src/d_netcmd.h @@ -201,8 +201,7 @@ extern consvar_t cv_ps_thinkframe_page; extern consvar_t cv_ps_samplesize; extern consvar_t cv_ps_descriptor; -extern consvar_t cv_director; - +extern consvar_t cv_director, cv_kartdebugdirector; extern consvar_t cv_showtrackaddon; diff --git a/src/k_director.c b/src/k_director.c index 54b1c1d60..a1c9f57c1 100644 --- a/src/k_director.c +++ b/src/k_director.c @@ -230,7 +230,7 @@ void K_DirectorFollowAttack(player_t *player, mobj_t *inflictor, mobj_t *source) } } -/*void K_DrawDirectorDebugger(void) +void K_DrawDirectorDebugger(void) { INT32 position; INT32 leader; @@ -261,10 +261,10 @@ void K_DirectorFollowAttack(player_t *player, mobj_t *inflictor, mobj_t *source) V_DrawThinString(10, ytxt, V_70TRANS, va("%d", position)); V_DrawThinString(20, ytxt, V_70TRANS, va("%d", position + 1)); - if (players[leader].positiondelay) + /*if (players[leader].positiondelay) { V_DrawThinString(40, ytxt, V_70TRANS, va("NG")); - } + }*/ V_DrawThinString(80, ytxt, V_70TRANS, va("%d", directorinfo.gap[position])); @@ -280,7 +280,7 @@ void K_DirectorFollowAttack(player_t *player, mobj_t *inflictor, mobj_t *source) V_DrawThinString(150, ytxt, V_70TRANS, va("%s", player_names[leader])); V_DrawThinString(230, ytxt, V_70TRANS, va("%s", player_names[follower])); } -}*/ +} void K_UpdateDirector(void) { From 56a919eb606cb9ff922cf0e484eb7834f31a80fd Mon Sep 17 00:00:00 2001 From: Alug Date: Sun, 21 Jul 2024 15:11:28 +0200 Subject: [PATCH 05/11] oops --- src/d_netcmd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/d_netcmd.c b/src/d_netcmd.c index b864cb9d7..409328f0c 100644 --- a/src/d_netcmd.c +++ b/src/d_netcmd.c @@ -562,7 +562,7 @@ static CV_PossibleValue_t ps_descriptor_cons_t[] = { consvar_t cv_ps_descriptor = {"ps_descriptor", "Average", 0, ps_descriptor_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_director = {"director", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; -consvar_t cv_kartdebugdirector = {"director", "Off", 0, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; +consvar_t cv_kartdebugdirector = {"debugdirector", "Off", 0, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_showtrackaddon = {"showtrackaddon", "Yes", CV_SAVE, CV_YesNo, NULL, 0, NULL, NULL, 0, 0, NULL}; From 228252ee6f6b6d62f6f825cfcc58ba5f54d8dc98 Mon Sep 17 00:00:00 2001 From: Indev Date: Sun, 21 Jul 2024 16:11:21 +0300 Subject: [PATCH 06/11] Add bind for director toggle --- src/g_game.c | 5 +++++ src/g_input.c | 1 + src/g_input.h | 1 + src/m_menu.c | 1 + 4 files changed, 8 insertions(+) diff --git a/src/g_game.c b/src/g_game.c index 203b1aba5..ab7b14e86 100644 --- a/src/g_game.c +++ b/src/g_game.c @@ -1935,6 +1935,11 @@ boolean G_Responder(event_t *ev) COM_ImmedExecute("changeteam4 spectator"); } } + if (ev->data1 == gamecontrol[gc_director][0] + || ev->data1 == gamecontrol[gc_director][1]) + { + COM_ImmedExecute("add director 1"); + } return true; diff --git a/src/g_input.c b/src/g_input.c index b6e631309..536ea0c83 100644 --- a/src/g_input.c +++ b/src/g_input.c @@ -812,6 +812,7 @@ static const char *gamecontrolname[num_gamecontrols] = "custom1", "custom2", "custom3", + "director", }; #define NUMKEYNAMES (sizeof (keynames)/sizeof (keyname_t)) diff --git a/src/g_input.h b/src/g_input.h index dac8a3e23..635e1f64b 100644 --- a/src/g_input.h +++ b/src/g_input.h @@ -98,6 +98,7 @@ typedef enum gc_custom1, // Lua scriptable gc_custom2, // Lua scriptable gc_custom3, // Lua scriptable + gc_director, num_gamecontrols } gamecontrols_e; diff --git a/src/m_menu.c b/src/m_menu.c index 8f884d05c..f824f379b 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -1198,6 +1198,7 @@ static menuitem_t OP_AllControlsMenu[] = {IT_CONTROL, NULL, "Look Up", M_ChangeControl, gc_lookup }, {IT_CONTROL, NULL, "Look Down", M_ChangeControl, gc_lookdown }, {IT_CONTROL, NULL, "Center View", M_ChangeControl, gc_centerview }, + {IT_CONTROL, NULL, "Toggle Director", M_ChangeControl, gc_director }, {IT_HEADER, NULL, "Custom Lua Actions", NULL, 0}, {IT_SPACE, NULL, NULL, NULL, 0}, {IT_CONTROL, NULL, "Custom Action 1", M_ChangeControl, gc_custom1 }, From 43e3d07acb2d596a46aeed8578ed45e381952fe8 Mon Sep 17 00:00:00 2001 From: Alug Date: Sun, 21 Jul 2024 15:45:53 +0200 Subject: [PATCH 07/11] fix cmake --- src/CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 025365822..258ff882c 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -167,6 +167,7 @@ set(SRB2_CORE_GAME_SOURCES p_telept.c p_tick.c p_user.c + k_director.c k_kart.c i_time.c @@ -180,6 +181,7 @@ set(SRB2_CORE_GAME_SOURCES p_slopes.h p_spec.h p_tick.h + k_director.h k_kart.h ) From 60e933eb001da251ef0d5afac2a76cf7d52323b8 Mon Sep 17 00:00:00 2001 From: Indev Date: Sun, 21 Jul 2024 17:03:15 +0300 Subject: [PATCH 08/11] Add director hud indicator --- src/st_stuff.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/st_stuff.c b/src/st_stuff.c index 681f2d920..715ba53ae 100644 --- a/src/st_stuff.c +++ b/src/st_stuff.c @@ -796,6 +796,15 @@ static void ST_overlayDrawer(void) // Countdown timer for Race Mode // ...moved to k_kart.c so we can take advantage of the LAPS_Y value + if (demo.playback || !P_IsLocalPlayer(stplyr)) + { + char directortext[20] = {0}; + + snprintf(directortext, 20, "Director: %s", cv_director.value ? "On" : "Off"); + + V_DrawString(1, BASEVIDHEIGHT-8-1, V_SNAPTOLEFT|V_SNAPTOBOTTOM|V_HUDTRANSHALF|V_ALLOWLOWERCASE, directortext); + } + if (cv_showviewpointtext.value) { if (!(multiplayer && demo.playback)) From 7072332ab736c03063883c03f50b52456ce8ff9a Mon Sep 17 00:00:00 2001 From: Alug Date: Sun, 21 Jul 2024 19:35:08 +0200 Subject: [PATCH 09/11] clean director up a little toggling director now resets cooldown so it switches players immediately also consolidated condition to be active and ensure DirectorFollowAttack doesent always run when it doesent need to be --- src/g_game.c | 3 ++- src/k_director.c | 22 +++++++++++++++++++++- src/k_director.h | 3 ++- src/p_tick.c | 3 +-- 4 files changed, 26 insertions(+), 5 deletions(-) diff --git a/src/g_game.c b/src/g_game.c index ab7b14e86..552cedfd7 100644 --- a/src/g_game.c +++ b/src/g_game.c @@ -50,6 +50,7 @@ #include "b_bot.h" #include "m_cond.h" // condition sets #include "md5.h" // demo checksums +#include "k_director.h" // SRB2kart #include "k_kart.h" // SRB2kart #include "r_fps.h" // frame interpolation/uncapped @@ -1938,7 +1939,7 @@ boolean G_Responder(event_t *ev) if (ev->data1 == gamecontrol[gc_director][0] || ev->data1 == gamecontrol[gc_director][1]) { - COM_ImmedExecute("add director 1"); + K_ToggleDirector(); } return true; diff --git a/src/k_director.c b/src/k_director.c index a1c9f57c1..01b2ff001 100644 --- a/src/k_director.c +++ b/src/k_director.c @@ -25,6 +25,11 @@ static fixed_t P_ScaleFromMap(fixed_t n, fixed_t scale) return FixedMul(n, FixedDiv(scale, mapobjectscale)); } +static boolean K_DirectorIsEnabled(void) +{ + return cv_director.value && (gamestate == GS_LEVEL && (!playeringame[consoleplayer] || players[consoleplayer].spectator || demo.playback)); +} + void K_InitDirector(void) { INT32 playernum; @@ -215,6 +220,11 @@ static void K_DirectorForceSwitch(INT32 player, INT32 time) void K_DirectorFollowAttack(player_t *player, mobj_t *inflictor, mobj_t *source) { + if (!K_DirectorIsEnabled()) + { + return; + } + if (!P_IsDisplayPlayer(player)) { return; @@ -287,7 +297,7 @@ void K_UpdateDirector(void) INT32 *displayplayerp = &displayplayers[0]; INT32 targetposition; - if (!cv_director.value) + if (!K_DirectorIsEnabled()) { return; } @@ -368,3 +378,13 @@ void K_UpdateDirector(void) break; } } + +void K_ToggleDirector(void) +{ + if (!K_DirectorIsEnabled()) + { + directorinfo.cooldown = 0; // switch immediately + } + + COM_ImmedExecute("add director 1"); +} diff --git a/src/k_director.h b/src/k_director.h index db19fbe8b..8842c7b8e 100644 --- a/src/k_director.h +++ b/src/k_director.h @@ -18,4 +18,5 @@ extern struct directorinfo void K_InitDirector(void); void K_UpdateDirector(void); void K_DrawDirectorDebugger(void); -void K_DirectorFollowAttack(player_t *player, mobj_t *inflictor, mobj_t *source); \ No newline at end of file +void K_DirectorFollowAttack(player_t *player, mobj_t *inflictor, mobj_t *source); +void K_ToggleDirector(void); diff --git a/src/p_tick.c b/src/p_tick.c index f61484a1a..6bf32f1c3 100644 --- a/src/p_tick.c +++ b/src/p_tick.c @@ -590,8 +590,7 @@ void P_Ticker(boolean run) PS_STOP_TIMING(ps_lua_postthinkframe_time); } - if (gamestate == GS_LEVEL && (!playeringame[consoleplayer] || players[consoleplayer].spectator || demo.playback)) - K_UpdateDirector(); + K_UpdateDirector(); // Always move the camera. P_RunChaseCameras(); From c447f25e0a5d268dac842d0a64c593338883a035 Mon Sep 17 00:00:00 2001 From: Alug Date: Mon, 22 Jul 2024 12:57:11 +0200 Subject: [PATCH 10/11] add missing copyright stuff to k_director --- src/k_director.c | 7 +++++++ src/k_director.h | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/src/k_director.c b/src/k_director.c index 01b2ff001..d57ffbb8e 100644 --- a/src/k_director.c +++ b/src/k_director.c @@ -1,5 +1,12 @@ // SONIC ROBO BLAST 2 KART //----------------------------------------------------------------------------- +// Copyright (C) 2024 by AJ "Tyron" Martinez. +// Copyright (C) 2024 by James Robert Roman. +// +// This program is free software distributed under the +// terms of the GNU General Public License, version 2. +// See the 'LICENSE' file for more details. +//----------------------------------------------------------------------------- /// \file k_director.c /// \brief SRB2kart automatic spectator camera. diff --git a/src/k_director.h b/src/k_director.h index 8842c7b8e..7218cc7e3 100644 --- a/src/k_director.h +++ b/src/k_director.h @@ -1,5 +1,12 @@ // SONIC ROBO BLAST 2 KART //----------------------------------------------------------------------------- +// Copyright (C) 2024 by AJ "Tyron" Martinez. +// Copyright (C) 2024 by James Robert Roman. +// +// This program is free software distributed under the +// terms of the GNU General Public License, version 2. +// See the 'LICENSE' file for more details. +//----------------------------------------------------------------------------- /// \file k_director.h /// \brief SRB2kart automatic spectator camera. From 26eedc334118fb02bac2785fe752cba99f70c358 Mon Sep 17 00:00:00 2001 From: Alug Date: Fri, 26 Jul 2024 20:41:26 +0200 Subject: [PATCH 11/11] small change to director for battle --- src/k_director.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/k_director.c b/src/k_director.c index d57ffbb8e..eb4e458ed 100644 --- a/src/k_director.c +++ b/src/k_director.c @@ -27,6 +27,11 @@ struct directorinfo directorinfo; +static boolean race_rules() +{ + return gametype = GT_RACE; +} + static fixed_t P_ScaleFromMap(fixed_t n, fixed_t scale) { return FixedMul(n, FixedDiv(scale, mapobjectscale)); @@ -325,7 +330,9 @@ void K_UpdateDirector(void) } // if there's only one player left in the list, just switch to that player - if (directorinfo.sortedplayers[0] != -1 && directorinfo.sortedplayers[1] == -1) + if (directorinfo.sortedplayers[0] != -1 && (directorinfo.sortedplayers[1] == -1 || + // TODO: Battle; I just threw this together quick. Focus on leader. + !race_rules())) { K_DirectorSwitch(directorinfo.sortedplayers[0], false); return;