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

Add support for sector/wall/sprite struct trackers to Polymer

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@5481 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2015-12-23 04:05:47 +00:00
parent 40a2780eb0
commit 2500c7b517
2 changed files with 41 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -282,6 +282,7 @@ typedef struct s_prsector {
int32_t invalidtex : 1; int32_t invalidtex : 1;
} flags; } flags;
uint32_t invalidid; uint32_t invalidid;
uint32_t trackedrev;
} _prsector; } _prsector;
typedef struct s_prwall { typedef struct s_prwall {
@ -314,11 +315,12 @@ typedef struct s_prwall {
int32_t uptodate : 1; int32_t uptodate : 1;
int32_t invalidtex : 1; int32_t invalidtex : 1;
} flags; } flags;
uint32_t trackedrev;
} _prwall; } _prwall;
typedef struct s_prsprite { typedef struct s_prsprite {
_prplane plane; _prplane plane;
uint32_t hash; uint32_t trackedrev;
} _prsprite; } _prsprite;
typedef struct s_prmirror { typedef struct s_prmirror {
@ -369,7 +371,7 @@ extern _prsprite *prsprites[MAXSPRITES];
static inline void polymer_invalidatesprite(int32_t i) static inline void polymer_invalidatesprite(int32_t i)
{ {
if (prsprites[i]) if (prsprites[i])
prsprites[i]->hash = 0xDEADBEEF; prsprites[i]->trackedrev = UINT32_MAX;
} }
extern GLuint prartmaps[MAXTILES]; extern GLuint prartmaps[MAXTILES];

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

@ -2664,7 +2664,11 @@ static int32_t polymer_updatesector(int16_t sectnum)
if ((!s->flags.empty) && (!needfloor) && if ((!s->flags.empty) && (!needfloor) &&
(floorpicnum == s->floorpicnum_anim) && (floorpicnum == s->floorpicnum_anim) &&
(ceilingpicnum == s->ceilingpicnum_anim) && (ceilingpicnum == s->ceilingpicnum_anim) &&
#ifndef UNTRACKED_STRUCTS
(s->trackedrev == sectorchanged[sectnum]))
#else
!Bmemcmp(&s->ceilingstat, &sec->ceilingstat, offsetof(sectortype, visibility) - offsetof(sectortype, ceilingstat))) !Bmemcmp(&s->ceilingstat, &sec->ceilingstat, offsetof(sectortype, visibility) - offsetof(sectortype, ceilingstat)))
#endif
goto attributes; goto attributes;
wal = &wall[sec->wallptr]; wal = &wall[sec->wallptr];
@ -2760,6 +2764,9 @@ static int32_t polymer_updatesector(int16_t sectnum)
s->ceilingxpanning = sec->ceilingxpanning; s->ceilingxpanning = sec->ceilingxpanning;
s->floorypanning = sec->floorypanning; s->floorypanning = sec->floorypanning;
s->ceilingypanning = sec->ceilingypanning; s->ceilingypanning = sec->ceilingypanning;
#ifndef UNTRACKED_STRUCTS
s->trackedrev = sectorchanged[sectnum];
#endif
i = -1; i = -1;
@ -3186,7 +3193,11 @@ static void polymer_updatewall(int16_t wallnum)
(w->invalidid == invalid) && (w->invalidid == invalid) &&
(wallpicnum == w->picnum_anim) && (wallpicnum == w->picnum_anim) &&
(walloverpicnum == w->overpicnum_anim) && (walloverpicnum == w->overpicnum_anim) &&
#ifndef UNTRACKED_STRUCTS
(w->trackedrev == wallchanged[nwallnum]) &&
#else
!Bmemcmp(&wal->cstat, &w->cstat, NBYTES_WALL_CSTAT_THROUGH_YPANNING) && !Bmemcmp(&wal->cstat, &w->cstat, NBYTES_WALL_CSTAT_THROUGH_YPANNING) &&
#endif
((nwallnum < 0 || nwallnum > numwalls) || ((nwallnum < 0 || nwallnum > numwalls) ||
((nwallpicnum == w->nwallpicnum) && ((nwallpicnum == w->nwallpicnum) &&
(wall[nwallnum].xpanning == w->nwallxpanning) && (wall[nwallnum].xpanning == w->nwallxpanning) &&
@ -3205,7 +3216,9 @@ static void polymer_updatewall(int16_t wallnum)
w->picnum_anim = wallpicnum; w->picnum_anim = wallpicnum;
w->overpicnum_anim = walloverpicnum; w->overpicnum_anim = walloverpicnum;
#ifndef UNTRACKED_STRUCTS
w->trackedrev = wallchanged[nwallnum];
#endif
if (nwallnum >= 0 && nwallnum < numwalls) if (nwallnum >= 0 && nwallnum < numwalls)
{ {
w->nwallpicnum = nwallpicnum; w->nwallpicnum = nwallpicnum;
@ -3826,10 +3839,10 @@ static inline void polymer_scansprites(int16_t sectnum, tspritetype* localtspri
void polymer_updatesprite(int32_t snum) void polymer_updatesprite(int32_t snum)
{ {
int32_t curpicnum, xsize, ysize, i, j; int32_t xsize, ysize, i, j;
int32_t tilexoff, tileyoff, xoff, yoff, centeryoff=0; int32_t tilexoff, tileyoff, xoff, yoff, centeryoff=0;
tspritetype *tspr = tspriteptr[snum]; tspritetype *tspr = tspriteptr[snum];
float xratio, yratio, ang, f; float xratio, yratio, ang;
float spos[3]; float spos[3];
const _prvert *inbuffer; const _prvert *inbuffer;
uint8_t flipu, flipv; uint8_t flipu, flipv;
@ -3845,39 +3858,43 @@ void polymer_updatesprite(int32_t snum)
if (tspr->owner < 0 || tspr->picnum < 0) return; if (tspr->owner < 0 || tspr->picnum < 0) return;
if (prsprites[tspr->owner] == NULL) s = prsprites[tspr->owner];
if (s == NULL)
{ {
prsprites[tspr->owner] = (_prsprite *)Xcalloc(sizeof(_prsprite), 1); s = prsprites[tspr->owner] = (_prsprite *)Xcalloc(sizeof(_prsprite), 1);
prsprites[tspr->owner]->plane.buffer = (_prvert *)Xcalloc(4, sizeof(_prvert)); // XXX s->plane.buffer = (_prvert *)Xcalloc(4, sizeof(_prvert)); // XXX
prsprites[tspr->owner]->plane.vertcount = 4; s->plane.vertcount = 4;
s->plane.mapvbo_vertoffset = -1;
prsprites[tspr->owner]->plane.mapvbo_vertoffset = -1; s->trackedrev = UINT32_MAX;
} }
if ((tspr->cstat & 48) && (pr_vbos > 0) && !prsprites[tspr->owner]->plane.vbo) if ((tspr->cstat & 48) && (pr_vbos > 0) && !s->plane.vbo)
{ {
if (pr_nullrender < 2) if (pr_nullrender < 2)
{ {
bglGenBuffersARB(1, &prsprites[tspr->owner]->plane.vbo); bglGenBuffersARB(1, &s->plane.vbo);
bglBindBufferARB(GL_ARRAY_BUFFER_ARB, prsprites[tspr->owner]->plane.vbo); bglBindBufferARB(GL_ARRAY_BUFFER_ARB, s->plane.vbo);
bglBufferDataARB(GL_ARRAY_BUFFER_ARB, 4 * sizeof(_prvert), NULL, mapvbousage); bglBufferDataARB(GL_ARRAY_BUFFER_ARB, 4 * sizeof(_prvert), NULL, mapvbousage);
} }
} }
s = prsprites[tspr->owner]; int32_t curpicnum = tspr->picnum;
curpicnum = tspr->picnum;
DO_TILE_ANIM(curpicnum, tspr->owner+32768); DO_TILE_ANIM(curpicnum, tspr->owner+32768);
if (tspr->cstat & 48 && searchit != 2) if (tspr->cstat & 48 && searchit != 2)
{ {
uint32_t xxhash = XXH32((uint8_t *)tspr, offsetof(spritetype, owner), 0xDEADBEEF); #ifndef UNTRACKED_STRUCTS
uint32_t const changed = spritechanged[tspr->owner];
#else
uint32_t const changed = XXH32((uint8_t *) tspr, offsetof(spritetype, owner), 0xDEADBEEF);
#endif
if (xxhash == s->hash && tspr->picnum == curpicnum) if (changed == s->trackedrev && tspr->picnum == curpicnum)
return; return;
s->hash = xxhash; s->trackedrev = changed;
} }
polymer_getbuildmaterial(&s->plane.material, curpicnum, tspr->pal, tspr->shade, polymer_getbuildmaterial(&s->plane.material, curpicnum, tspr->pal, tspr->shade,
@ -3891,13 +3908,13 @@ void polymer_updatesprite(int32_t snum)
s->plane.material.diffusemodulation[3] = 0xAA; s->plane.material.diffusemodulation[3] = 0xAA;
} }
f = s->plane.material.diffusemodulation[3] * (1.0f - spriteext[tspr->owner].alpha); float f = s->plane.material.diffusemodulation[3] * (1.0f - spriteext[tspr->owner].alpha);
s->plane.material.diffusemodulation[3] = (GLubyte)f; s->plane.material.diffusemodulation[3] = (GLubyte)f;
if (searchit == 2) if (searchit == 2)
{ {
polymer_drawsearchplane(&s->plane, NULL, 0x03, (GLubyte *) &tspr->owner); polymer_drawsearchplane(&s->plane, NULL, 0x03, (GLubyte *) &tspr->owner);
s->hash = 0xDEADBEEF; s->trackedrev = UINT32_MAX;
} }
curpicnum = tspr->picnum; curpicnum = tspr->picnum;