zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2025-02-21 11:01:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

engine.c: in drawmasks(), remove sorting sprites by statnum.

Browse source 
There were various issues with that code.
 - It does not seem to be very meaningful to do so.
 - It was carried out on the same range as the sprites sorted by z coordinate
   (those with equal x/y) just a few lines away, effectively overriding it.
   The former is very meaningful, though.
 - It led to inconsistencies between editor and game, see
   http://forums.duke4.net/topic/775-eduke32-20-and-polymer/page__view__findpost__p__214873

git-svn-id: https://svn.eduke32.com/eduke32@4876 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2015-01-04 18:45:01 +00:00
parent 17fab4d8ac
commit bc35a5c8d2
1 changed files with 7 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
polymer/eduke32/build/src/engine.c
View file

@ -9673,12 +9673,12 @@ killsprite:
} }
{ {
int32_t j, l, gap, ys; int32_t gap, ys;
gap = 1; while (gap < spritesortcnt) gap = (gap<<1)+1; gap = 1; while (gap < spritesortcnt) gap = (gap<<1)+1;
for (gap>>=1; gap>0; gap>>=1) //Sort sprite list for (gap>>=1; gap>0; gap>>=1) //Sort sprite list
for (i=0; i<spritesortcnt-gap; i++) for (i=0; i<spritesortcnt-gap; i++)
for (l=i; l>=0; l-=gap) for (int32_t l=i; l>=0; l-=gap)
{ {
if (spritesxyz[l].y <= spritesxyz[l+gap].y) break; if (spritesxyz[l].y <= spritesxyz[l+gap].y) break;
swaplong(&tspriteptr[l],&tspriteptr[l+gap]); swaplong(&tspriteptr[l],&tspriteptr[l+gap]);
@ -9690,7 +9690,7 @@ killsprite:
spritesxyz[spritesortcnt].y = (spritesxyz[spritesortcnt-1].y^1); spritesxyz[spritesortcnt].y = (spritesxyz[spritesortcnt-1].y^1);
ys = spritesxyz[0].y; i = 0; ys = spritesxyz[0].y; i = 0;
for (j=1; j<=spritesortcnt; j++) for (int32_t j=1; j<=spritesortcnt; j++)
{ {
if (spritesxyz[j].y == ys) if (spritesxyz[j].y == ys)
continue; continue;
@ -9699,11 +9699,7 @@ killsprite:
if (j > i+1) if (j > i+1)
{ {
int32_t k; for (int32_t k=i; k<j; k++)
vec3_t tv3;
vec2_t tv2;
for (k=i; k<j; k++)
{ {
const spritetype *const s = tspriteptr[k]; const spritetype *const s = tspriteptr[k];
@ -9722,25 +9718,15 @@ killsprite:
} }
} }
for (k=i+1; k<j; k++) for (int32_t k=i+1; k<j; k++)
for (l=i; l<k; l++) for (int32_t l=i; l<k; l++)
if (klabs(spritesxyz[k].z-globalposz) < klabs(spritesxyz[l].z-globalposz)) if (klabs(spritesxyz[k].z-globalposz) < klabs(spritesxyz[l].z-globalposz))
{ {
swaplong(&tspriteptr[k],&tspriteptr[l]); swaplong(&tspriteptr[k],&tspriteptr[l]);
tv3 = spritesxyz[k]; vec3_t tv3 = spritesxyz[k];
spritesxyz[k] = spritesxyz[l]; spritesxyz[k] = spritesxyz[l];
spritesxyz[l] = tv3; spritesxyz[l] = tv3;
} }
for (k=i+1; k<j; k++)
for (l=i; l<k; l++)
if (tspriteptr[k]->statnum < tspriteptr[l]->statnum)
{
swaplong(&tspriteptr[k],&tspriteptr[l]);
tv2 = *(vec2_t *)&spritesxyz[k];
*(vec2_t *)&spritesxyz[k] = *(vec2_t *)&spritesxyz[l];
*(vec2_t *)&spritesxyz[l] = tv2;
}
} }
i = j; i = j;
} }