stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-22 04:21:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'rendercvars' into 'next'

Browse source 
Rendering cvars that control rendering walls, floors, and things.

See merge request STJr/SRB2!1526
This commit is contained in:
Logan Aerl Arias 2024-02-24 03:02:48 +00:00
commit 5be61987ca
7 changed files with 84 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/hardware/hw_main.c
View file

@ -544,6 +544,9 @@ static void HWR_RenderPlane(subsector_t *subsector, extrasubsector_t *xsub, bool
PolyFlags |= PF_ColorMapped;
}
if (!cv_renderfloors.value)
return;
HWR_ProcessPolygon(&Surf, planeVerts, nrPlaneVerts, PolyFlags, shader, false);
if (subsector)
@ -772,6 +775,9 @@ static void HWR_ProjectWall(FOutVector *wallVerts, FSurfaceInfo *pSurf, FBITFIEL
{
INT32 shader = SHADER_NONE;
if (!cv_renderwalls.value)
return;
HWR_Lighting(pSurf, lightlevel, wallcolormap);
if (HWR_UseShader())
@ -845,6 +851,9 @@ static void HWR_SplitWall(sector_t *sector, FOutVector *wallVerts, INT32 texnum,
FUINT lightnum = HWR_CalcWallLight(sector->lightlevel, v1x, v1y, v2x, v2y);
extracolormap_t *colormap = NULL;
if (!cv_renderwalls.value)
return;
realtop = top = wallVerts[3].y;
realbot = bot = wallVerts[0].y;
diff = top - bot;
@ -5073,6 +5082,9 @@ static void HWR_ProjectSprite(mobj_t *thing)
// uncapped/interpolation
interpmobjstate_t interp = {0};
if (!cv_renderthings.value)
return;
if (!thing)
return;
@ -6759,6 +6771,9 @@ void HWR_AddTransparentWall(FOutVector *wallVerts, FSurfaceInfo *pSurf, INT32 te
{
static size_t allocedwalls = 0;
if (!cv_renderwalls.value)
return;
// Force realloc if buffer has been freed
if (!wallinfo)
allocedwalls = 0;
@ -6787,6 +6802,9 @@ void HWR_RenderWall(FOutVector *wallVerts, FSurfaceInfo *pSurf, FBITFIELD blend,
INT32 shader = SHADER_NONE;
if (!cv_renderwalls.value)
return;
// Lighting is done here instead so that fog isn't drawn incorrectly on transparent walls after sorting
HWR_Lighting(pSurf, lightlevel, wallcolormap);

3
src/netcode/d_netcmd.c
View file

@ -893,6 +893,9 @@ void D_RegisterClientCommands(void)
CV_RegisterVar(&cv_renderhitboxinterpolation);
CV_RegisterVar(&cv_renderhitboxgldepth);
CV_RegisterVar(&cv_renderhitbox);
CV_RegisterVar(&cv_renderwalls);
CV_RegisterVar(&cv_renderfloors);
CV_RegisterVar(&cv_renderthings);
CV_RegisterVar(&cv_renderer);
CV_RegisterVar(&cv_scr_depth);
CV_RegisterVar(&cv_scr_width);

3
src/r_plane.c
View file

@ -881,6 +881,9 @@ void R_DrawSinglePlane(visplane_t *pl)
if (!(pl->minx <= pl->maxx))
return;
if (!cv_renderfloors.value)
return;
// sky flat
if (pl->picnum == skyflatnum)
{

15
src/r_segs.c
View file

@ -117,6 +117,9 @@ void R_RenderMaskedSegRange(drawseg_t *ds, INT32 x1, INT32 x2)
INT32 range;
unsigned lengthcol;
if (!cv_renderwalls.value)
return;
// Calculate light table.
// Use different light tables
// for horizontal / vertical / diagonal. Diagonal?
@ -505,6 +508,9 @@ void R_RenderThickSideRange(drawseg_t *ds, INT32 x1, INT32 x2, ffloor_t *pfloor)
void (*colfunc_2s) (column_t *, unsigned);
if (!cv_renderwalls.value)
return;
// Calculate light table.
// Use different light tables
// for horizontal / vertical / diagonal. Diagonal?
@ -1246,6 +1252,8 @@ static void R_RenderSegLoop (void)
{
// single sided line
if (yl <= yh && yh >= 0 && yl < viewheight)
{
if (cv_renderwalls.value)
{
fixed_t offset = texturecolumn + rw_offsetx;
@ -1270,6 +1278,7 @@ static void R_RenderSegLoop (void)
(INT32)mytotal);
#endif
//profile stuff ---------------------------------------------------------
}
// dont draw anything more for this column, since
// a midtexture blocks the view
@ -1312,6 +1321,8 @@ static void R_RenderSegLoop (void)
ceilingclip[rw_x] = (INT16)viewheight;
}
else if (mid >= 0) // safe to draw top texture
{
if (cv_renderwalls.value)
{
fixed_t offset = rw_offset_top;
if (rw_toptexturescalex < 0)
@ -1325,6 +1336,7 @@ static void R_RenderSegLoop (void)
dc_source = R_GetColumn(toptexture, offset >> FRACBITS)->pixels;
dc_texheight = textureheight[toptexture]>>FRACBITS;
colfunc();
}
ceilingclip[rw_x] = (INT16)mid;
}
else if (!rw_ceilingmarked) // entirely off top of screen
@ -1360,6 +1372,8 @@ static void R_RenderSegLoop (void)
floorclip[rw_x] = -1;
}
else if (mid < viewheight) // safe to draw bottom texture
{
if (cv_renderwalls.value)
{
fixed_t offset = rw_offset_bottom;
if (rw_bottomtexturescalex < 0)
@ -1373,6 +1387,7 @@ static void R_RenderSegLoop (void)
dc_source = R_GetColumn(bottomtexture, offset >> FRACBITS)->pixels;
dc_texheight = textureheight[bottomtexture]>>FRACBITS;
colfunc();
}
floorclip[rw_x] = (INT16)mid;
}
else if (!rw_floormarked) // entirely off bottom of screen

3
src/r_things.c
View file

@ -1528,6 +1528,9 @@ static void R_ProjectSprite(mobj_t *thing)
// uncapped/interpolation
interpmobjstate_t interp = {0};
if (!cv_renderthings.value)
return;
// do interpolation
if (R_UsingFrameInterpolation() && !paused)
{

3
src/screen.c
View file

@ -71,6 +71,9 @@ consvar_t cv_scr_height_w = CVAR_INIT ("scr_height_w", "400", CV_SAVE, CV_Unsign
consvar_t cv_scr_depth = CVAR_INIT ("scr_depth", "16 bits", CV_SAVE, scr_depth_cons_t, NULL);
consvar_t cv_renderview = CVAR_INIT ("renderview", "On", 0, CV_OnOff, NULL);
consvar_t cv_renderwalls = CVAR_INIT ("renderwalls", "On", CV_NOTINNET|CV_CHEAT, CV_OnOff, NULL);
consvar_t cv_renderfloors = CVAR_INIT ("renderfloors", "On", CV_NOTINNET|CV_CHEAT, CV_OnOff, NULL);
consvar_t cv_renderthings = CVAR_INIT ("renderthings", "On", CV_NOTINNET|CV_CHEAT, CV_OnOff, NULL);
CV_PossibleValue_t cv_renderer_t[] = {
{1, "Software"},

1
src/screen.h
View file

@ -187,6 +187,7 @@ extern INT32 scr_bpp;
extern UINT8 *scr_borderpatch; // patch used to fill the view borders
extern consvar_t cv_scr_width, cv_scr_height, cv_scr_width_w, cv_scr_height_w, cv_scr_depth, cv_fullscreen;
extern consvar_t cv_renderwalls, cv_renderfloors, cv_renderthings;
extern consvar_t cv_renderview, cv_renderer;
extern consvar_t cv_renderhitbox, cv_renderhitboxinterpolation, cv_renderhitboxgldepth;
// wait for page flipping to end or not