zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-06-03 10:41:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

Replace separate timer implementations in SDL and Winlayer with a shared implementation based on std::chrono

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@7976 1a8010ca-5511-0410-912e-c29ae57300e0

# Conflicts:
#	platform/Windows/build.vcxproj
#	platform/Windows/build.vcxproj.filters
#	source/build/src/mdsprite.cpp
This commit is contained in:
terminx 2019-08-13 14:44:16 +00:00 • committed by Christoph Oelckers
parent 55e3188afb
commit 04811f21f4
12 changed files with 91 additions and 345 deletions
Download patch file Download diff file Expand all files Collapse all files

6
source/build/src/mdsprite.cpp
View file

@ -92,8 +92,6 @@ static mdmodel_t *mdload(const char *);
static void mdfree(mdmodel_t *);
int32_t globalnoeffect=0;
extern int32_t timerticspersec;
void freeallmodels()
{
int32_t i;
@ -1010,7 +1008,7 @@ void updateanimation(md2model_t *m, tspriteptr_t tspr, uint8_t lpal)
fps = smooth->mdsmooth ? Blrintf((1.0f / ((float)tile2model[tile].smoothduration * (1.f / (float)UINT16_MAX))) * 66.f)
: anim ? anim->fpssc : 1;
i = (mdtims - sprext->mdanimtims) * ((fps * timerticspersec) / 120);
i = (mdtims - sprext->mdanimtims) * ((fps * timerGetRate()) / 120);
j = (smooth->mdsmooth || !anim) ? 65536 : ((anim->endframe + 1 - anim->startframe) << 16);
@ -1018,7 +1016,7 @@ void updateanimation(md2model_t *m, tspriteptr_t tspr, uint8_t lpal)
if (i < 0) { i = 0; sprext->mdanimtims = mdtims; }
//compare with j*2 instead of j to ensure i stays > j-65536 for MDANIM_ONESHOT
if (anim && (i >= j+j) && (fps) && !mdpause) //Keep mdanimtims close to mdtims to avoid the use of MOD
sprext->mdanimtims += j/((fps*timerticspersec)/120);
sprext->mdanimtims += j/((fps*timerGetRate())/120);
k = i;