zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-01-31 12:30:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

- eliminate int_floorz / int_ceilingz in the backend.

Browse source
This commit is contained in:
Christoph Oelckers 2022-09-27 21:21:20 +02:00
parent 0655db77b9
commit 2ba68df27f
5 changed files with 20 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
source/build/include/clip.h
View file

@ -13,7 +13,7 @@
#define MAXCLIPSECTORS 512
#define MAXCLIPNUM 2048
#define CLIPCURBHEIGHT (1<<8)
#define CLIPCURBHEIGHT (1)
typedef struct
{
int32_t x1, y1, x2, y2;

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

@ -144,8 +144,8 @@ static int cliptestsector(int const dasect, int const nextsect, int32_t const fl
}
}
int32_t daz2 = sec2->int_floorz();
int32_t dacz2 = sec2->int_ceilingz();
double daz2 = sec2->floorz;
double dacz2 = sec2->ceilingz;
if ((sec2->floorstat|sec2->ceilingstat) & CSTAT_SECTOR_SLOPE)
getcorrectzsofslope(nextsect, pos.X, pos.Y, &dacz2, &daz2);
@ -155,23 +155,26 @@ static int cliptestsector(int const dasect, int const nextsect, int32_t const fl
auto const sec = &sector[dasect];
int32_t daz = sec->int_floorz();
int32_t dacz = sec->int_ceilingz();
double daz = sec->floorz;
double dacz = sec->ceilingz;
if ((sec->floorstat|sec->ceilingstat) & CSTAT_SECTOR_SLOPE)
getcorrectzsofslope(dasect, pos.X, pos.Y, &dacz, &daz);
int32_t const sec2height = abs(daz2-dacz2);
double const sec2height = abs(daz2-dacz2);
double fposz = posz * zinttoworld;
double fceildist = ceildist * zinttoworld;
double fflordist = flordist * zinttoworld;
return ((abs(daz-dacz) > sec2height && // clip if the current sector is taller and the next is too small
sec2height < (ceildist+(CLIPCURBHEIGHT<<1))) ||
sec2height < (fceildist + (CLIPCURBHEIGHT * 2))) ||
((sec2->floorstat & CSTAT_SECTOR_SKY) == 0 && // parallaxed floor curbs don't clip
posz >= daz2-(flordist-1) && // also account for desired z distance tolerance
fposz >= daz2-(fflordist-1) && // also account for desired z distance tolerance
daz2 < daz-CLIPCURBHEIGHT) || // curbs less tall than 256 z units don't clip
((sec2->ceilingstat & CSTAT_SECTOR_SKY) == 0 &&
posz <= dacz2+(ceildist-1) &&
fposz <= dacz2+(fceildist-1) &&
dacz2 > dacz+CLIPCURBHEIGHT)); // ceilings check the same conditions ^^^^^
}
@ -756,7 +759,7 @@ CollisionBase clipmove_(vec3_t * const pos, int * const sectnum, int32_t xvect,
if (enginecompatibility_mode != ENGINECOMPATIBILITY_19950829 && (sect->ceilingstat & CSTAT_SECTOR_SLOPE))
tempint2 = int_getceilzofslopeptr(sect, pos->X, pos->Y) - pos->Z;
else
tempint2 = sect->int_ceilingz() - pos->Z;
tempint2 = int(sect->ceilingz * zworldtoint) - pos->Z;
if (tempint2 > 0)
{
@ -771,7 +774,7 @@ CollisionBase clipmove_(vec3_t * const pos, int * const sectnum, int32_t xvect,
if (enginecompatibility_mode != ENGINECOMPATIBILITY_19950829 && (sect->ceilingstat & CSTAT_SECTOR_SLOPE))
tempint2 = pos->Z - int_getflorzofslopeptr(sect, pos->X, pos->Y);
else
tempint2 = pos->Z - sect->int_floorz();
tempint2 = pos->Z - int(sect->floorz * zworldtoint);
if (tempint2 <= 0)
{
@ -953,8 +956,8 @@ void getzrange(const vec3_t& pos, sectortype* sect, int32_t* ceilz, CollisionBas
if (wal.cstat & EWallFlags::FromInt(dawalclipmask)) continue; // XXX?
if (((nextsect->ceilingstat & CSTAT_SECTOR_SKY) == 0) && (pos.Z <= nextsect->int_ceilingz()+(3<<8))) continue;
if (((nextsect->floorstat & CSTAT_SECTOR_SKY) == 0) && (pos.Z >= nextsect->int_floorz()-(3<<8))) continue;
if (((nextsect->ceilingstat & CSTAT_SECTOR_SKY) == 0) && (pos.Z <= int(nextsect->ceilingz * zworldtoint)+(3<<8))) continue;
if (((nextsect->floorstat & CSTAT_SECTOR_SKY) == 0) && (pos.Z >= int(nextsect->floorz * zworldtoint)-(3<<8))) continue;
int nextsectno = ::sectnum(nextsect);
if (!clipsectormap[nextsectno])

6
source/core/gamefuncs.cpp
View file

@ -148,14 +148,14 @@ void calcSlope(const sectortype* sec, double xpos, double ypos, double* pceilz,
}
// only used by clipmove et.al.
void getcorrectzsofslope(int sectnum, int dax, int day, int* ceilz, int* florz)
void getcorrectzsofslope(int sectnum, int dax, int day, double* ceilz, double* florz)
{
DVector2 closestv;
SquareDistToSector(dax * inttoworld, day * inttoworld, &sector[sectnum], &closestv);
double ffloorz, fceilz;
calcSlope(&sector[sectnum], closestv.X, closestv.Y, &fceilz, &ffloorz);
if (ceilz) *ceilz = int(fceilz * zworldtoint);
if (florz) *florz = int(ffloorz * zworldtoint);
if (ceilz) *ceilz = fceilz;
if (florz) *florz = ffloorz;
}
//==========================================================================

2
source/core/gamefuncs.h
View file

@ -335,7 +335,7 @@ inline void PlanesAtPoint(const sectortype* sec, float dax, float day, float* pc
// only used by clipmove et.al.
void getcorrectzsofslope(int sectnum, int dax, int day, int* ceilz, int* florz);
void getcorrectzsofslope(int sectnum, int dax, int day, double* ceilz, double* florz);
//==========================================================================
//

4
source/core/maptypes.h
View file

@ -249,10 +249,6 @@ struct sectortype
#endif
int int_ceilingz() const { return ceilingz * zworldtoint; }
int int_floorz() const { return floorz * zworldtoint; }
// panning byte fields were promoted to full floats to enable panning interpolation.
float ceilingxpan_;
float ceilingypan_;