teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2024-12-02 09:02:35 +00:00
Code Issues Projects Releases Packages Wiki Activity

- and finally the iterators in the backend.

Browse source
This commit is contained in:
Christoph Oelckers 2020-10-15 19:31:30 +02:00
parent db4f0d041e
commit 4f7c0b696c
3 changed files with 15 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
source/build/src/clip.cpp
View file

@ -606,7 +606,9 @@ int32_t clipmove(vec3_t * const pos, int16_t * const sectnum, int32_t xvect, int
if (dasprclipmask==0) if (dasprclipmask==0)
continue; continue;
for (native_t j=headspritesect[dasect]; j>=0; j=nextspritesect[j]) int j;
SectIterator it(dasect);
while ((j = it.NextIndex()) >= 0)
{ {
auto const spr = (uspriteptr_t)&sprite[j]; auto const spr = (uspriteptr_t)&sprite[j];
const int32_t cstat = spr->cstat; const int32_t cstat = spr->cstat;
@ -885,39 +887,7 @@ int pushmove(vec3_t *const vect, int16_t *const sectnum,
{ {
uwallptr_t wal; uwallptr_t wal;
int32_t startwall, endwall; int32_t startwall, endwall;
#if 0
// Push FACE sprites
for (i=headspritesect[clipsectorlist[clipsectcnt]]; i>=0; i=nextspritesect[i])
{
spr = &sprite[i];
if (((spr->cstat&48) != 0) && ((spr->cstat&48) != 48)) continue;
if ((spr->cstat&dasprclipmask) == 0) continue;
dax = (vect->x)-spr->x; day = (vect->y)-spr->y;
t = (spr->clipdist<<2)+walldist;
if ((klabs(dax) < t) && (klabs(day) < t))
{
daz = spr->z + spriteheightofs(i, &t, 1);
if (((vect->z) < daz+ceildist) && ((vect->z) > daz-t-flordist))
{
t = (spr->clipdist<<2)+walldist;
j = getangle(dax, day);
dx = (sintable[(j+512)&2047]>>11);
dy = (sintable[(j)&2047]>>11);
bad2 = 16;
do
{
vect->x = (vect->x) + dx; vect->y = (vect->y) + dy;
bad2--; if (bad2 == 0) break;
} while ((klabs((vect->x)-spr->x) < t) && (klabs((vect->y)-spr->y) < t));
bad = -1;
k--; if (k <= 0) return bad;
updatesector(vect->x, vect->y, sectnum);
}
}
}
#endif
auto sec = (usectorptr_t)&sector[clipsectorlist[clipsectcnt]]; auto sec = (usectorptr_t)&sector[clipsectorlist[clipsectcnt]];
if (dir > 0) if (dir > 0)
startwall = sec->wallptr, endwall = startwall + sec->wallnum; startwall = sec->wallptr, endwall = startwall + sec->wallnum;
@ -1117,7 +1087,9 @@ void getzrange(const vec3_t *pos, int16_t sectnum,
if (dasprclipmask) if (dasprclipmask)
for (bssize_t i=0; i<clipsectnum; i++) for (bssize_t i=0; i<clipsectnum; i++)
{ {
for (bssize_t j=headspritesect[clipsectorlist[i]]; j>=0; j=nextspritesect[j]) int j;
SectIterator it(clipsectorlist[i]);
while ((j = it.NextIndex()) >= 0)
{ {
const int32_t cstat = sprite[j].cstat; const int32_t cstat = sprite[j].cstat;
int32_t daz, daz2; int32_t daz, daz2;
@ -1451,7 +1423,8 @@ int32_t hitscan(const vec3_t *sv, int16_t sectnum, int32_t vx, int32_t vy, int32
if (dasprclipmask==0) if (dasprclipmask==0)
continue; continue;
for (z=headspritesect[dasector]; z>=0; z=nextspritesect[z]) SectIterator it(dasector);
while ((z = it.NextIndex()) >= 0)
{ {
auto const spr = (uspriteptr_t)&sprite[z]; auto const spr = (uspriteptr_t)&sprite[z];
uint32_t const cstat = spr->cstat; uint32_t const cstat = spr->cstat;

6
source/build/src/engine.cpp
View file

@ -1742,7 +1742,8 @@ void renderDrawMapView(int32_t dax, int32_t day, int32_t zoome, int16_t ang)
//Collect floor sprites to draw //Collect floor sprites to draw
for (i=headspritesect[s]; i>=0; i=nextspritesect[i]) SectIterator it(s);
while ((i = it.NextIndex()) >= 0)
{ {
if (sprite[i].cstat & 32768) if (sprite[i].cstat & 32768)
continue; continue;
@ -2525,7 +2526,8 @@ void neartag(int32_t xs, int32_t ys, int32_t zs, int16_t sectnum, int16_t ange,
if (tagsearch & 4) if (tagsearch & 4)
continue; // skip sprite search continue; // skip sprite search
for (z=headspritesect[dasector]; z>=0; z=nextspritesect[z]) SectIterator it(dasector);
while ((z = it.NextIndex()) >= 0)
{ {
auto const spr = (uspriteptr_t)&sprite[z]; auto const spr = (uspriteptr_t)&sprite[z];

5
source/build/src/polymost.cpp
View file

@ -2227,7 +2227,9 @@ void polymost_scansector(int32_t sectnum)
{ {
sectnum = sectorborder[--sectorbordercnt]; sectnum = sectorborder[--sectorbordercnt];
for (bssize_t z=headspritesect[sectnum]; z>=0; z=nextspritesect[z]) int z;
SectIterator it(sectnum);
while ((z = it.NextIndex()) >= 0)
{ {
auto const spr = (uspriteptr_t)&sprite[z]; auto const spr = (uspriteptr_t)&sprite[z];
@ -2260,7 +2262,6 @@ void polymost_scansector(int32_t sectnum)
vec2d_t p2 = { 0, 0 }; vec2d_t p2 = { 0, 0 };
uwallptr_t wal; uwallptr_t wal;
int z;
for (z=startwall,wal=(uwallptr_t)&wall[z]; z<endwall; z++,wal++) for (z=startwall,wal=(uwallptr_t)&wall[z]; z<endwall; z++,wal++)
{ {