From 231646ae72226f2aea99fbb547c5f6ee67a7fb0e Mon Sep 17 00:00:00 2001 From: Alibek Omarov Date: Mon, 13 Apr 2026 13:12:01 +0500 Subject: [PATCH] ref: soft: drop broken code for all non-viewer viewpasses --- ref/soft/r_local.h | 10 --------- ref/soft/r_main.c | 52 ++++++++++++++++----------------------------- ref/soft/r_sprite.c | 13 +++--------- ref/soft/r_studio.c | 7 ++---- 4 files changed, 23 insertions(+), 59 deletions(-) diff --git a/ref/soft/r_local.h b/ref/soft/r_local.h index 19861216..dc4cba8d 100644 --- a/ref/soft/r_local.h +++ b/ref/soft/r_local.h @@ -61,17 +61,9 @@ typedef int fixed16_t; #define SHADE_LAMBERT 1.4953241 #define DEFAULT_ALPHATEST 0.0f -// refparams -#define RP_NONE 0 -#define RP_ENVVIEW BIT( 0 ) // used for cubemapshot -#define RP_OLDVIEWLEAF BIT( 1 ) -#define RP_CLIPPLANE BIT( 2 ) - -#define RP_NONVIEWERREF ( RP_ENVVIEW ) #define R_ModelOpaque( rm ) ( rm == kRenderNormal ) #define R_StaticEntity( ent ) ( VectorIsNull( ent->origin ) && VectorIsNull( ent->angles )) #define RP_LOCALCLIENT( e ) (( e ) != NULL && ( e )->index == ( gp_cl->playernum + 1 ) && e->player ) -#define RP_NORMALPASS() ( FBitSet( RI.params, RP_NONVIEWERREF ) == 0 ) #define CL_IsViewEntityLocalPlayer() ( gp_cl->viewentity == ( gp_cl->playernum + 1 )) @@ -130,8 +122,6 @@ extern viddef_t vid; typedef struct { - int params; // rendering parameters - qboolean drawWorld; // ignore world for drawing PlayerModel qboolean isSkyVisible; // sky is visible qboolean onlyClientDraw; // disabled by client request diff --git a/ref/soft/r_main.c b/ref/soft/r_main.c index 2ee84276..77dfe52e 100644 --- a/ref/soft/r_main.c +++ b/ref/soft/r_main.c @@ -1053,7 +1053,7 @@ static void R_MarkLeaves( void ) tr.visframecount++; r_oldviewcluster = r_viewcluster; - gEngfuncs.R_FatPVS( RI.pvsorigin, r_pvs_radius->value, RI.visbytes, FBitSet( RI.params, RP_OLDVIEWLEAF ), false ); + gEngfuncs.R_FatPVS( RI.pvsorigin, r_pvs_radius->value, RI.visbytes, false, false ); vis = RI.visbytes; for( i = 0; i < WORLDMODEL->numleafs; i++ ) @@ -1086,10 +1086,7 @@ void GAME_EXPORT R_RenderScene( void ) gEngfuncs.Host_Error( "%s: NULL worldmodel\n", __func__ ); // frametime is valid only for normal pass - if( RP_NORMALPASS( )) - tr.frametime = gp_cl->time - gp_cl->oldtime; - else - tr.frametime = 0.0; + tr.frametime = gp_cl->time - gp_cl->oldtime; // begin a new frame tr.framecount++; @@ -1160,7 +1157,6 @@ set initial params for renderer */ void R_SetupRefParams( const ref_viewpass_t *rvp ) { - RI.params = RP_NONE; RI.drawWorld = FBitSet( rvp->flags, RF_DRAW_WORLD ); RI.onlyClientDraw = FBitSet( rvp->flags, RF_ONLY_CLIENTDRAW ); @@ -1482,43 +1478,31 @@ int CL_FxBlend( cl_entity_t *e ) blend = e->curstate.renderamt + 0x10 * sin( gp_cl->time * 8 + offset ); break; case kRenderFxFadeSlow: - if( RP_NORMALPASS( )) - { - if( e->curstate.renderamt > 0 ) - e->curstate.renderamt -= 1; - else - e->curstate.renderamt = 0; - } + if( e->curstate.renderamt > 0 ) + e->curstate.renderamt -= 1; + else + e->curstate.renderamt = 0; blend = e->curstate.renderamt; break; case kRenderFxFadeFast: - if( RP_NORMALPASS( )) - { - if( e->curstate.renderamt > 3 ) - e->curstate.renderamt -= 4; - else - e->curstate.renderamt = 0; - } + if( e->curstate.renderamt > 3 ) + e->curstate.renderamt -= 4; + else + e->curstate.renderamt = 0; blend = e->curstate.renderamt; break; case kRenderFxSolidSlow: - if( RP_NORMALPASS( )) - { - if( e->curstate.renderamt < 255 ) - e->curstate.renderamt += 1; - else - e->curstate.renderamt = 255; - } + if( e->curstate.renderamt < 255 ) + e->curstate.renderamt += 1; + else + e->curstate.renderamt = 255; blend = e->curstate.renderamt; break; case kRenderFxSolidFast: - if( RP_NORMALPASS( )) - { - if( e->curstate.renderamt < 252 ) - e->curstate.renderamt += 4; - else - e->curstate.renderamt = 255; - } + if( e->curstate.renderamt < 252 ) + e->curstate.renderamt += 4; + else + e->curstate.renderamt = 255; blend = e->curstate.renderamt; break; case kRenderFxStrobeSlow: diff --git a/ref/soft/r_sprite.c b/ref/soft/r_sprite.c index 8f101448..d74df2f4 100644 --- a/ref/soft/r_sprite.c +++ b/ref/soft/r_sprite.c @@ -68,13 +68,9 @@ static float R_SpriteGlowBlend( vec3_t origin, int rendermode, int renderfx, flo VectorSubtract( origin, RI.vieworg, glowDist ); dist = VectorLength( glowDist ); - if( RP_NORMALPASS( )) - { - pmtrace_t *tr = gEngfuncs.EV_VisTraceLine( RI.vieworg, origin, r_traceglow.value ? PM_GLASS_IGNORE : ( PM_GLASS_IGNORE | PM_STUDIO_IGNORE )); - - if(( 1.0f - tr->fraction ) * dist > 8.0f ) - return 0.0f; - } + pmtrace_t *tr = gEngfuncs.EV_VisTraceLine( RI.vieworg, origin, r_traceglow.value ? PM_GLASS_IGNORE : ( PM_GLASS_IGNORE | PM_STUDIO_IGNORE )); + if(( 1.0f - tr->fraction ) * dist > 8.0f ) + return 0.0f; if( renderfx == kRenderFxNoDissipation ) return 1.0f; @@ -172,9 +168,6 @@ void R_DrawSpriteModel( cl_entity_t *e ) vec3_t v_forward, v_right, v_up; vec3_t origin, color; - if( RI.params & RP_ENVVIEW ) - return; - model = e->model; psprite = (msprite_t *)model->cache.data; VectorCopy( e->origin, origin ); // set render origin diff --git a/ref/soft/r_studio.c b/ref/soft/r_studio.c index 9c1b2960..38b37219 100644 --- a/ref/soft/r_studio.c +++ b/ref/soft/r_studio.c @@ -3124,9 +3124,6 @@ R_DrawStudioModel */ void R_DrawStudioModel( cl_entity_t *e ) { - if( FBitSet( RI.params, RP_ENVVIEW )) - return; - R_StudioSetupTimings(); if( e->player ) @@ -3180,7 +3177,7 @@ void R_RunViewmodelEvents( void ) return; // ignore in thirdperson, camera view or client is died - if( !RP_NORMALPASS() || ENGINE_GET_PARM( PARM_LOCAL_HEALTH ) <= 0 || !CL_IsViewEntityLocalPlayer()) + if( ENGINE_GET_PARM( PARM_LOCAL_HEALTH ) <= 0 || !CL_IsViewEntityLocalPlayer()) return; RI.currententity = tr.viewent; @@ -3230,7 +3227,7 @@ void R_DrawViewModel( void ) return; // ignore in thirdperson, camera view or client is died - if( !RP_NORMALPASS() || ENGINE_GET_PARM( PARM_LOCAL_HEALTH ) <= 0 || !CL_IsViewEntityLocalPlayer()) + if( ENGINE_GET_PARM( PARM_LOCAL_HEALTH ) <= 0 || !CL_IsViewEntityLocalPlayer()) return; tr.blend = CL_FxBlend( view ) / 255.0f;