lifning/SRB2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Small code cleanup

Browse source 
- Removed unused vars from the slope struct. I'm pretty sure they were meant for something at some point, but right now there's nothing using them and frankly I find it hard to understand what they were meant for.
- Removed unused slope flags.
- Flipped dynamic slope flag naming convention.


Signed-off-by: Nev3r <apophycens@gmail.com>
This commit is contained in:
Nev3r 2019-04-19 20:21:29 +02:00
parent 5401e9560f
commit 8a2e11ffa9
3 changed files with 14 additions and 115 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/dehacked.c
View file

@ -8191,10 +8191,8 @@ struct {
#endif #endif
#ifdef ESLOPE #ifdef ESLOPE
// Slope flags // Slope flags
{"SL_NOPHYSICS",SL_NOPHYSICS}, // Don't do momentum adjustment with this slope {"SL_NOPHYSICS",SL_NOPHYSICS},
{"SL_NODYNAMIC",SL_NODYNAMIC}, // Slope will never need to move during the level, so don't fuss with recalculating it {"SL_DYNAMIC",SL_DYNAMIC},
{"SL_ANCHORVERTEX",SL_ANCHORVERTEX},// Slope is using a Slope Vertex Thing to anchor its position
{"SL_VERTEXSLOPE",SL_VERTEXSLOPE}, // Slope is built from three Slope Vertex Things
#endif #endif
// Angles // Angles

114
src/p_slopes.c
View file

@ -262,10 +262,8 @@ static void line_SpawnViaLine(const int linenum, const boolean spawnthinker)
UINT8 flags = 0; // Slope flags UINT8 flags = 0; // Slope flags
if (line->flags & ML_NOSONIC) if (line->flags & ML_NOSONIC)
flags |= SL_NOPHYSICS; flags |= SL_NOPHYSICS;
if (!(line->flags & ML_NOTAILS)) if (line->flags & ML_NOTAILS)
flags |= SL_NODYNAMIC; flags |= SL_DYNAMIC;
if (line->flags & ML_NOKNUX)
flags |= SL_ANCHORVERTEX;
if(!frontfloor && !backfloor && !frontceil && !backceil) if(!frontfloor && !backfloor && !frontceil && !backceil)
{ {
@ -316,8 +314,6 @@ static void line_SpawnViaLine(const int linenum, const boolean spawnthinker)
if(frontfloor) if(frontfloor)
{ {
fixed_t highest, lowest;
size_t l;
point.z = line->frontsector->floorheight; // Startz point.z = line->frontsector->floorheight; // Startz
dz = FixedDiv(origin.z - point.z, extent); // Destinationz dz = FixedDiv(origin.z - point.z, extent); // Destinationz
@ -331,45 +327,16 @@ static void line_SpawnViaLine(const int linenum, const boolean spawnthinker)
// fslope->d = destination 3D point 2 of the vector // fslope->d = destination 3D point 2 of the vector
// fslope->normal is a 3D line perpendicular to the 3D vector // fslope->normal is a 3D line perpendicular to the 3D vector
// To find the real highz/lowz of a slope, you need to check all the vertexes
// in the slope's sector with P_GetZAt to get the REAL lowz & highz
// Although these slopes are set by floorheights the ANGLE is what a slope is,
// so technically any slope can extend on forever (they are just bound by sectors)
// Default points for high and low
highest = point.z > origin.z ? point.z : origin.z;
lowest = point.z < origin.z ? point.z : origin.z;
// Now check to see what the REAL high and low points of the slope inside the sector
// TODO: Is this really needed outside of FOFs? -Red
for (l = 0; l < line->frontsector->linecount; l++)
{
fixed_t height = P_GetZAt(line->frontsector->f_slope, line->frontsector->lines[l]->v1->x, line->frontsector->lines[l]->v1->y);
if (height > highest)
highest = height;
if (height < lowest)
lowest = height;
}
// Sets extra clipping data for the frontsector's slope
fslope->highz = highest;
fslope->lowz = lowest;
fslope->zangle = R_PointToAngle2(0, origin.z, extent, point.z); fslope->zangle = R_PointToAngle2(0, origin.z, extent, point.z);
fslope->xydirection = R_PointToAngle2(origin.x, origin.y, point.x, point.y); fslope->xydirection = R_PointToAngle2(origin.x, origin.y, point.x, point.y);
P_CalculateSlopeNormal(fslope); P_CalculateSlopeNormal(fslope);
if (spawnthinker && !(flags & SL_NODYNAMIC)) if (spawnthinker && (flags & SL_DYNAMIC))
P_AddDynSlopeThinker(fslope, DP_FRONTFLOOR, line, extent, NULL, NULL); P_AddDynSlopeThinker(fslope, DP_FRONTFLOOR, line, extent, NULL, NULL);
} }
if(frontceil) if(frontceil)
{ {
fixed_t highest, lowest;
size_t l;
origin.z = line->backsector->ceilingheight; origin.z = line->backsector->ceilingheight;
point.z = line->frontsector->ceilingheight; point.z = line->frontsector->ceilingheight;
dz = FixedDiv(origin.z - point.z, extent); dz = FixedDiv(origin.z - point.z, extent);
@ -377,31 +344,12 @@ static void line_SpawnViaLine(const int linenum, const boolean spawnthinker)
cslope = line->frontsector->c_slope = cslope = line->frontsector->c_slope =
MakeViaVectors(&point, &direction, dz, flags); MakeViaVectors(&point, &direction, dz, flags);
// Remember the way the slope is formed
highest = point.z > origin.z ? point.z : origin.z;
lowest = point.z < origin.z ? point.z : origin.z;
for (l = 0; l < line->frontsector->linecount; l++)
{
fixed_t height = P_GetZAt(line->frontsector->c_slope, line->frontsector->lines[l]->v1->x, line->frontsector->lines[l]->v1->y);
if (height > highest)
highest = height;
if (height < lowest)
lowest = height;
}
// This line special sets extra clipping data for the frontsector's slope
cslope->highz = highest;
cslope->lowz = lowest;
cslope->zangle = R_PointToAngle2(0, origin.z, extent, point.z); cslope->zangle = R_PointToAngle2(0, origin.z, extent, point.z);
cslope->xydirection = R_PointToAngle2(origin.x, origin.y, point.x, point.y); cslope->xydirection = R_PointToAngle2(origin.x, origin.y, point.x, point.y);
P_CalculateSlopeNormal(cslope); P_CalculateSlopeNormal(cslope);
if (spawnthinker && !(flags & SL_NODYNAMIC)) if (spawnthinker && (flags & SL_DYNAMIC))
P_AddDynSlopeThinker(cslope, DP_FRONTCEIL, line, extent, NULL, NULL); P_AddDynSlopeThinker(cslope, DP_FRONTCEIL, line, extent, NULL, NULL);
} }
} }
@ -430,45 +378,22 @@ static void line_SpawnViaLine(const int linenum, const boolean spawnthinker)
if(backfloor) if(backfloor)
{ {
fixed_t highest, lowest;
size_t l;
point.z = line->backsector->floorheight; point.z = line->backsector->floorheight;
dz = FixedDiv(origin.z - point.z, extent); dz = FixedDiv(origin.z - point.z, extent);
fslope = line->backsector->f_slope = fslope = line->backsector->f_slope =
MakeViaVectors(&point, &direction, dz, flags); MakeViaVectors(&point, &direction, dz, flags);
// Remember the way the slope is formed
highest = point.z > origin.z ? point.z : origin.z;
lowest = point.z < origin.z ? point.z : origin.z;
for (l = 0; l < line->backsector->linecount; l++)
{
fixed_t height = P_GetZAt(line->backsector->f_slope, line->backsector->lines[l]->v1->x, line->backsector->lines[l]->v1->y);
if (height > highest)
highest = height;
if (height < lowest)
lowest = height;
}
// This line special sets extra clipping data for the frontsector's slope
fslope->highz = highest;
fslope->lowz = lowest;
fslope->zangle = R_PointToAngle2(0, origin.z, extent, point.z); fslope->zangle = R_PointToAngle2(0, origin.z, extent, point.z);
fslope->xydirection = R_PointToAngle2(origin.x, origin.y, point.x, point.y); fslope->xydirection = R_PointToAngle2(origin.x, origin.y, point.x, point.y);
P_CalculateSlopeNormal(fslope); P_CalculateSlopeNormal(fslope);
if (spawnthinker && !(flags & SL_NODYNAMIC)) if (spawnthinker && (flags & SL_DYNAMIC))
P_AddDynSlopeThinker(fslope, DP_BACKFLOOR, line, extent, NULL, NULL); P_AddDynSlopeThinker(fslope, DP_BACKFLOOR, line, extent, NULL, NULL);
} }
if(backceil) if(backceil)
{ {
fixed_t highest, lowest;
size_t l;
origin.z = line->frontsector->ceilingheight; origin.z = line->frontsector->ceilingheight;
point.z = line->backsector->ceilingheight; point.z = line->backsector->ceilingheight;
dz = FixedDiv(origin.z - point.z, extent); dz = FixedDiv(origin.z - point.z, extent);
@ -476,31 +401,12 @@ static void line_SpawnViaLine(const int linenum, const boolean spawnthinker)
cslope = line->backsector->c_slope = cslope = line->backsector->c_slope =
MakeViaVectors(&point, &direction, dz, flags); MakeViaVectors(&point, &direction, dz, flags);
// Remember the way the slope is formed
highest = point.z > origin.z ? point.z : origin.z;
lowest = point.z < origin.z ? point.z : origin.z;
for (l = 0; l < line->backsector->linecount; l++)
{
fixed_t height = P_GetZAt(line->backsector->c_slope, line->backsector->lines[l]->v1->x, line->backsector->lines[l]->v1->y);
if (height > highest)
highest = height;
if (height < lowest)
lowest = height;
}
// This line special sets extra clipping data for the backsector's slope
cslope->highz = highest;
cslope->lowz = lowest;
cslope->zangle = R_PointToAngle2(0, origin.z, extent, point.z); cslope->zangle = R_PointToAngle2(0, origin.z, extent, point.z);
cslope->xydirection = R_PointToAngle2(origin.x, origin.y, point.x, point.y); cslope->xydirection = R_PointToAngle2(origin.x, origin.y, point.x, point.y);
P_CalculateSlopeNormal(cslope); P_CalculateSlopeNormal(cslope);
if (spawnthinker && !(flags & SL_NODYNAMIC)) if (spawnthinker && (flags & SL_DYNAMIC))
P_AddDynSlopeThinker(cslope, DP_BACKCEIL, line, extent, NULL, NULL); P_AddDynSlopeThinker(cslope, DP_BACKCEIL, line, extent, NULL, NULL);
} }
} }
@ -548,7 +454,7 @@ static pslope_t *MakeViaMapthings(INT16 tag1, INT16 tag2, INT16 tag3, UINT8 flag
ReconfigureViaVertexes(ret, vx[0], vx[1], vx[2]); ReconfigureViaVertexes(ret, vx[0], vx[1], vx[2]);
if (spawnthinker && !(flags & SL_NODYNAMIC)) if (spawnthinker && (flags & SL_DYNAMIC))
P_AddDynSlopeThinker(ret, DP_VERTEX, NULL, 0, tags, vx); P_AddDynSlopeThinker(ret, DP_VERTEX, NULL, 0, tags, vx);
return ret; return ret;
@ -562,11 +468,11 @@ static void line_SpawnViaVertexes(const int linenum, const boolean spawnthinker)
pslope_t **slopetoset; pslope_t **slopetoset;
UINT16 tag1, tag2, tag3; UINT16 tag1, tag2, tag3;
UINT8 flags = SL_VERTEXSLOPE; UINT8 flags = 0;
if (line->flags & ML_NOSONIC) if (line->flags & ML_NOSONIC)
flags |= SL_NOPHYSICS; flags |= SL_NOPHYSICS;
if (!(line->flags & ML_NOTAILS)) if (line->flags & ML_NOTAILS)
flags |= SL_NODYNAMIC; flags |= SL_DYNAMIC;
switch(line->special) switch(line->special)
{ {

9
src/r_defs.h
View file

@ -237,10 +237,8 @@ typedef struct linechain_s
// Slopes // Slopes
#ifdef ESLOPE #ifdef ESLOPE
typedef enum { typedef enum {
SL_NOPHYSICS = 1, // Don't do momentum adjustment with this slope SL_NOPHYSICS = 1, /// This plane will have no physics applied besides the positioning.
SL_NODYNAMIC = 1<<1, // Slope will never need to move during the level, so don't fuss with recalculating it SL_DYNAMIC = 1<<1, /// This plane slope will be assigned a thinker to make it dynamic.
SL_ANCHORVERTEX = 1<<2, // Slope is using a Slope Vertex Thing to anchor its position
SL_VERTEXSLOPE = 1<<3, // Slope is built from three Slope Vertex Things
} slopeflags_t; } slopeflags_t;
typedef struct pslope_s typedef struct pslope_s
@ -252,9 +250,6 @@ typedef struct pslope_s
vector3_t o; /// Plane origin. vector3_t o; /// Plane origin.
vector3_t normal; /// Plane normal. vector3_t normal; /// Plane normal.
// For comparing when a slope should be rendered
fixed_t lowz, highz;
vector2_t d; /// Precomputed normalized projection of the normal over XY. vector2_t d; /// Precomputed normalized projection of the normal over XY.
fixed_t zdelta; /// Precomputed Z unit increase per XY unit. fixed_t zdelta; /// Precomputed Z unit increase per XY unit.