This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to annotated tag 1.42d
in repository iortcw.

commit e1828137080e673f53685a0362634c0e6923ac2a
Author: Donny <m4n4t4...@gmail.com>
Date:   Wed Jul 8 12:07:00 2015 -0400

    All:  Apply greyscaling to fog blocks
---
 MP/code/rend2/tr_shader.c    | 17 +++++++++++++++++
 MP/code/renderer/tr_shader.c | 17 +++++++++++++++++
 SP/code/rend2/tr_shader.c    | 17 +++++++++++++++++
 SP/code/renderer/tr_shader.c | 17 +++++++++++++++++
 4 files changed, 68 insertions(+)

diff --git a/MP/code/rend2/tr_shader.c b/MP/code/rend2/tr_shader.c
index 48b6083..bbfa0bf 100644
--- a/MP/code/rend2/tr_shader.c
+++ b/MP/code/rend2/tr_shader.c
@@ -1802,6 +1802,23 @@ static qboolean ParseShader( char **text ) {
                                return qfalse;
                        }
 
+                       if ( r_greyscale->integer )
+                       {
+                               float luminance;
+
+                               luminance = LUMA( shader.fogParms.color[0], 
shader.fogParms.color[1], shader.fogParms.color[2] );
+                               VectorSet( shader.fogParms.color, luminance, 
luminance, luminance );
+                       }
+                       else if ( r_greyscale->value )
+                       {
+                               float luminance;
+
+                               luminance = LUMA( shader.fogParms.color[0], 
shader.fogParms.color[1], shader.fogParms.color[2] );
+                               shader.fogParms.color[0] = LERP( 
shader.fogParms.color[0], luminance, r_greyscale->value );
+                               shader.fogParms.color[1] = LERP( 
shader.fogParms.color[1], luminance, r_greyscale->value );
+                               shader.fogParms.color[2] = LERP( 
shader.fogParms.color[2], luminance, r_greyscale->value );
+                       }
+
                        token = COM_ParseExt( text, qfalse );
                        if ( !token[0] ) {
                                ri.Printf( PRINT_WARNING, "WARNING: missing 
parm for 'fogParms' keyword in shader '%s'\n", shader.name );
diff --git a/MP/code/renderer/tr_shader.c b/MP/code/renderer/tr_shader.c
index 607841e..0ba56ee 100644
--- a/MP/code/renderer/tr_shader.c
+++ b/MP/code/renderer/tr_shader.c
@@ -1526,6 +1526,23 @@ static qboolean ParseShader( char **text ) {
                                return qfalse;
                        }
 
+                       if ( r_greyscale->integer )
+                       {
+                               float luminance;
+
+                               luminance = LUMA( shader.fogParms.color[0], 
shader.fogParms.color[1], shader.fogParms.color[2] );
+                               VectorSet( shader.fogParms.color, luminance, 
luminance, luminance );
+                       }
+                       else if ( r_greyscale->value )
+                       {
+                               float luminance;
+
+                               luminance = LUMA( shader.fogParms.color[0], 
shader.fogParms.color[1], shader.fogParms.color[2] );
+                               shader.fogParms.color[0] = LERP( 
shader.fogParms.color[0], luminance, r_greyscale->value );
+                               shader.fogParms.color[1] = LERP( 
shader.fogParms.color[1], luminance, r_greyscale->value );
+                               shader.fogParms.color[2] = LERP( 
shader.fogParms.color[2], luminance, r_greyscale->value );
+                       }
+
                        token = COM_ParseExt( text, qfalse );
                        if ( !token[0] ) {
                                ri.Printf( PRINT_WARNING, "WARNING: missing 
parm for 'fogParms' keyword in shader '%s'\n", shader.name );
diff --git a/SP/code/rend2/tr_shader.c b/SP/code/rend2/tr_shader.c
index 282b061..c355afb 100644
--- a/SP/code/rend2/tr_shader.c
+++ b/SP/code/rend2/tr_shader.c
@@ -1812,6 +1812,23 @@ static qboolean ParseShader( char **text ) {
                                return qfalse;
                        }
 
+                       if ( r_greyscale->integer )
+                       {
+                               float luminance;
+
+                               luminance = LUMA( shader.fogParms.color[0], 
shader.fogParms.color[1], shader.fogParms.color[2] );
+                               VectorSet( shader.fogParms.color, luminance, 
luminance, luminance );
+                       }
+                       else if ( r_greyscale->value )
+                       {
+                               float luminance;
+
+                               luminance = LUMA( shader.fogParms.color[0], 
shader.fogParms.color[1], shader.fogParms.color[2] );
+                               shader.fogParms.color[0] = LERP( 
shader.fogParms.color[0], luminance, r_greyscale->value );
+                               shader.fogParms.color[1] = LERP( 
shader.fogParms.color[1], luminance, r_greyscale->value );
+                               shader.fogParms.color[2] = LERP( 
shader.fogParms.color[2], luminance, r_greyscale->value );
+                       }
+
                        token = COM_ParseExt( text, qfalse );
                        if ( !token[0] ) {
                                ri.Printf( PRINT_WARNING, "WARNING: missing 
parm for 'fogParms' keyword in shader '%s'\n", shader.name );
diff --git a/SP/code/renderer/tr_shader.c b/SP/code/renderer/tr_shader.c
index 8685567..6392f17 100644
--- a/SP/code/renderer/tr_shader.c
+++ b/SP/code/renderer/tr_shader.c
@@ -1531,6 +1531,23 @@ static qboolean ParseShader( char **text ) {
                                return qfalse;
                        }
 
+                       if ( r_greyscale->integer )
+                       {
+                               float luminance;
+
+                               luminance = LUMA( shader.fogParms.color[0], 
shader.fogParms.color[1], shader.fogParms.color[2] );
+                               VectorSet( shader.fogParms.color, luminance, 
luminance, luminance );
+                       }
+                       else if ( r_greyscale->value )
+                       {
+                               float luminance;
+
+                               luminance = LUMA( shader.fogParms.color[0], 
shader.fogParms.color[1], shader.fogParms.color[2] );
+                               shader.fogParms.color[0] = LERP( 
shader.fogParms.color[0], luminance, r_greyscale->value );
+                               shader.fogParms.color[1] = LERP( 
shader.fogParms.color[1], luminance, r_greyscale->value );
+                               shader.fogParms.color[2] = LERP( 
shader.fogParms.color[2], luminance, r_greyscale->value );
+                       }
+
                        token = COM_ParseExt( text, qfalse );
                        if ( !token[0] ) {
                                ri.Printf( PRINT_WARNING, "WARNING: missing 
parm for 'fogParms' keyword in shader '%s'\n", shader.name );

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/iortcw.git

_______________________________________________
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

Reply via email to