[iortcw] 11/152: All: Remove r_cgenVertexLit cvar
Simon McVittie
smcv at debian.org
Fri Sep 8 10:39:38 UTC 2017
This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to annotated tag 1.5a
in repository iortcw.
commit 94bba260d721b305cc9e67844411a4d1de8e2eb1
Author: MAN-AT-ARMS <M4N4T4RMS at gmail.com>
Date: Sat Jan 16 09:40:40 2016 -0500
All: Remove r_cgenVertexLit cvar
---
MP/code/rend2/tr_init.c | 3 ---
MP/code/rend2/tr_local.h | 1 -
MP/code/rend2/tr_shader.c | 15 ++++-----------
SP/code/rend2/tr_init.c | 3 ---
SP/code/rend2/tr_local.h | 1 -
SP/code/rend2/tr_shader.c | 15 ++++-----------
6 files changed, 8 insertions(+), 30 deletions(-)
diff --git a/MP/code/rend2/tr_init.c b/MP/code/rend2/tr_init.c
index 402d2f0..85ebd1b 100644
--- a/MP/code/rend2/tr_init.c
+++ b/MP/code/rend2/tr_init.c
@@ -202,7 +202,6 @@ cvar_t *r_ext_multisample;
cvar_t *r_drawBuffer;
cvar_t *r_glIgnoreWicked3D;
cvar_t *r_lightmap;
-cvar_t *r_cgenVertexLit;
cvar_t *r_vertexLight;
cvar_t *r_uiFullScreen;
cvar_t *r_shadows;
@@ -1461,8 +1460,6 @@ void R_Register( void ) {
r_lightmap = ri.Cvar_Get( "r_lightmap", "0", CVAR_CHEAT ); // DHM - NERVE :: cheat protect
r_portalOnly = ri.Cvar_Get( "r_portalOnly", "0", CVAR_CHEAT );
- r_cgenVertexLit = ri.Cvar_Get( "r_cgenVertexLit", "0", CVAR_ARCHIVE | CVAR_LATCH );
-
r_flareSize = ri.Cvar_Get( "r_flareSize", "40", CVAR_CHEAT );
ri.Cvar_Set( "r_flareFade", "5" ); // to force this when people already have "7" in their config
r_flareFade = ri.Cvar_Get( "r_flareFade", "5", CVAR_CHEAT );
diff --git a/MP/code/rend2/tr_local.h b/MP/code/rend2/tr_local.h
index da99449..9a814df 100644
--- a/MP/code/rend2/tr_local.h
+++ b/MP/code/rend2/tr_local.h
@@ -1928,7 +1928,6 @@ extern cvar_t *r_offsetUnits;
extern cvar_t *r_fullbright; // avoid lightmap pass // JPW NERVE removed per atvi request
extern cvar_t *r_lightmap; // render lightmaps only
-extern cvar_t *r_cgenVertexLit; // Use CGEN_VERTEX_LIT and CGEN_EXACT_VERTEX_LIT instead of CGEN_VERTEX and CGEN_EXACT_VERTEX
extern cvar_t *r_vertexLight; // vertex lighting mode for better performance
extern cvar_t *r_uiFullScreen; // ui is running fullscreen
diff --git a/MP/code/rend2/tr_shader.c b/MP/code/rend2/tr_shader.c
index 24e0605..060371e 100644
--- a/MP/code/rend2/tr_shader.c
+++ b/MP/code/rend2/tr_shader.c
@@ -1118,24 +1118,17 @@ static qboolean ParseStage( shaderStage_t *stage, char **text ) {
} else if ( !Q_stricmp( token, "oneMinusEntity" ) ) {
stage->rgbGen = CGEN_ONE_MINUS_ENTITY;
} else if ( !Q_stricmp( token, "vertex" ) ) {
- if ( r_cgenVertexLit->integer ) {
- stage->rgbGen = CGEN_VERTEX_LIT;
- } else {
- stage->rgbGen = CGEN_VERTEX;
- }
+ stage->rgbGen = CGEN_VERTEX;
if ( stage->alphaGen == 0 ) {
stage->alphaGen = AGEN_VERTEX;
}
} else if ( !Q_stricmp( token, "exactVertex" ) ) {
- if ( r_cgenVertexLit->integer ) {
- stage->rgbGen = CGEN_EXACT_VERTEX_LIT;
- } else {
- stage->rgbGen = CGEN_EXACT_VERTEX;
- }
+ stage->rgbGen = CGEN_EXACT_VERTEX;
} else if ( !Q_stricmp( token, "vertexLit" ) ) {
stage->rgbGen = CGEN_VERTEX_LIT;
- if ( stage->alphaGen == 0 )
+ if ( stage->alphaGen == 0 ) {
stage->alphaGen = AGEN_VERTEX;
+ }
} else if ( !Q_stricmp( token, "exactVertexLit" ) ) {
stage->rgbGen = CGEN_EXACT_VERTEX_LIT;
} else if ( !Q_stricmp( token, "lightingDiffuse" ) ) {
diff --git a/SP/code/rend2/tr_init.c b/SP/code/rend2/tr_init.c
index 9eed291..c034449 100644
--- a/SP/code/rend2/tr_init.c
+++ b/SP/code/rend2/tr_init.c
@@ -207,7 +207,6 @@ cvar_t *r_ext_multisample;
cvar_t *r_drawBuffer;
cvar_t *r_glIgnoreWicked3D;
cvar_t *r_lightmap;
-cvar_t *r_cgenVertexLit;
cvar_t *r_vertexLight;
cvar_t *r_uiFullScreen;
cvar_t *r_shadows;
@@ -1487,8 +1486,6 @@ void R_Register( void ) {
r_lightmap = ri.Cvar_Get( "r_lightmap", "0", CVAR_CHEAT );
r_portalOnly = ri.Cvar_Get( "r_portalOnly", "0", CVAR_CHEAT );
- r_cgenVertexLit = ri.Cvar_Get( "r_cgenVertexLit", "0", CVAR_ARCHIVE | CVAR_LATCH );
-
r_flareSize = ri.Cvar_Get( "r_flareSize", "40", CVAR_CHEAT );
r_flareFade = ri.Cvar_Get( "r_flareFade", "5", CVAR_CHEAT );
r_flareCoeff = ri.Cvar_Get ("r_flareCoeff", FLARE_STDCOEFF, CVAR_CHEAT);
diff --git a/SP/code/rend2/tr_local.h b/SP/code/rend2/tr_local.h
index 72977eb..f5aa092 100644
--- a/SP/code/rend2/tr_local.h
+++ b/SP/code/rend2/tr_local.h
@@ -1948,7 +1948,6 @@ extern cvar_t *r_offsetUnits;
extern cvar_t *r_fullbright; // avoid lightmap pass
extern cvar_t *r_lightmap; // render lightmaps only
-extern cvar_t *r_cgenVertexLit; // Use CGEN_VERTEX_LIT and CGEN_EXACT_VERTEX_LIT instead of CGEN_VERTEX and CGEN_EXACT_VERTEX
extern cvar_t *r_vertexLight; // vertex lighting mode for better performance
extern cvar_t *r_uiFullScreen; // ui is running fullscreen
diff --git a/SP/code/rend2/tr_shader.c b/SP/code/rend2/tr_shader.c
index 600edbb..c8dd37f 100644
--- a/SP/code/rend2/tr_shader.c
+++ b/SP/code/rend2/tr_shader.c
@@ -1116,24 +1116,17 @@ static qboolean ParseStage( shaderStage_t *stage, char **text ) {
} else if ( !Q_stricmp( token, "oneMinusEntity" ) ) {
stage->rgbGen = CGEN_ONE_MINUS_ENTITY;
} else if ( !Q_stricmp( token, "vertex" ) ) {
- if ( r_cgenVertexLit->integer ) {
- stage->rgbGen = CGEN_VERTEX_LIT;
- } else {
- stage->rgbGen = CGEN_VERTEX;
- }
+ stage->rgbGen = CGEN_VERTEX;
if ( stage->alphaGen == 0 ) {
stage->alphaGen = AGEN_VERTEX;
}
} else if ( !Q_stricmp( token, "exactVertex" ) ) {
- if ( r_cgenVertexLit->integer ) {
- stage->rgbGen = CGEN_EXACT_VERTEX_LIT;
- } else {
- stage->rgbGen = CGEN_EXACT_VERTEX;
- }
+ stage->rgbGen = CGEN_EXACT_VERTEX;
} else if ( !Q_stricmp( token, "vertexLit" ) ) {
stage->rgbGen = CGEN_VERTEX_LIT;
- if ( stage->alphaGen == 0 )
+ if ( stage->alphaGen == 0 ) {
stage->alphaGen = AGEN_VERTEX;
+ }
} else if ( !Q_stricmp( token, "exactVertexLit" ) ) {
stage->rgbGen = CGEN_EXACT_VERTEX_LIT;
} else if ( !Q_stricmp( token, "lightingDiffuse" ) ) {
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/iortcw.git
More information about the Pkg-games-commits
mailing list