mirror of
https://github.com/KartKrewDev/RingRacers.git
synced 2025-10-30 08:01:28 +00:00
Merge branch 'vector-fps-storage' into 'master'
Use std::vector for r_fps storage See merge request KartKrew/Kart!2478
This commit is contained in:
AJ Martinez
commit
3c38cabaa2
1 changed files with 29 additions and 110 deletions
139
src/r_fps.cpp
139
src/r_fps.cpp
|
|
@ -15,14 +15,15 @@
|
|||
|
||||
#include "r_fps.h"
|
||||
|
||||
#include <vector>
|
||||
|
||||
#include "p_mobj.h"
|
||||
#include "r_main.h"
|
||||
#include "g_game.h"
|
||||
#include "i_video.h"
|
||||
#include "r_plane.h"
|
||||
#include "p_spec.h"
|
||||
#include "r_state.h"
|
||||
#include "z_zone.h"
|
||||
#include "console.h" // con_startup_loadprogress
|
||||
#include "i_time.h"
|
||||
|
||||
UINT32 R_GetFramerateCap(void)
|
||||
|
|
@ -67,10 +68,7 @@ viewvars_t *newview = &pview_new[0];
|
|||
|
||||
enum viewcontext_e viewcontext = VIEWCONTEXT_PLAYER1;
|
||||
|
||||
static levelinterpolator_t **levelinterpolators;
|
||||
static size_t levelinterpolators_len;
|
||||
static size_t levelinterpolators_size;
|
||||
|
||||
static std::vector<levelinterpolator_t> levelinterpolators;
|
||||
|
||||
static fixed_t R_LerpFixed(fixed_t from, fixed_t to, fixed_t frac)
|
||||
{
|
||||
|
|
@ -324,42 +322,9 @@ void R_InterpolatePrecipMobjState(precipmobj_t *mobj, fixed_t frac, interpmobjst
|
|||
out->angle = R_LerpAngle(mobj->old_angle, mobj->angle, frac);
|
||||
}
|
||||
|
||||
static void AddInterpolator(levelinterpolator_t* interpolator)
|
||||
{
|
||||
if (levelinterpolators_len >= levelinterpolators_size)
|
||||
{
|
||||
if (levelinterpolators_size == 0)
|
||||
{
|
||||
levelinterpolators_size = 128;
|
||||
}
|
||||
else
|
||||
{
|
||||
levelinterpolators_size *= 2;
|
||||
}
|
||||
|
||||
levelinterpolators = static_cast<levelinterpolator_t**>(Z_Realloc(
|
||||
(void*) levelinterpolators,
|
||||
sizeof(levelinterpolator_t*) * levelinterpolators_size,
|
||||
PU_LEVEL,
|
||||
NULL
|
||||
));
|
||||
}
|
||||
|
||||
levelinterpolators[levelinterpolators_len] = interpolator;
|
||||
levelinterpolators_len += 1;
|
||||
}
|
||||
|
||||
static levelinterpolator_t *CreateInterpolator(levelinterpolator_type_e type, thinker_t *thinker)
|
||||
{
|
||||
levelinterpolator_t *ret = (levelinterpolator_t*) Z_Calloc(
|
||||
sizeof(levelinterpolator_t), PU_LEVEL, NULL
|
||||
);
|
||||
|
||||
ret->type = type;
|
||||
ret->thinker = thinker;
|
||||
|
||||
AddInterpolator(ret);
|
||||
|
||||
auto* ret = &levelinterpolators.emplace_back(levelinterpolator_t { type, thinker });
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
|
@ -437,9 +402,7 @@ void R_CreateInterpolator_DynSlope(thinker_t *thinker, pslope_t *slope)
|
|||
|
||||
void R_InitializeLevelInterpolators(void)
|
||||
{
|
||||
levelinterpolators_len = 0;
|
||||
levelinterpolators_size = 0;
|
||||
levelinterpolators = NULL;
|
||||
levelinterpolators.clear();
|
||||
}
|
||||
|
||||
static void UpdateLevelInterpolatorState(levelinterpolator_t *interp)
|
||||
|
|
@ -491,40 +454,32 @@ static void UpdateLevelInterpolatorState(levelinterpolator_t *interp)
|
|||
|
||||
void R_UpdateLevelInterpolators(void)
|
||||
{
|
||||
size_t i;
|
||||
|
||||
for (i = 0; i < levelinterpolators_len; i++)
|
||||
for (levelinterpolator_t& interp : levelinterpolators)
|
||||
{
|
||||
levelinterpolator_t *interp = levelinterpolators[i];
|
||||
|
||||
UpdateLevelInterpolatorState(interp);
|
||||
UpdateLevelInterpolatorState(&interp);
|
||||
}
|
||||
}
|
||||
|
||||
void R_ClearLevelInterpolatorState(thinker_t *thinker)
|
||||
{
|
||||
size_t i;
|
||||
|
||||
for (i = 0; i < levelinterpolators_len; i++)
|
||||
for (levelinterpolator_t& interp : levelinterpolators)
|
||||
{
|
||||
levelinterpolator_t *interp = levelinterpolators[i];
|
||||
|
||||
if (interp->thinker == thinker)
|
||||
if (interp.thinker == thinker)
|
||||
{
|
||||
// Do it twice to make the old state match the new
|
||||
UpdateLevelInterpolatorState(interp);
|
||||
UpdateLevelInterpolatorState(interp);
|
||||
UpdateLevelInterpolatorState(&interp);
|
||||
UpdateLevelInterpolatorState(&interp);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void R_ApplyLevelInterpolators(fixed_t frac)
|
||||
{
|
||||
size_t i, ii;
|
||||
size_t ii;
|
||||
|
||||
for (i = 0; i < levelinterpolators_len; i++)
|
||||
for (levelinterpolator_t& i : levelinterpolators)
|
||||
{
|
||||
levelinterpolator_t *interp = levelinterpolators[i];
|
||||
levelinterpolator_t* interp = &i;
|
||||
|
||||
switch (interp->type)
|
||||
{
|
||||
|
|
@ -575,11 +530,11 @@ void R_ApplyLevelInterpolators(fixed_t frac)
|
|||
|
||||
void R_RestoreLevelInterpolators(void)
|
||||
{
|
||||
size_t i, ii;
|
||||
size_t ii;
|
||||
|
||||
for (i = 0; i < levelinterpolators_len; i++)
|
||||
for (levelinterpolator_t& i : levelinterpolators)
|
||||
{
|
||||
levelinterpolator_t *interp = levelinterpolators[i];
|
||||
levelinterpolator_t* interp = &i;
|
||||
|
||||
switch (interp->type)
|
||||
{
|
||||
|
|
@ -632,51 +587,27 @@ void R_DestroyLevelInterpolators(thinker_t *thinker)
|
|||
{
|
||||
size_t i;
|
||||
|
||||
for (i = 0; i < levelinterpolators_len; i++)
|
||||
for (i = 0; i < levelinterpolators.size(); i++)
|
||||
{
|
||||
levelinterpolator_t *interp = levelinterpolators[i];
|
||||
levelinterpolator_t* interp = &levelinterpolators[i];
|
||||
|
||||
if (interp->thinker == thinker)
|
||||
{
|
||||
// Swap the tail of the level interpolators to this spot
|
||||
levelinterpolators[i] = levelinterpolators[levelinterpolators_len - 1];
|
||||
levelinterpolators_len -= 1;
|
||||
levelinterpolators[i] = *levelinterpolators.rbegin();
|
||||
|
||||
Z_Free(interp);
|
||||
i -= 1;
|
||||
levelinterpolators.pop_back();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static mobj_t **interpolated_mobjs = NULL;
|
||||
static size_t interpolated_mobjs_len = 0;
|
||||
static size_t interpolated_mobjs_capacity = 0;
|
||||
static std::vector<mobj_t*> interpolated_mobjs;
|
||||
|
||||
// NOTE: This will NOT check that the mobj has already been added, for perf
|
||||
// reasons.
|
||||
void R_AddMobjInterpolator(mobj_t *mobj)
|
||||
{
|
||||
if (interpolated_mobjs_len >= interpolated_mobjs_capacity)
|
||||
{
|
||||
if (interpolated_mobjs_capacity == 0)
|
||||
{
|
||||
interpolated_mobjs_capacity = 256;
|
||||
}
|
||||
else
|
||||
{
|
||||
interpolated_mobjs_capacity *= 2;
|
||||
}
|
||||
|
||||
interpolated_mobjs = static_cast<mobj_t**>(Z_Realloc(
|
||||
interpolated_mobjs,
|
||||
sizeof(mobj_t *) * interpolated_mobjs_capacity,
|
||||
PU_LEVEL,
|
||||
NULL
|
||||
));
|
||||
}
|
||||
|
||||
interpolated_mobjs[interpolated_mobjs_len] = mobj;
|
||||
interpolated_mobjs_len += 1;
|
||||
interpolated_mobjs.push_back(mobj);
|
||||
|
||||
R_ResetMobjInterpolationState(mobj);
|
||||
mobj->resetinterp = true;
|
||||
|
|
@ -684,18 +615,12 @@ void R_AddMobjInterpolator(mobj_t *mobj)
|
|||
|
||||
void R_RemoveMobjInterpolator(mobj_t *mobj)
|
||||
{
|
||||
size_t i;
|
||||
|
||||
if (interpolated_mobjs_len == 0) return;
|
||||
|
||||
for (i = 0; i < interpolated_mobjs_len; i++)
|
||||
for (size_t i = 0; i < interpolated_mobjs.size(); i++)
|
||||
{
|
||||
if (interpolated_mobjs[i] == mobj)
|
||||
{
|
||||
interpolated_mobjs[i] = interpolated_mobjs[
|
||||
interpolated_mobjs_len - 1
|
||||
];
|
||||
interpolated_mobjs_len -= 1;
|
||||
interpolated_mobjs[i] = *interpolated_mobjs.rbegin();
|
||||
interpolated_mobjs.pop_back();
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
|
@ -703,19 +628,13 @@ void R_RemoveMobjInterpolator(mobj_t *mobj)
|
|||
|
||||
void R_InitMobjInterpolators(void)
|
||||
{
|
||||
// apparently it's not acceptable to free something already unallocated
|
||||
// Z_Free(interpolated_mobjs);
|
||||
interpolated_mobjs = NULL;
|
||||
interpolated_mobjs_len = 0;
|
||||
interpolated_mobjs_capacity = 0;
|
||||
interpolated_mobjs.clear();
|
||||
}
|
||||
|
||||
void R_UpdateMobjInterpolators(void)
|
||||
{
|
||||
size_t i;
|
||||
for (i = 0; i < interpolated_mobjs_len; i++)
|
||||
for (mobj_t* mobj : interpolated_mobjs)
|
||||
{
|
||||
mobj_t *mobj = interpolated_mobjs[i];
|
||||
if (!P_MobjWasRemoved(mobj))
|
||||
R_ResetMobjInterpolationState(mobj);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue