Skip to content

Commit 8518788

Browse files
VReaperVVReaperV
committed
Change most renderer cvars to new-style
1 parent f39cd2b commit 8518788

24 files changed

+519
-569
lines changed

‎src/engine/renderer/InternalImage.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -139,16 +139,16 @@ int R_GetImageCustomScalingStep( const image_t *image, const imageParams_t &imag
139139
return scalingStep;
140140
}
141141

142-
int materialMinDimension = r_ignoreMaterialMinDimension->integer ? 0 : imageParams.minDimension;
143-
int materialMaxDimension = r_ignoreMaterialMaxDimension->integer ? 0 : imageParams.maxDimension;
142+
int materialMinDimension = r_ignoreMaterialMinDimension.Get() ? 0 : imageParams.minDimension;
143+
int materialMaxDimension = r_ignoreMaterialMaxDimension.Get() ? 0 : imageParams.maxDimension;
144144

145145
int minDimension;
146146

147147
if ( materialMinDimension <= 0 )
148148
{
149149
minDimension = 1;
150150
}
151-
else if ( r_replaceMaterialMinDimensionIfPresentWithMaxDimension->integer )
151+
else if ( r_replaceMaterialMinDimensionIfPresentWithMaxDimension.Get() )
152152
{
153153
minDimension = materialMaxDimension > 0 ? materialMaxDimension : std::numeric_limits<int>::max();
154154
}
@@ -159,16 +159,16 @@ int R_GetImageCustomScalingStep( const image_t *image, const imageParams_t &imag
159159

160160
int maxDimension = materialMaxDimension > 0 ? materialMaxDimension : std::numeric_limits<int>::max();
161161

162-
if ( r_imageMaxDimension->integer > 0 )
162+
if ( r_imageMaxDimension.Get() > 0 )
163163
{
164-
maxDimension = std::min( maxDimension, r_imageMaxDimension->integer );
164+
maxDimension = std::min( maxDimension, r_imageMaxDimension.Get() );
165165
}
166166

167167
// 1st priority: scaledDimension >= minDimension
168168
// 2nd priority: scaledDimension <= maxDimension
169-
// 3rd priority: scalingStep >= r_picMip->integer
169+
// 3rd priority: scalingStep >= r_picMip.Get()
170170
// 4th priority: scalingStep as low as possible
171-
while ( scaledDimension > maxDimension || scalingStep < r_picMip->integer )
171+
while ( scaledDimension > maxDimension || scalingStep < r_picMip.Get() )
172172
{
173173
scaledDimension >>= 1;
174174

‎src/engine/renderer/Material.cpp

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ void UpdateSurfaceDataLightMapping( uint32_t* materials, shaderStage_t* pStage,
193193

194194
// HeightMap
195195
if ( pStage->enableReliefMapping ) {
196-
float depthScale = RB_EvalExpression( &pStage->depthScaleExp, r_reliefDepthScale->value );
196+
float depthScale = RB_EvalExpression( &pStage->depthScaleExp, r_reliefDepthScale.Get() );
197197
depthScale *= shader->reliefDepthScale;
198198

199199
gl_lightMappingShaderMaterial->SetUniform_ReliefDepthScale( depthScale );
@@ -209,8 +209,8 @@ void UpdateSurfaceDataLightMapping( uint32_t* materials, shaderStage_t* pStage,
209209
}
210210

211211
if ( pStage->enableSpecularMapping ) {
212-
float specExpMin = RB_EvalExpression( &pStage->specularExponentMin, r_specularExponentMin->value );
213-
float specExpMax = RB_EvalExpression( &pStage->specularExponentMax, r_specularExponentMax->value );
212+
float specExpMin = RB_EvalExpression( &pStage->specularExponentMin, r_specularExponentMin.Get() );
213+
float specExpMax = RB_EvalExpression( &pStage->specularExponentMax, r_specularExponentMax.Get() );
214214

215215
gl_lightMappingShaderMaterial->SetUniform_SpecularExponent( specExpMin, specExpMax );
216216
}
@@ -249,7 +249,7 @@ void UpdateSurfaceDataReflection( uint32_t* materials, shaderStage_t* pStage, bo
249249

250250
// u_depthScale u_reliefOffsetBias
251251
if ( pStage->enableReliefMapping ) {
252-
float depthScale = RB_EvalExpression( &pStage->depthScaleExp, r_reliefDepthScale->value );
252+
float depthScale = RB_EvalExpression( &pStage->depthScaleExp, r_reliefDepthScale.Get() );
253253
float reliefDepthScale = shader->reliefDepthScale;
254254
depthScale *= reliefDepthScale == 0 ? 1 : reliefDepthScale;
255255
gl_reflectionShaderMaterial->SetUniform_ReliefDepthScale( depthScale );
@@ -322,8 +322,8 @@ void UpdateSurfaceDataLiquid( uint32_t* materials, shaderStage_t* pStage, bool,
322322
// NOTE: specular component is computed by shader.
323323
// FIXME: physical mapping is not implemented.
324324
if ( pStage->enableSpecularMapping ) {
325-
float specMin = RB_EvalExpression( &pStage->specularExponentMin, r_specularExponentMin->value );
326-
float specMax = RB_EvalExpression( &pStage->specularExponentMax, r_specularExponentMax->value );
325+
float specMin = RB_EvalExpression( &pStage->specularExponentMin, r_specularExponentMin.Get() );
326+
float specMax = RB_EvalExpression( &pStage->specularExponentMax, r_specularExponentMax.Get() );
327327
gl_liquidShaderMaterial->SetUniform_SpecularExponent( specMin, specMax );
328328
}
329329

@@ -335,7 +335,7 @@ void UpdateSurfaceDataLiquid( uint32_t* materials, shaderStage_t* pStage, bool,
335335
float depthScale;
336336
float reliefDepthScale;
337337

338-
depthScale = RB_EvalExpression( &pStage->depthScaleExp, r_reliefDepthScale->value );
338+
depthScale = RB_EvalExpression( &pStage->depthScaleExp, r_reliefDepthScale.Get() );
339339
reliefDepthScale = tess.surfaceShader->reliefDepthScale;
340340
depthScale *= reliefDepthScale == 0 ? 1 : reliefDepthScale;
341341
gl_liquidShaderMaterial->SetUniform_ReliefDepthScale( depthScale );
@@ -1407,10 +1407,10 @@ void MaterialSystem::ProcessStage( drawSurf_t* drawSurf, shaderStage_t* pStage,
14071407
* A material represents a distinct global OpenGL state (e. g. blend function, depth test, depth write etc.)
14081408
* Materials can have a dependency on other materials to make sure that consecutive stages are rendered in the proper order */
14091409
void MaterialSystem::GenerateWorldMaterials() {
1410-
const int current_r_nocull = r_nocull->integer;
1411-
const int current_r_drawworld = r_drawworld->integer;
1412-
r_nocull->integer = 1;
1413-
r_drawworld->integer = 1;
1410+
const bool current_r_nocull = r_nocull.Get();
1411+
const bool current_r_drawworld = r_drawworld.Get();
1412+
r_nocull.Set( true );
1413+
r_drawworld.Set( true );
14141414
generatingWorldCommandBuffer = true;
14151415

14161416
Log::Debug( "Generating world materials" );
@@ -1485,8 +1485,8 @@ void MaterialSystem::GenerateWorldMaterials() {
14851485
}
14861486
} */
14871487

1488-
r_nocull->integer = current_r_nocull;
1489-
r_drawworld->integer = current_r_drawworld;
1488+
r_nocull.Set( current_r_nocull );
1489+
r_drawworld.Set( current_r_drawworld );
14901490
AddAllWorldSurfaces();
14911491

14921492
GeneratePortalBoundingSpheres();
@@ -1602,7 +1602,7 @@ void MaterialSystem::QueueSurfaceCull( const uint32_t viewID, const vec3_t origi
16021602
}
16031603

16041604
void MaterialSystem::DepthReduction() {
1605-
if ( r_lockpvs->integer ) {
1605+
if ( r_lockpvs.Get() ) {
16061606
if ( !PVSLocked ) {
16071607
lockedDepthImage = depthImage;
16081608
}
@@ -1709,11 +1709,11 @@ void MaterialSystem::CullSurfaces() {
17091709
}
17101710

17111711
if ( PVSLocked ) {
1712-
if ( r_lockpvs->integer == 0 ) {
1712+
if ( !r_lockpvs.Get() ) {
17131713
PVSLocked = false;
17141714
}
17151715
}
1716-
if ( r_lockpvs->integer == 1 && !PVSLocked ) {
1716+
if ( r_lockpvs.Get() && !PVSLocked ) {
17171717
PVSLocked = true;
17181718
for ( int i = 0; i < 6; i++ ) {
17191719
VectorCopy( frustum[0][i].normal, lockedFrustums[view][i].normal );
@@ -2005,7 +2005,7 @@ void MaterialSystem::AddPortalSurfaces() {
20052005
return;
20062006
}
20072007

2008-
if ( r_lockpvs->integer ) {
2008+
if ( r_lockpvs.Get() ) {
20092009
return;
20102010
}
20112011

@@ -2030,7 +2030,7 @@ void MaterialSystem::AddAutospriteSurfaces() {
20302030
}
20312031

20322032
void MaterialSystem::RenderMaterials( const shaderSort_t fromSort, const shaderSort_t toSort, const uint32_t viewID ) {
2033-
if ( !r_drawworld->integer ) {
2033+
if ( !r_drawworld.Get() ) {
20342034
return;
20352035
}
20362036

@@ -2126,7 +2126,7 @@ void MaterialSystem::RenderMaterial( Material& material, const uint32_t viewID )
21262126
}
21272127

21282128
if( material.shaderBinder == BindShaderFog ) {
2129-
if ( r_noFog->integer || !r_wolfFog->integer || ( backEnd.refdef.rdflags & RDF_NOWORLDMODEL ) ) {
2129+
if ( r_noFog.Get() || !r_wolfFog.Get() || ( backEnd.refdef.rdflags & RDF_NOWORLDMODEL ) ) {
21302130
return;
21312131
}
21322132
}
@@ -2136,7 +2136,7 @@ void MaterialSystem::RenderMaterial( Material& material, const uint32_t viewID )
21362136
GL_State( stateBits );
21372137
if ( material.usePolygonOffset ) {
21382138
glEnable( GL_POLYGON_OFFSET_FILL );
2139-
GL_PolygonOffset( r_offsetFactor->value, r_offsetUnits->value );
2139+
GL_PolygonOffset( r_offsetFactor.Get(), r_offsetUnits.Get() );
21402140
} else {
21412141
glDisable( GL_POLYGON_OFFSET_FILL );
21422142
}
@@ -2278,7 +2278,7 @@ void MaterialSystem::RenderMaterial( Material& material, const uint32_t viewID )
22782278
RenderIndirect( material, viewID );
22792279
}
22802280

2281-
if ( r_showTris->integer
2281+
if ( r_showTris.Get()
22822282
&& ( material.stateBits & GLS_DEPTHMASK_TRUE ) == 0
22832283
&& ( material.shaderBinder == &BindShaderLightMapping || material.shaderBinder == &BindShaderGeneric3D ) )
22842284
{

‎src/engine/renderer/gl_shader.cpp

Lines changed: 22 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -623,9 +623,14 @@ static std::string GenEngineConstants() {
623623
// Engine constants
624624
std::string str;
625625

626-
AddDefine( str, "r_AmbientScale", r_ambientScale.Get() );
627-
AddDefine( str, "r_SpecularScale", r_specularScale->value );
628-
AddDefine( str, "r_zNear", r_znear->value );
626+
if ( r_ambientScale.Get() ) {
627+
AddDefine( str, "r_AmbientScale", 1 );
628+
}
629+
630+
if ( r_specularScale.Get() ) {
631+
AddDefine( str, "r_SpecularScale", 1 );
632+
}
633+
AddDefine( str, "r_zNear", r_znear.Get() );
629634

630635
AddDefine( str, "M_PI", static_cast< float >( M_PI ) );
631636
AddDefine( str, "MAX_SHADOWMAPS", MAX_SHADOWMAPS );
@@ -736,22 +741,23 @@ static std::string GenEngineConstants() {
736741
AddDefine( str, "r_realtimeLightingRenderer", r_realtimeLightingRenderer.Get() );
737742
}
738743

739-
if ( r_precomputedLighting->integer )
744+
if ( r_precomputedLighting.Get() ) {
740745
AddDefine( str, "r_precomputedLighting", 1 );
746+
}
741747

742-
if ( r_showNormalMaps->integer )
748+
if ( r_showNormalMaps.Get() )
743749
{
744750
AddDefine( str, "r_showNormalMaps", 1 );
745751
}
746-
else if ( r_showMaterialMaps->integer )
752+
else if ( r_showMaterialMaps.Get() )
747753
{
748754
AddDefine( str, "r_showMaterialMaps", 1 );
749755
}
750-
else if ( r_showLightMaps->integer )
756+
else if ( r_showLightMaps.Get() )
751757
{
752758
AddDefine( str, "r_showLightMaps", 1 );
753759
}
754-
else if ( r_showDeluxeMaps->integer )
760+
else if ( r_showDeluxeMaps.Get() )
755761
{
756762
AddDefine( str, "r_showDeluxeMaps", 1 );
757763
}
@@ -793,16 +799,18 @@ static std::string GenEngineConstants() {
793799
AddConst( str, "MAX_GLSL_BONES", 4 );
794800
}
795801

796-
if ( r_halfLambertLighting->integer )
802+
if ( r_halfLambertLighting.Get() )
803+
{
797804
AddDefine( str, "r_halfLambertLighting", 1 );
805+
}
798806

799-
if ( r_rimLighting->integer )
807+
if ( r_rimLighting.Get() )
800808
{
801809
AddDefine( str, "r_rimLighting", 1 );
802-
AddConst( str, "r_RimExponent", r_rimExponent->value );
810+
AddConst( str, "r_RimExponent", r_rimExponent.Get() );
803811
}
804812

805-
if ( r_showLightTiles->integer )
813+
if ( r_showLightTiles.Get() )
806814
{
807815
AddDefine( str, "r_showLightTiles", 1 );
808816
}
@@ -812,7 +820,7 @@ static std::string GenEngineConstants() {
812820
AddDefine( str, "r_normalMapping", 1 );
813821
}
814822

815-
if ( r_liquidMapping->integer )
823+
if ( r_liquidMapping.Get() )
816824
{
817825
AddDefine( str, "r_liquidMapping", 1 );
818826
}
@@ -827,7 +835,7 @@ static std::string GenEngineConstants() {
827835
AddDefine( str, "r_physicalMapping", 1 );
828836
}
829837

830-
if ( r_glowMapping->integer )
838+
if ( r_glowMapping.Get() )
831839
{
832840
AddDefine( str, "r_glowMapping", 1 );
833841
}
@@ -837,8 +845,6 @@ static std::string GenEngineConstants() {
837845
AddDefine( str, "r_colorGrading", 1 );
838846
}
839847

840-
AddDefine( str, "r_zNear", r_znear->value );
841-
842848
return str;
843849
}
844850

‎src/engine/renderer/tr_animation.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -683,7 +683,7 @@ void R_AddMD5Surfaces( trRefEntity_t *ent )
683683
// see if we are in a fog volume
684684
fogNum = R_FogWorldBox( ent->worldBounds );
685685

686-
if ( !r_vboModels->integer || !model->numVBOSurfaces ||
686+
if ( !r_vboModels.Get() || !model->numVBOSurfaces ||
687687
( !glConfig2.vboVertexSkinningAvailable && ent->e.skeleton.type == refSkeletonType_t::SK_ABSOLUTE ) )
688688
{
689689
shader_t *shader;
@@ -983,7 +983,7 @@ void R_AddMD5Interactions( trRefEntity_t *ent, trRefLight_t *light, interactionT
983983

984984
cubeSideBits = R_CalcLightCubeSideBits( light, ent->worldBounds );
985985

986-
if ( !r_vboModels->integer || !model->numVBOSurfaces ||
986+
if ( !r_vboModels.Get() || !model->numVBOSurfaces ||
987987
( !glConfig2.vboVertexSkinningAvailable && ent->e.skeleton.type == refSkeletonType_t::SK_ABSOLUTE ) )
988988
{
989989
shader_t *shader = nullptr;

0 commit comments

Comments
 (0)