quick/netradiant-custom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sRGB convert all shader specified colors

Browse Source
This commit is contained in:
Rudolf Polzer 2011-12-14 09:36:30 +01:00
parent 084d085966
commit 2b560b8348
1 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
tools/quake3/q3map2/shaders.c
View File

@ -1301,6 +1301,13 @@ static void ParseShaderFile( const char *filename )
GetTokenAppend( shaderText, qfalse ); GetTokenAppend( shaderText, qfalse );
sun->color[ 2 ] = atof( token ); sun->color[ 2 ] = atof( token );
if(colorsRGB)
{
sun->color[0] = Image_LinearFloatFromsRGBFloat(sun->color[0]);
sun->color[1] = Image_LinearFloatFromsRGBFloat(sun->color[1]);
sun->color[2] = Image_LinearFloatFromsRGBFloat(sun->color[2]);
}
/* normalize it */ /* normalize it */
VectorNormalize( sun->color, sun->color ); VectorNormalize( sun->color, sun->color );
@ -1492,6 +1499,12 @@ static void ParseShaderFile( const char *filename )
si->color[ 1 ] = atof( token ); si->color[ 1 ] = atof( token );
GetTokenAppend( shaderText, qfalse ); GetTokenAppend( shaderText, qfalse );
si->color[ 2 ] = atof( token ); si->color[ 2 ] = atof( token );
if(colorsRGB)
{
si->color[0] = Image_LinearFloatFromsRGBFloat(si->color[0]);
si->color[1] = Image_LinearFloatFromsRGBFloat(si->color[1]);
si->color[2] = Image_LinearFloatFromsRGBFloat(si->color[2]);
}
ColorNormalize( si->color, si->color ); ColorNormalize( si->color, si->color );
} }
@ -1527,6 +1540,13 @@ static void ParseShaderFile( const char *filename )
si->floodlightIntensity = atof( token ); si->floodlightIntensity = atof( token );
GetTokenAppend( shaderText, qfalse ); GetTokenAppend( shaderText, qfalse );
si->floodlightDirectionScale = atof( token ); si->floodlightDirectionScale = atof( token );
if(colorsRGB)
{
si->floodlightRGB[0] = Image_LinearFloatFromsRGBFloat(si->floodlightRGB[0]);
si->floodlightRGB[1] = Image_LinearFloatFromsRGBFloat(si->floodlightRGB[1]);
si->floodlightRGB[2] = Image_LinearFloatFromsRGBFloat(si->floodlightRGB[2]);
}
VectorNormalize(si->floodlightRGB);
} }
/* jal: q3map_nodirty : skip dirty */ /* jal: q3map_nodirty : skip dirty */
@ -1806,6 +1826,12 @@ static void ParseShaderFile( const char *filename )
{ {
cm->type = CM_COLOR_SET; cm->type = CM_COLOR_SET;
Parse1DMatrixAppend( shaderText, 3, cm->data ); Parse1DMatrixAppend( shaderText, 3, cm->data );
if(colorsRGB)
{
cm->data[0] = Image_LinearFloatFromsRGBFloat(cm->data[0]);
cm->data[1] = Image_LinearFloatFromsRGBFloat(cm->data[1]);
cm->data[2] = Image_LinearFloatFromsRGBFloat(cm->data[2]);
}
} }
/* alpha scale A */ /* alpha scale A */