Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
1a29bd1e63 | ||
|
|
e54b6a780d | ||
|
|
c1a0b97c54 | ||
|
|
b8aaf63b20 | ||
|
|
d43b60ad83 | ||
|
|
cb5d3ab4e1 | ||
|
|
eba1cfb94d | ||
|
|
f5030e6a3c |
No files matched your search
@@ -246,6 +246,8 @@ set(SRB2_CONFIG_ASAN OFF CACHE BOOL
|
|||||||
"Compile with AddressSanitizer (libasan).")
|
"Compile with AddressSanitizer (libasan).")
|
||||||
set(SRB2_CONFIG_UBSAN OFF CACHE BOOL
|
set(SRB2_CONFIG_UBSAN OFF CACHE BOOL
|
||||||
"Compile with UndefinedBehaviorSanitizer (libubsan).")
|
"Compile with UndefinedBehaviorSanitizer (libubsan).")
|
||||||
|
set(SRB2_CONFIG_TSAN OFF CACHE BOOL
|
||||||
|
"Compile with ThreadSanitizer (libtsan).")
|
||||||
|
|
||||||
set(SRB2_CONFIG_MUMBLE ON CACHE BOOL
|
set(SRB2_CONFIG_MUMBLE ON CACHE BOOL
|
||||||
"Enable Mumble support")
|
"Enable Mumble support")
|
||||||
|
|||||||
+18
-5
@@ -75,6 +75,7 @@
|
|||||||
# PROFILEMODE=1 - Enable performance profiling (gprof).
|
# PROFILEMODE=1 - Enable performance profiling (gprof).
|
||||||
# USEASAN=1 - Enable building with Address Sanitizer.
|
# USEASAN=1 - Enable building with Address Sanitizer.
|
||||||
# USEUBSAN=1 - Enable building with Undefined Behavior Sanitizer.
|
# USEUBSAN=1 - Enable building with Undefined Behavior Sanitizer.
|
||||||
|
# USETSAN=1 - Enable building with Thread Sanitizer.
|
||||||
# NOLIBBACKTRACE=1 - Disable using Libbacktrace for crashlog traces.
|
# NOLIBBACKTRACE=1 - Disable using Libbacktrace for crashlog traces.
|
||||||
#
|
#
|
||||||
# General flags for building:
|
# General flags for building:
|
||||||
@@ -261,23 +262,35 @@ debug_opts=-D_DEBUG
|
|||||||
else # build a normal optimized version
|
else # build a normal optimized version
|
||||||
debug_opts=-DNDEBUG
|
debug_opts=-DNDEBUG
|
||||||
opts+=-O3
|
opts+=-O3
|
||||||
ifndef NOLTO
|
|
||||||
# compile with LTO
|
|
||||||
opts+=-flto=auto
|
|
||||||
libs+=-flto=auto
|
|
||||||
endif
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifdef USEASAN
|
ifdef USEASAN
|
||||||
# compile with asan
|
# compile with asan
|
||||||
opts+=-O1 -fsanitize=address -fno-omit-frame-pointer -fno-common
|
opts+=-O1 -fsanitize=address -fno-omit-frame-pointer -fno-common
|
||||||
libs+=-fsanitize=address
|
libs+=-fsanitize=address
|
||||||
|
NOLTO=1
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifdef USEUBSAN
|
ifdef USEUBSAN
|
||||||
# compile with ubsan
|
# compile with ubsan
|
||||||
opts+=-O1 -fsanitize=undefined -fno-omit-frame-pointer
|
opts+=-O1 -fsanitize=undefined -fno-omit-frame-pointer
|
||||||
libs+=-fsanitize=undefined
|
libs+=-fsanitize=undefined
|
||||||
|
NOLTO=1
|
||||||
|
endif
|
||||||
|
|
||||||
|
ifdef USETSAN
|
||||||
|
# compile with tsan
|
||||||
|
opts+=-O1 -fsanitize=thread -fno-omit-frame-pointer
|
||||||
|
libs+=-fsanitize=thread
|
||||||
|
NOLTO=1
|
||||||
|
endif
|
||||||
|
|
||||||
|
ifndef DEBUGMODE
|
||||||
|
ifndef NOLTO
|
||||||
|
# compile with LTO
|
||||||
|
opts+=-flto=auto
|
||||||
|
libs+=-flto=auto
|
||||||
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifdef USEJEMALLOC
|
ifdef USEJEMALLOC
|
||||||
|
|||||||
@@ -119,20 +119,25 @@ target_compile_definitions(SRB2SDL2 PRIVATE
|
|||||||
-DHAVE_THREADS
|
-DHAVE_THREADS
|
||||||
)
|
)
|
||||||
|
|
||||||
if(SRB2_CONFIG_LTO AND NOT SRB2_CONFIG_DEBUGMODE)
|
if(SRB2_CONFIG_LTO AND NOT SRB2_CONFIG_DEBUGMODE AND NOT SRB2_CONFIG_ASAN AND NOT SRB2_CONFIG_UBSAN AND NOT SRB2_CONFIG_TSAN)
|
||||||
set_property(TARGET SRB2SDL2 PROPERTY INTERPROCEDURAL_OPTIMIZATION TRUE)
|
set_property(TARGET SRB2SDL2 PROPERTY INTERPROCEDURAL_OPTIMIZATION TRUE)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(SRB2_CONFIG_ASAN)
|
if(SRB2_CONFIG_ASAN)
|
||||||
target_compile_options(SRB2SDL2 PRIVATE -fsanitize=address)
|
target_compile_options(SRB2SDL2 PRIVATE -O1 -fsanitize=address -fno-omit-frame-pointer -fno-common)
|
||||||
target_link_options(SRB2SDL2 PRIVATE -fsanitize=address)
|
target_link_options(SRB2SDL2 PRIVATE -fsanitize=address)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(SRB2_CONFIG_UBSAN)
|
if(SRB2_CONFIG_UBSAN)
|
||||||
target_compile_options(SRB2SDL2 PRIVATE -fsanitize=undefined)
|
target_compile_options(SRB2SDL2 PRIVATE -O1 -fsanitize=undefined -fno-omit-frame-pointer)
|
||||||
target_link_options(SRB2SDL2 PRIVATE -fsanitize=undefined)
|
target_link_options(SRB2SDL2 PRIVATE -fsanitize=undefined)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
if(SRB2_CONFIG_TSAN)
|
||||||
|
target_compile_options(SRB2SDL2 PRIVATE -O1 -fsanitize=thread -fno-omit-frame-pointer)
|
||||||
|
target_link_options(SRB2SDL2 PRIVATE -fsanitize=thread)
|
||||||
|
endif()
|
||||||
|
|
||||||
## strip debug symbols into separate file when using gcc
|
## strip debug symbols into separate file when using gcc
|
||||||
# if(CMAKE_COMPILER_IS_GNUCC)
|
# if(CMAKE_COMPILER_IS_GNUCC)
|
||||||
# if(${CMAKE_BUILD_TYPE} MATCHES Debug)
|
# if(${CMAKE_BUILD_TYPE} MATCHES Debug)
|
||||||
|
|||||||
+100
-16
@@ -96,7 +96,7 @@ static void HWR_FreePoly(poly_t *poly)
|
|||||||
// divfrac = how far along partline vector is crossing pt
|
// divfrac = how far along partline vector is crossing pt
|
||||||
static boolean fracdivline(fdivline_t *partline, polyvertex_t *v1, polyvertex_t *v2)
|
static boolean fracdivline(fdivline_t *partline, polyvertex_t *v1, polyvertex_t *v2)
|
||||||
{
|
{
|
||||||
double frac1, frac2;
|
double frac;
|
||||||
double num; // numerator
|
double num; // numerator
|
||||||
double den; // denominator
|
double den; // denominator
|
||||||
double v1x, v1y, v1dx, v1dy; // polygon side vector, v1->v2
|
double v1x, v1y, v1dx, v1dy; // polygon side vector, v1->v2
|
||||||
@@ -122,24 +122,23 @@ static boolean fracdivline(fdivline_t *partline, polyvertex_t *v1, polyvertex_t
|
|||||||
// first check the frac along the polygon segment,
|
// first check the frac along the polygon segment,
|
||||||
// (do not accept hit with the extensions)
|
// (do not accept hit with the extensions)
|
||||||
num = (v3x - v1x)*v3dy + (v1y - v3y)*v3dx;
|
num = (v3x - v1x)*v3dy + (v1y - v3y)*v3dx;
|
||||||
frac1 = num / den;
|
frac = num / den;
|
||||||
|
|
||||||
// 0= cross at v1, 1.0= cross at v2
|
// 0= cross at v1, 1.0= cross at v2
|
||||||
if (frac1 < 0.0 || frac1 > 1.0) // double
|
if (frac < 0.0 || frac > 1.0) // double
|
||||||
return false; // not within the polygon side
|
return false; // not within the polygon side
|
||||||
|
|
||||||
// now get the frac along the BSP line
|
// now get the frac along the BSP line
|
||||||
// which is useful to determine what is left, what is right
|
// which is useful to determine what is left, what is right
|
||||||
num = (v3x - v1x)*v1dy + (v1y - v3y)*v1dx;
|
num = (v3x - v1x)*v1dy + (v1y - v3y)*v1dx;
|
||||||
frac2 = num / den;
|
|
||||||
|
|
||||||
partline->divfrac = frac2; // how far along partline vector
|
partline->divfrac = num / den; // how far along partline vector
|
||||||
|
|
||||||
// [WDJ] find the interception point along the segment.
|
// [WDJ] find the interception point along the segment.
|
||||||
// It should be slightly more accurate because it is always closer to the
|
// It should be slightly more accurate because it is always closer to the
|
||||||
// crossing point than arbitrary positions on the partition line.
|
// crossing point than arbitrary positions on the partition line.
|
||||||
partline->divpt.x = v1x + v1dx*frac1;
|
partline->divpt.x = v1x + v1dx*frac;
|
||||||
partline->divpt.y = v1y + v1dy*frac1;
|
partline->divpt.y = v1y + v1dy*frac;
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
@@ -161,6 +160,71 @@ static boolean SameVertex(polyvertex_t *p1, polyvertex_t *p2)
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Adapted from function in prboom.
|
||||||
|
// Point is to rightside of divline when result > 0,
|
||||||
|
// but result is multiplied by length of divline.
|
||||||
|
// Returns near 0, when point is on, or nearly on, the divline.
|
||||||
|
static inline double point_rightside(fdivline_t *dl, polyvertex_t *v4)
|
||||||
|
{
|
||||||
|
// Cross product of dl and vector dl->(x,y) to v4,
|
||||||
|
// is > 0 when v4 is to right side of divline.
|
||||||
|
// Viewed along divline from vertex, looking towards positive dx,dy.
|
||||||
|
// If divline is rotated until dy>0 and dx = 0, then true when rotated
|
||||||
|
// vertex position is to the right of the divline (v4->x > dl->x).
|
||||||
|
return ((((double)(v4->x) - (double)(dl->x)) * (double)(dl->dy))
|
||||||
|
- (((double)(v4->y) - (double)(dl->y)) * (double)(dl->dx)));
|
||||||
|
}
|
||||||
|
|
||||||
|
// [WDJ] The front and back MUST match the BSP determination, else it will assign
|
||||||
|
// this poly to the wrong sector.
|
||||||
|
// May have 1 point on the line, and other points might be very close to the line.
|
||||||
|
// Can only trust a test of a point that is NOT on the line.
|
||||||
|
// Using a tstdist = 0.5f worked, but it might break on very small poly.
|
||||||
|
// Avactor.wad had polys with d = 9.09, 5552, 1.64, 1011, 14252, 0.0136, 0.00634, 14655, 3,
|
||||||
|
// -0.3044, 7, 1.53, etc..,
|
||||||
|
// and one poly with d = -0.023 with the rest of the points d > 0.
|
||||||
|
// One 14 point poly with divline len=8, had to test 9 points to find d = 36.
|
||||||
|
// Typical: divline len=70 d=6828, divline len=1.0 d=35, divline len=1.414 d=5.
|
||||||
|
// The result of point_rightside is proportional to the length of divline.
|
||||||
|
// The divline length can be from 1.414 to 14000.
|
||||||
|
static void UnsplitPoly(fdivline_t *dlnp, poly_t *poly,
|
||||||
|
poly_t **frontpoly, poly_t **backpoly)
|
||||||
|
{
|
||||||
|
int32_t i;
|
||||||
|
double d;
|
||||||
|
const double tstd = hypot((double)dlnp->dx, (double)dlnp->dy) / 2.0;
|
||||||
|
double sumd = 0; // accumulated left or rightness.
|
||||||
|
|
||||||
|
for (i = 0; i < poly->numpts; i++)
|
||||||
|
{
|
||||||
|
// Look for a point that is obviously to the left or right.
|
||||||
|
d = point_rightside(dlnp, &poly->pts[i]); // d > 0 is right
|
||||||
|
sumd += d;
|
||||||
|
|
||||||
|
if (d > tstd)
|
||||||
|
goto poly_rightside;
|
||||||
|
|
||||||
|
if (d < -tstd)
|
||||||
|
goto poly_leftside;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Did not find an obvious left or right point, then
|
||||||
|
if (sumd < 0)
|
||||||
|
goto poly_leftside;
|
||||||
|
|
||||||
|
poly_rightside:
|
||||||
|
// poly is to rightside of divline.
|
||||||
|
*frontpoly = poly;
|
||||||
|
*backpoly = NULL;
|
||||||
|
return;
|
||||||
|
|
||||||
|
poly_leftside:
|
||||||
|
// poly is to leftside of divline.
|
||||||
|
*frontpoly = NULL;
|
||||||
|
*backpoly = poly;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
// split a _CONVEX_ polygon in two convex polygons
|
// split a _CONVEX_ polygon in two convex polygons
|
||||||
// outputs:
|
// outputs:
|
||||||
// frontpoly : polygon on right side of bsp line
|
// frontpoly : polygon on right side of bsp line
|
||||||
@@ -263,10 +327,7 @@ static void SplitPoly (fdivline_t *dlnp, // splitting parametric line
|
|||||||
// linedefs where each side point the same sector, that is:
|
// linedefs where each side point the same sector, that is:
|
||||||
// the deep water effect with the original Doom
|
// the deep water effect with the original Doom
|
||||||
|
|
||||||
//TODO: make sure front poly is to front of partition line?
|
UnsplitPoly(dlnp, poly, frontpoly, backpoly);
|
||||||
|
|
||||||
*frontpoly = poly;
|
|
||||||
*backpoly = NULL;
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -274,16 +335,14 @@ static void SplitPoly (fdivline_t *dlnp, // splitting parametric line
|
|||||||
if (pe < 0)
|
if (pe < 0)
|
||||||
{
|
{
|
||||||
//I_Error("SplitPoly: only one point for split line (%d %d)", ps, pe);
|
//I_Error("SplitPoly: only one point for split line (%d %d)", ps, pe);
|
||||||
*frontpoly = poly;
|
UnsplitPoly(dlnp, poly, frontpoly, backpoly);
|
||||||
*backpoly = NULL;
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (pe <= ps)
|
if (pe <= ps)
|
||||||
{
|
{
|
||||||
//I_Error("SplitPoly: invalid splitting line (%d %d)", ps, pe);
|
//I_Error("SplitPoly: invalid splitting line (%d %d)", ps, pe);
|
||||||
*frontpoly = poly;
|
UnsplitPoly(dlnp, poly, frontpoly, backpoly);
|
||||||
*backpoly = NULL;
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -388,6 +447,10 @@ static poly_t *CutOutSubsecPoly(seg_t *lseg, INT32 segcount, poly_t *poly)
|
|||||||
vertex_t *v1, *v2;
|
vertex_t *v1, *v2;
|
||||||
fdivline_t cutseg; // x, y, dx, dy as start of node_t struct
|
fdivline_t cutseg; // x, y, dx, dy as start of node_t struct
|
||||||
|
|
||||||
|
// empty poly? just save us some time then
|
||||||
|
if (poly->numpts <= 0)
|
||||||
|
return frontpoly;
|
||||||
|
|
||||||
// for each seg of the subsector
|
// for each seg of the subsector
|
||||||
for (; segcount--; lseg++)
|
for (; segcount--; lseg++)
|
||||||
{
|
{
|
||||||
@@ -489,6 +552,23 @@ static poly_t *CutOutSubsecPoly(seg_t *lseg, INT32 segcount, poly_t *poly)
|
|||||||
// need 2 points
|
// need 2 points
|
||||||
if (pe >= 0)
|
if (pe >= 0)
|
||||||
{
|
{
|
||||||
|
// Cuts that miss the polygon.
|
||||||
|
if (ps_frac < 0.0 && cutseg.divfrac < 0.0)
|
||||||
|
continue;
|
||||||
|
|
||||||
|
if (ps_frac > 1.0 && cutseg.divfrac > 1.0)
|
||||||
|
continue;
|
||||||
|
#define FRAC_EP 0.01f
|
||||||
|
// Reject cuts that could make the polygon non-convex.
|
||||||
|
|
||||||
|
// Cannot make normal cut, ps_frac end is loose.
|
||||||
|
if ((ps_frac < (0.0 - FRAC_EP)) || (ps_frac > (1.0f + FRAC_EP)))
|
||||||
|
continue;
|
||||||
|
|
||||||
|
// Cannot make normal cut, cutseg.divfrac end is loose.
|
||||||
|
if ((cutseg.divfrac < (0.0 - FRAC_EP)) || (cutseg.divfrac > (1.0f + FRAC_EP)))
|
||||||
|
continue;
|
||||||
|
#undef FRAC_EP
|
||||||
// generate FRONT poly
|
// generate FRONT poly
|
||||||
frontpoly = HWR_AllocPoly(poly_num_pts);
|
frontpoly = HWR_AllocPoly(poly_num_pts);
|
||||||
|
|
||||||
@@ -680,7 +760,11 @@ static void WalkBSPNode(INT32 bspnum, poly_t *poly, UINT16 *leafnode, fixed_t *b
|
|||||||
memcpy(bbox, bsp->bbox[0], 4*sizeof (fixed_t));
|
memcpy(bbox, bsp->bbox[0], 4*sizeof (fixed_t));
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
I_Error("WalkBSPNode: no front poly?");
|
{
|
||||||
|
// [WDJ] Having no front poly is as likely as no back poly, since
|
||||||
|
// logic in Split Poly was changed to check poly direction.
|
||||||
|
// I_Error("HWR_WalkBSPNode: no front poly, bspnum= %d\n", bspnum);
|
||||||
|
}
|
||||||
|
|
||||||
// Recursively divide back space.
|
// Recursively divide back space.
|
||||||
if (backpoly)
|
if (backpoly)
|
||||||
|
|||||||
+2
-23
@@ -614,16 +614,8 @@ void HWR_FreeMapTextures(void)
|
|||||||
gl_numtextures = 0;
|
gl_numtextures = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
#define NAME flatcheck
|
|
||||||
#define KEY_TY UINT32
|
|
||||||
#define HASH_FN vt_hash_integer
|
|
||||||
#define CMPR_FN vt_cmpr_integer
|
|
||||||
#include "../verstable.h"
|
|
||||||
|
|
||||||
static void HWR_PrecacheLevelFlats(void)
|
static void HWR_PrecacheLevelFlats(void)
|
||||||
{
|
{
|
||||||
// lookup for flats that may´ve been already loaded
|
|
||||||
flatcheck flatpresent;
|
|
||||||
size_t i;
|
size_t i;
|
||||||
INT32 k;
|
INT32 k;
|
||||||
|
|
||||||
@@ -635,9 +627,6 @@ static void HWR_PrecacheLevelFlats(void)
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
flatcheck_init(&flatpresent);
|
|
||||||
flatcheck_reserve(&flatpresent, numlevelflats);
|
|
||||||
|
|
||||||
// special case for encore
|
// special case for encore
|
||||||
#if 0
|
#if 0
|
||||||
#ifdef GLENCORE
|
#ifdef GLENCORE
|
||||||
@@ -689,11 +678,7 @@ static void HWR_PrecacheLevelFlats(void)
|
|||||||
{
|
{
|
||||||
const levelflat_t *levelflat = &levelflats[i];
|
const levelflat_t *levelflat = &levelflats[i];
|
||||||
|
|
||||||
if (flatcheck_is_end(flatcheck_get(&flatpresent, levelflat->lumpnum)))
|
HWR_GetFlat(levelflat->lumpnum, false);
|
||||||
{
|
|
||||||
HWR_GetFlat(levelflat->lumpnum, false);
|
|
||||||
flatcheck_insert(&flatpresent, levelflat->lumpnum);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (levelflat->speed) // is it an animated flat ?
|
if (levelflat->speed) // is it an animated flat ?
|
||||||
{
|
{
|
||||||
@@ -701,17 +686,11 @@ static void HWR_PrecacheLevelFlats(void)
|
|||||||
for (k = 0; k < levelflat->numpics; k++)
|
for (k = 0; k < levelflat->numpics; k++)
|
||||||
{
|
{
|
||||||
lumpnum_t lump = levelflat->baselumpnum + k;
|
lumpnum_t lump = levelflat->baselumpnum + k;
|
||||||
if (flatcheck_is_end(flatcheck_get(&flatpresent, lump)))
|
HWR_GetFlat(lump, false);
|
||||||
{
|
|
||||||
HWR_GetFlat(lump, false);
|
|
||||||
flatcheck_insert(&flatpresent, lump);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
flatcheck_cleanup(&flatpresent);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void HWR_PrecacheLevelTextures(void)
|
static void HWR_PrecacheLevelTextures(void)
|
||||||
|
|||||||
+69
-45
@@ -1239,46 +1239,44 @@ static inline boolean HWR_BlendMidtextureSurface(FSurfaceInfo *pSurf)
|
|||||||
|
|
||||||
pSurf->PolyColor.s.alpha = 0xFF;
|
pSurf->PolyColor.s.alpha = 0xFF;
|
||||||
|
|
||||||
if (LIKELY(!gl_curline->polyseg))
|
// check if linedef alpha is within range
|
||||||
{
|
const boolean linealpha = (gl_linedef->alpha >= 0 && gl_linedef->alpha < FRACUNIT);
|
||||||
// check if linedef alpha is within range
|
|
||||||
const boolean linealpha = (gl_linedef->alpha >= 0 && gl_linedef->alpha < FRACUNIT);
|
|
||||||
|
|
||||||
// set alpha for transparent walls
|
// set alpha for transparent walls
|
||||||
switch (gl_linedef->special)
|
switch (gl_linedef->special)
|
||||||
{
|
{
|
||||||
// Translucent linedef types
|
// Translucent linedef types
|
||||||
case 102:
|
case 102:
|
||||||
case 121 ... 125:
|
case 121 ... 125:
|
||||||
case 141 ... 145:
|
case 141 ... 145:
|
||||||
case 174:
|
case 174:
|
||||||
case 175:
|
case 175:
|
||||||
case 192:
|
case 192:
|
||||||
case 195:
|
case 195:
|
||||||
case 221:
|
case 221:
|
||||||
case 253:
|
case 253:
|
||||||
case 256:
|
case 256:
|
||||||
if (gl_linedef->blendmode && linealpha)
|
if (gl_linedef->blendmode && linealpha)
|
||||||
|
blendmode = HWR_SurfaceBlend(gl_linedef->blendmode, R_GetLinedefTransTable(gl_linedef->alpha), pSurf);
|
||||||
|
else
|
||||||
|
blendmode = PF_Translucent;
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
if (gl_linedef->blendmode)
|
||||||
|
{
|
||||||
|
if (linealpha)
|
||||||
blendmode = HWR_SurfaceBlend(gl_linedef->blendmode, R_GetLinedefTransTable(gl_linedef->alpha), pSurf);
|
blendmode = HWR_SurfaceBlend(gl_linedef->blendmode, R_GetLinedefTransTable(gl_linedef->alpha), pSurf);
|
||||||
else
|
else
|
||||||
blendmode = PF_Translucent;
|
blendmode = HWR_GetBlendModeFlag(gl_linedef->blendmode);
|
||||||
break;
|
}
|
||||||
default:
|
else if (linealpha)
|
||||||
if (gl_linedef->blendmode)
|
blendmode = HWR_TranstableToAlpha(R_GetLinedefTransTable(gl_linedef->alpha), pSurf);
|
||||||
{
|
else
|
||||||
if (linealpha)
|
blendmode = PF_Masked;
|
||||||
blendmode = HWR_SurfaceBlend(gl_linedef->blendmode, R_GetLinedefTransTable(gl_linedef->alpha), pSurf);
|
break;
|
||||||
else
|
|
||||||
blendmode = HWR_GetBlendModeFlag(gl_linedef->blendmode);
|
|
||||||
}
|
|
||||||
else if (linealpha)
|
|
||||||
blendmode = HWR_TranstableToAlpha(R_GetLinedefTransTable(gl_linedef->alpha), pSurf);
|
|
||||||
else
|
|
||||||
blendmode = PF_Masked;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
else if (gl_curline->polyseg->translucency > 0)
|
|
||||||
|
if (gl_curline->polyseg && gl_curline->polyseg->translucency > 0)
|
||||||
{
|
{
|
||||||
// Polyobject translucency is shared between all of its lines
|
// Polyobject translucency is shared between all of its lines
|
||||||
if (gl_curline->polyseg->translucency >= NUMTRANSMAPS) // wall not drawn
|
if (gl_curline->polyseg->translucency >= NUMTRANSMAPS) // wall not drawn
|
||||||
@@ -1385,7 +1383,8 @@ void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
|
|||||||
// two sided line
|
// two sided line
|
||||||
if (gl_backsector)
|
if (gl_backsector)
|
||||||
{
|
{
|
||||||
INT32 gl_toptexture = 0, gl_bottomtexture = 0;
|
const INT32 gl_toptexture = R_GetTextureNum(gl_sidedef->toptexture);
|
||||||
|
const INT32 gl_bottomtexture = R_GetTextureNum(gl_sidedef->bottomtexture);
|
||||||
|
|
||||||
fixed_t texturevpeg;
|
fixed_t texturevpeg;
|
||||||
|
|
||||||
@@ -1396,7 +1395,7 @@ void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
|
|||||||
if (!gl_curline->polyseg) // Don't do it for polyobjects
|
if (!gl_curline->polyseg) // Don't do it for polyobjects
|
||||||
{
|
{
|
||||||
// Sky Ceilings
|
// Sky Ceilings
|
||||||
wallVerts[3].y = wallVerts[2].y = FLOATMAX;
|
wallVerts[2].y = wallVerts[3].y = FLOATMAX; // draw to top of map space
|
||||||
|
|
||||||
auto draw_sky_walls = []
|
auto draw_sky_walls = []
|
||||||
(int vert1, int vert2, fixed_t world, fixed_t worldslope, auto& wwallVerts, auto& sSurf) FUNCINLINE
|
(int vert1, int vert2, fixed_t world, fixed_t worldslope, auto& wwallVerts, auto& sSurf) FUNCINLINE
|
||||||
@@ -1406,6 +1405,9 @@ void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
|
|||||||
HWR_DrawSkyWall(wwallVerts, &sSurf);
|
HWR_DrawSkyWall(wwallVerts, &sSurf);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
// worldtop = front ceiling
|
||||||
|
// worldhigh = back ceiling
|
||||||
|
|
||||||
if (gl_frontsector->ceilingpic == skyflatnum)
|
if (gl_frontsector->ceilingpic == skyflatnum)
|
||||||
{
|
{
|
||||||
if (gl_backsector->ceilingpic == skyflatnum)
|
if (gl_backsector->ceilingpic == skyflatnum)
|
||||||
@@ -1424,6 +1426,17 @@ void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
|
|||||||
worldtop = worldhigh;
|
worldtop = worldhigh;
|
||||||
worldtopslope = worldhighslope;
|
worldtopslope = worldhighslope;
|
||||||
}
|
}
|
||||||
|
else if (!gl_toptexture &&
|
||||||
|
(worldhigh <= worldtop && worldhighslope <= worldtopslope) && // Assuming ESLOPE is always on with my changes
|
||||||
|
(worldhigh != worldtop || worldhighslope != worldtopslope))
|
||||||
|
{
|
||||||
|
// Only the frontsector is sky.
|
||||||
|
// If there's no upper texture, extend the sky wall
|
||||||
|
// down to the lower of the two ceilings.
|
||||||
|
fixed_t top = std::min(worldtop, worldhigh);
|
||||||
|
fixed_t topslope = std::min(worldtopslope, worldhighslope);
|
||||||
|
draw_sky_walls(0, 1, top, topslope, wallVerts, Surf);
|
||||||
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
// Only the frontsector is sky, just draw a skywall from the front ceiling
|
// Only the frontsector is sky, just draw a skywall from the front ceiling
|
||||||
@@ -1436,8 +1449,11 @@ void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
|
|||||||
draw_sky_walls(0, 1, worldtop, worldtopslope, wallVerts, Surf);
|
draw_sky_walls(0, 1, worldtop, worldtopslope, wallVerts, Surf);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// worldbottom = front floor
|
||||||
|
// worldlow = back floor
|
||||||
|
|
||||||
// Sky Floors
|
// Sky Floors
|
||||||
wallVerts[0].y = wallVerts[1].y = FLOATMIN;
|
wallVerts[0].y = wallVerts[1].y = FLOATMIN; // draw to bottom of map space
|
||||||
|
|
||||||
if (gl_frontsector->floorpic == skyflatnum)
|
if (gl_frontsector->floorpic == skyflatnum)
|
||||||
{
|
{
|
||||||
@@ -1449,7 +1465,7 @@ void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
|
|||||||
if ((worldlow >= worldbottom && worldlowslope >= worldbottomslope)
|
if ((worldlow >= worldbottom && worldlowslope >= worldbottomslope)
|
||||||
&& (worldlow != worldbottom || worldlowslope != worldbottomslope)
|
&& (worldlow != worldbottom || worldlowslope != worldbottomslope)
|
||||||
// Removing the second line above will render more rarely visible skywalls. Example: Cave garden ceiling in Dark race
|
// Removing the second line above will render more rarely visible skywalls. Example: Cave garden ceiling in Dark race
|
||||||
&& !(gl_sidedef->bottomtexture))
|
&& !(gl_bottomtexture))
|
||||||
{
|
{
|
||||||
draw_sky_walls(3, 2, worldlow, worldlowslope, wallVerts, Surf);
|
draw_sky_walls(3, 2, worldlow, worldlowslope, wallVerts, Surf);
|
||||||
}
|
}
|
||||||
@@ -1460,15 +1476,25 @@ void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
|
|||||||
draw_sky_walls(3, 2, worldbottom, worldbottomslope, wallVerts, Surf);
|
draw_sky_walls(3, 2, worldbottom, worldbottomslope, wallVerts, Surf);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if ((gl_backsector->floorpic == skyflatnum) && !(gl_sidedef->bottomtexture))
|
else if ((gl_backsector->floorpic == skyflatnum) && !(gl_bottomtexture))
|
||||||
{
|
{
|
||||||
// Only the backsector has sky, just draw a skywall from the back floor if there's no bottomtexture
|
// Only the backsector has sky, just draw a skywall from the back floor if there's no bottomtexture
|
||||||
draw_sky_walls(3, 2, worldlow, worldlowslope, wallVerts, Surf);
|
draw_sky_walls(3, 2, worldlow, worldlowslope, wallVerts, Surf);
|
||||||
}
|
}
|
||||||
|
else if (gl_frontsector->ceilingpic == skyflatnum &&
|
||||||
|
gl_backsector->ceilingpic == skyflatnum &&
|
||||||
|
(worldlow >= worldbottom && worldlowslope >= worldbottomslope)
|
||||||
|
&& (worldlow != worldbottom || worldlowslope != worldbottomslope)
|
||||||
|
// Removing the second line above will render more rarely visible skywalls. Example: Cave garden ceiling in Dark race
|
||||||
|
&& !(gl_bottomtexture))
|
||||||
|
{
|
||||||
|
// Both ceilings are sky, but neither floor is sky.
|
||||||
|
// If there's a lower wall gap without a bottom texture,
|
||||||
|
// draw a skywall from the backsector's higher floor.
|
||||||
|
draw_sky_walls(3, 2, worldlow, worldlowslope, wallVerts, Surf);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
gl_toptexture = R_GetTextureNum(gl_sidedef->toptexture);
|
|
||||||
|
|
||||||
// check TOP TEXTURE
|
// check TOP TEXTURE
|
||||||
if (gl_toptexture && (worldhighslope < worldtopslope || worldhigh < worldtop))
|
if (gl_toptexture && (worldhighslope < worldtopslope || worldhigh < worldtop))
|
||||||
{
|
{
|
||||||
@@ -1532,8 +1558,6 @@ void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
|
|||||||
HWR_ProjectWall(wallVerts, &Surf, PF_Masked, lightnum, colormap);
|
HWR_ProjectWall(wallVerts, &Surf, PF_Masked, lightnum, colormap);
|
||||||
}
|
}
|
||||||
|
|
||||||
gl_bottomtexture = R_GetTextureNum(gl_sidedef->bottomtexture);
|
|
||||||
|
|
||||||
// check BOTTOM TEXTURE
|
// check BOTTOM TEXTURE
|
||||||
if (gl_bottomtexture && (worldlowslope > worldbottomslope || worldlow > worldbottom))
|
if (gl_bottomtexture && (worldlowslope > worldbottomslope || worldlow > worldbottom))
|
||||||
{
|
{
|
||||||
|
|||||||
+11
-6
@@ -570,13 +570,13 @@ static void P_LoadSegs(UINT8 *data)
|
|||||||
|
|
||||||
if (seg->sidedef == &sides[seg->linedef->sidenum[0]])
|
if (seg->sidedef == &sides[seg->linedef->sidenum[0]])
|
||||||
{
|
{
|
||||||
seg->v1 = lines[ms->linedef].v1;
|
seg->v1 = lines[rawlinedef].v1;
|
||||||
seg->v2 = lines[ms->linedef].v2;
|
seg->v2 = lines[rawlinedef].v2;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
seg->v1 = lines[ms->linedef].v2;
|
seg->v1 = lines[rawlinedef].v2;
|
||||||
seg->v2 = lines[ms->linedef].v1;
|
seg->v2 = lines[rawlinedef].v1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
@@ -584,7 +584,6 @@ static void P_LoadSegs(UINT8 *data)
|
|||||||
seg->v1 = &vertexes[v1];
|
seg->v1 = &vertexes[v1];
|
||||||
seg->v2 = &vertexes[v2];
|
seg->v2 = &vertexes[v2];
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef HWRENDER
|
#ifdef HWRENDER
|
||||||
if (rendermode == render_opengl)
|
if (rendermode == render_opengl)
|
||||||
{
|
{
|
||||||
@@ -597,7 +596,6 @@ static void P_LoadSegs(UINT8 *data)
|
|||||||
//seg->fv2.z = FixedToFloat(seg->v2->z);
|
//seg->fv2.z = FixedToFloat(seg->v2->z);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
seg->length = P_SegLength(seg);
|
seg->length = P_SegLength(seg);
|
||||||
|
|
||||||
P_UpdateSegLightOffset(seg);
|
P_UpdateSegLightOffset(seg);
|
||||||
@@ -2096,6 +2094,13 @@ static void P_LoadMapBSP(const virtres_t* virt)
|
|||||||
virtlump_t* virtsegs = vres_Find(virt, "SEGS");
|
virtlump_t* virtsegs = vres_Find(virt, "SEGS");
|
||||||
virtlump_t* virtnodes = vres_Find(virt, "NODES");
|
virtlump_t* virtnodes = vres_Find(virt, "NODES");
|
||||||
|
|
||||||
|
if (!virtssectors)
|
||||||
|
I_Error("SSECTORS lump not found");
|
||||||
|
if (!virtsegs)
|
||||||
|
I_Error("SEGS lump not found");
|
||||||
|
if (!virtnodes)
|
||||||
|
I_Error("NODES lump not found");
|
||||||
|
|
||||||
numsubsectors = virtssectors->size / sizeof(mapsubsector_t);
|
numsubsectors = virtssectors->size / sizeof(mapsubsector_t);
|
||||||
numnodes = virtnodes->size / sizeof(mapnode_t);
|
numnodes = virtnodes->size / sizeof(mapnode_t);
|
||||||
numsegs = virtsegs->size / sizeof(mapseg_t);
|
numsegs = virtsegs->size / sizeof(mapseg_t);
|
||||||
|
|||||||
@@ -233,20 +233,25 @@ if(${SDL2_FOUND})
|
|||||||
-DHAVE_THREADS
|
-DHAVE_THREADS
|
||||||
)
|
)
|
||||||
|
|
||||||
if(SRB2_CONFIG_LTO AND NOT SRB2_CONFIG_DEBUGMODE)
|
if(SRB2_CONFIG_LTO AND NOT SRB2_CONFIG_DEBUGMODE AND NOT SRB2_CONFIG_ASAN AND NOT SRB2_CONFIG_UBSAN AND NOT SRB2_CONFIG_TSAN)
|
||||||
set_property(TARGET SRB2SDL2 PROPERTY INTERPROCEDURAL_OPTIMIZATION TRUE)
|
set_property(TARGET SRB2SDL2 PROPERTY INTERPROCEDURAL_OPTIMIZATION TRUE)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(SRB2_CONFIG_ASAN)
|
if(SRB2_CONFIG_ASAN)
|
||||||
target_compile_options(SRB2SDL2 PRIVATE -fsanitize=address)
|
target_compile_options(SRB2SDL2 PRIVATE -O1 -fsanitize=address -fno-omit-frame-pointer -fno-common)
|
||||||
target_link_options(SRB2SDL2 PRIVATE -fsanitize=address)
|
target_link_options(SRB2SDL2 PRIVATE -fsanitize=address)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(SRB2_CONFIG_UBSAN)
|
if(SRB2_CONFIG_UBSAN)
|
||||||
target_compile_options(SRB2SDL2 PRIVATE -fsanitize=undefined)
|
target_compile_options(SRB2SDL2 PRIVATE -O1 -fsanitize=undefined -fno-omit-frame-pointer)
|
||||||
target_link_options(SRB2SDL2 PRIVATE -fsanitize=undefined)
|
target_link_options(SRB2SDL2 PRIVATE -fsanitize=undefined)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
if(SRB2_CONFIG_TSAN)
|
||||||
|
target_compile_options(SRB2SDL2 PRIVATE -O1 -fsanitize=thread -fno-omit-frame-pointer)
|
||||||
|
target_link_options(SRB2SDL2 PRIVATE -fsanitize=thread)
|
||||||
|
endif()
|
||||||
|
|
||||||
if(NOT SRB2_CONFIG_MUMBLE)
|
if(NOT SRB2_CONFIG_MUMBLE)
|
||||||
target_compile_options(SRB2SDL2 PRIVATE -DNOMUMBLE)
|
target_compile_options(SRB2SDL2 PRIVATE -DNOMUMBLE)
|
||||||
endif()
|
endif()
|
||||||
|
|||||||
Reference in new issue
Block a user