zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2024-11-16 09:21:36 +00:00
Code Issues Projects Releases Packages Wiki Activity

Optimize .anm playback; update frames on screen at the .anm's framerate instead of blindly looping as fast as possible

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@4626 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2014-09-30 04:15:17 +00:00
parent 423b87a707
commit 9839802457
1 changed files with 31 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
polymer/eduke32/source/anim.c
View file

@ -20,6 +20,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
//-------------------------------------------------------------------------
#include "baselayer.h"
#include "renderlayer.h"
#include "duke3d.h"
#include "animlib.h"
#include "mouse.h"
@ -381,7 +383,7 @@ int32_t G_PlayAnim(const char *fn, char t)
kread(handle, animbuf[t-1], length);
kclose(handle);
if (ANIM_LoadAnim(animbuf[t-1], length) < 0)
if (ANIM_LoadAnim(animbuf[t-1], length) < 0 || (numframes = ANIM_NumFrames()) <= 0)
{
// XXX: ANM_LoadAnim() still checks less than the bare minimum,
// e.g. ANM file could still be too small and not contain any frames.
@ -389,8 +391,6 @@ int32_t G_PlayAnim(const char *fn, char t)
goto end_anim;
}
numframes = ANIM_NumFrames();
basepaltable[ANIMPAL] = ANIM_GetPalette();
//setpalette(0L,256L,tempbuf);
@ -404,7 +404,9 @@ int32_t G_PlayAnim(const char *fn, char t)
ototalclock = totalclock + 10;
for (i=1; i<numframes; i++)
i = 1;
do
{
if (i > 4 && totalclock > frametime + 60)
{
@ -412,35 +414,35 @@ int32_t G_PlayAnim(const char *fn, char t)
goto end_anim_restore_gl;
}
frametime = totalclock;
G_HandleAsync();
waloff[TILE_ANIM] = (intptr_t)ANIM_DrawFrame(i);
if (totalclock < ototalclock-1)
continue;
waloff[TILE_ANIM] = (intptr_t) ANIM_DrawFrame(i);
invalidatetile(TILE_ANIM, 0, 1<<4); // JBF 20031228
I_ClearAllInput();
while (totalclock < ototalclock)
if (I_CheckAllInput())
{
G_HandleAsync();
if (I_CheckAllInput())
{
running = 0;
goto end_anim_restore_gl;
}
if (g_restorePalette == 1)
{
P_SetGamePalette(g_player[myconnectindex].ps, ANIMPAL, 0);
g_restorePalette = 0;
}
clearallviews(0);
rotatesprite_fs(0<<16,0<<16,65536L,512,TILE_ANIM,0,0,2+4+8+16+64+(ud.bgstretch?1024:0));
nextpage();
running = 0;
goto end_anim_restore_gl;
}
if (g_restorePalette == 1)
{
P_SetGamePalette(g_player[myconnectindex].ps, ANIMPAL, 0);
g_restorePalette = 0;
}
frametime = totalclock;
clearallviews(0);
rotatesprite_fs(0<<16, 0<<16, 65536L, 512, TILE_ANIM, 0, 0, 2+4+8+16+64+(ud.bgstretch ? 1024 : 0));
nextpage();
I_ClearAllInput();
if (t == 10) ototalclock += 14;
else if (t == 9) ototalclock += 10;
else if (t == 7) ototalclock += 18;
@ -459,7 +461,8 @@ int32_t G_PlayAnim(const char *fn, char t)
else if (t == 6) first4animsounds(i);
else if (t == 5) logoanimsounds(i);
else if (t < 4) endanimsounds(i);
}
i++;
} while (i < numframes);
end_anim_restore_gl:
#ifdef USE_OPENGL