zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-25 11:10:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

Smooth out the loading bar so that all percentage increments are displayed for at least a couple of frames each, and remove the "loaded x/x textures" message on Android.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@4999 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2015-02-11 05:22:55 +00:00
parent 8cc7f240d8
commit a035d32e71
1 changed files with 21 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
polymer/eduke32/source/premap.c
View file

@ -372,7 +372,9 @@ static void G_DoLoadScreen(const char *statustext, int32_t percent)
menutext(160,90+16+8,0,0,MapInfo[(ud.volume_number*MAXLEVELS) + ud.level_number].name); menutext(160,90+16+8,0,0,MapInfo[(ud.volume_number*MAXLEVELS) + ud.level_number].name);
} }
#ifndef EDUKE32_TOUCH_DEVICES
if (statustext) gametext(160,180,statustext,0,2+8+16); if (statustext) gametext(160,180,statustext,0,2+8+16);
#endif
if (percent != -1) if (percent != -1)
{ {
@ -482,6 +484,8 @@ void G_CacheMapData(void)
tc = totalclock; tc = totalclock;
j = 0; j = 0;
int lpc = -1;
for (i=0; i<MAXTILES; i++) for (i=0; i<MAXTILES; i++)
{ {
if (!(i&7) && !gotpic[i>>3]) if (!(i&7) && !gotpic[i>>3])
@ -546,9 +550,23 @@ void G_CacheMapData(void)
if (bpp > 8 && totalclock - tc > TICRATE/4) if (bpp > 8 && totalclock - tc > TICRATE/4)
{ {
/*Bsprintf(tempbuf,"%d resources remaining\n",g_precacheCount-pc+1);*/ /*Bsprintf(tempbuf,"%d resources remaining\n",g_precacheCount-pc+1);*/
tc = min(100, tabledivide32_noinline(100 * pc, g_precacheCount)); int percentage = min(100, tabledivide32_noinline(100 * pc, g_precacheCount));
Bsprintf(tempbuf,"Loaded %d%% (%d/%d textures)\n",tc,pc,g_precacheCount);
G_DoLoadScreen(tempbuf, tc); while (percentage > lpc)
{
Bsprintf(tempbuf, "Loaded %d%% (%d/%d textures)\n", lpc, pc, g_precacheCount);
G_DoLoadScreen(tempbuf, lpc);
sampletimer();
if (totalclock - tc >= 1)
{
tc = totalclock;
lpc++;
}
OSD_Printf("percentage %d lpc %d\n", percentage, lpc);
}
tc = totalclock; tc = totalclock;
} }
} }