zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-02-27 22:00:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Polymer: rewrite sprite x/y flipping so that data flow is explicit.

Browse source 
Also, add some defines for sprite cstats to build.h (SPR_*) and use them.

git-svn-id: https://svn.eduke32.com/eduke32@3775 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2013-05-16 21:54:52 +00:00
parent c2b089f87a
commit 99d7f1e964
2 changed files with 25 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
polymer/eduke32/build/include/build.h
View file

@ -330,6 +330,16 @@ typedef struct
Tracker(Wall, int16_t) extra; Tracker(Wall, int16_t) extra;
} walltypev7; } walltypev7;
enum {
SPR_XFLIP = 4,
SPR_YFLIP = 8,
SPR_WALL = 16,
SPR_FLOOR = 32,
SPR_ALIGN_MASK = 32+16,
};
//cstat: //cstat:
// bit 0: 1 = Blocking sprite (use with clipmove, getzrange) "B" // bit 0: 1 = Blocking sprite (use with clipmove, getzrange) "B"
// bit 1: 1 = transluscence, 0 = normal "T" // bit 1: 1 = transluscence, 0 = normal "T"

31
polymer/eduke32/build/src/polymer.c
View file

@ -3660,18 +3660,17 @@ void polymer_updatesprite(int32_t snum)
inbuffer = vertsprite; inbuffer = vertsprite;
flipu = flipv = 0; {
// Initially set flipu and flipv.
const uint8_t xflip = !!(tspr->cstat & SPR_XFLIP);
const uint8_t yflip = !!(tspr->cstat & SPR_YFLIP);
const uint8_t flooraligned = ((tspr->cstat & SPR_ALIGN_MASK)==SPR_FLOOR);
if ((tspr->cstat & 4) && (((tspr->cstat>>4) & 3) != 2)) flipu = (xflip ^ flooraligned);
flipu = !flipu; flipv = (yflip && !flooraligned);
}
if (!(tspr->cstat & 4) && (((tspr->cstat>>4) & 3) == 2)) if (pr_billboardingmode && (tspr->cstat & SPR_ALIGN_MASK)==0)
flipu = !flipu;
if ((tspr->cstat & 8) && (((tspr->cstat>>4) & 3) != 2))
flipv = !flipv;
if (pr_billboardingmode && !((tspr->cstat>>4) & 3))
{ {
// do surgery on the face tspr to make it look like a wall sprite // do surgery on the face tspr to make it look like a wall sprite
tspr->cstat |= 16; tspr->cstat |= 16;
@ -3686,7 +3685,7 @@ void polymer_updatesprite(int32_t snum)
yoff = -yoff; yoff = -yoff;
} }
switch ((tspr->cstat>>4) & 3) switch (tspr->cstat & SPR_ALIGN_MASK)
{ {
case 0: case 0:
ang = (float)((viewangle) & 2047) / (2048.0f / 360.0f); ang = (float)((viewangle) & 2047) / (2048.0f / 360.0f);
@ -3697,7 +3696,7 @@ void polymer_updatesprite(int32_t snum)
bglTranslatef((float)(-xoff), (float)(yoff), 0.0f); bglTranslatef((float)(-xoff), (float)(yoff), 0.0f);
bglScalef((float)(xsize), (float)(ysize), 1.0f); bglScalef((float)(xsize), (float)(ysize), 1.0f);
break; break;
case 1: case SPR_WALL:
ang = (float)((tspr->ang + 1024) & 2047) / (2048.0f / 360.0f); ang = (float)((tspr->ang + 1024) & 2047) / (2048.0f / 360.0f);
bglTranslatef(spos[0], spos[1], spos[2]); bglTranslatef(spos[0], spos[1], spos[2]);
@ -3705,12 +3704,12 @@ void polymer_updatesprite(int32_t snum)
bglTranslatef((float)(-xoff), (float)(yoff), 0.0f); bglTranslatef((float)(-xoff), (float)(yoff), 0.0f);
bglScalef((float)(xsize), (float)(ysize), 1.0f); bglScalef((float)(xsize), (float)(ysize), 1.0f);
break; break;
case 2: case SPR_FLOOR:
ang = (float)((tspr->ang + 1024) & 2047) / (2048.0f / 360.0f); ang = (float)((tspr->ang + 1024) & 2047) / (2048.0f / 360.0f);
bglTranslatef(spos[0], spos[1], spos[2]); bglTranslatef(spos[0], spos[1], spos[2]);
bglRotatef(-ang, 0.0f, 1.0f, 0.0f); bglRotatef(-ang, 0.0f, 1.0f, 0.0f);
if (tspr->cstat & 8) { if (tspr->cstat & SPR_YFLIP) {
bglRotatef(-180.0, 0.0f, 0.0f, 1.0f); bglRotatef(-180.0, 0.0f, 0.0f, 1.0f);
flipu = !flipu; flipu = !flipu;
} }
@ -3748,7 +3747,7 @@ void polymer_updatesprite(int32_t snum)
polymer_computeplane(&s->plane); polymer_computeplane(&s->plane);
if ((cs & 48) && (pr_vbos > 0)) if ((cs & SPR_ALIGN_MASK) && (pr_vbos > 0))
{ {
bglBindBufferARB(GL_ARRAY_BUFFER_ARB, s->plane.vbo); bglBindBufferARB(GL_ARRAY_BUFFER_ARB, s->plane.vbo);
bglBufferSubDataARB(GL_ARRAY_BUFFER_ARB, 0, 4 * sizeof(GLfloat) * 5, s->plane.buffer); bglBufferSubDataARB(GL_ARRAY_BUFFER_ARB, 0, 4 * sizeof(GLfloat) * 5, s->plane.buffer);
@ -3760,7 +3759,7 @@ void polymer_updatesprite(int32_t snum)
s->plane.vbo = 0; s->plane.vbo = 0;
} }
if (tspr->cstat & 48) if (tspr->cstat & SPR_ALIGN_MASK)
{ {
int32_t curpriority = 0; int32_t curpriority = 0;