olegpz
/
ericw-tools
mirror of https://github.com/ericwa/ericw-tools.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

light: add -bouncecolorscale flag

This commit is contained in:
Eric Wasylishen 2016-05-20 12:00:57 -06:00
parent 4e69914cb2
commit 55df37941c
4 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/light/light.h
View File

@ -232,7 +232,8 @@ extern qboolean dirtAngleSetOnCmdline;
extern qboolean bounce; extern qboolean bounce;
extern qboolean bouncedebug; extern qboolean bouncedebug;
extern vec_t bouncescale; extern vec_t bouncescale;
extern vec_t bouncecolorscale;
/* /*
* Return space for the lightmap and colourmap at the same time so it can * Return space for the lightmap and colourmap at the same time so it can
* be done in a thread-safe manner. * be done in a thread-safe manner.

4
light/entities.c
View File

@ -1062,6 +1062,10 @@ LoadEntities(const bsp2_t *bsp)
bouncescale = atof(com_token); bouncescale = atof(com_token);
logprint("_bouncescale set to %f\n", bouncescale); logprint("_bouncescale set to %f\n", bouncescale);
} }
else if (!strcmp(key, "_bouncecolorscale")) {
bouncecolorscale = atof(com_token);
logprint("_bouncecolorscale set to %f\n", bouncecolorscale);
}
} }
/* /*

5
light/light.cc
View File

@ -74,6 +74,7 @@ qboolean dirtAngleSetOnCmdline = false;
qboolean bounce = false; qboolean bounce = false;
qboolean bouncedebug = false; qboolean bouncedebug = false;
vec_t bouncescale = 1.0f; vec_t bouncescale = 1.0f;
vec_t bouncecolorscale = 0.0f;
qboolean testFenceTextures = false; qboolean testFenceTextures = false;
qboolean surflight_dump = false; qboolean surflight_dump = false;
@ -1318,6 +1319,10 @@ main(int argc, const char **argv)
bounce = true; bounce = true;
bouncescale = atof( argv[ ++i ] ); bouncescale = atof( argv[ ++i ] );
logprint( "Bounce scale factor set to %f on command line\n", bouncescale ); logprint( "Bounce scale factor set to %f on command line\n", bouncescale );
} else if ( !strcmp( argv[ i ], "-bouncecolorscale" ) ) {
bounce = true;
bouncecolorscale = atof( argv[ ++i ] );
logprint( "Bounce color scale factor set to %f on command line\n", bouncecolorscale );
} else if ( !strcmp( argv[ i ], "-fence" ) ) { } else if ( !strcmp( argv[ i ], "-fence" ) ) {
testFenceTextures = true; testFenceTextures = true;
logprint( "Fence texture tracing enabled on command line\n" ); logprint( "Fence texture tracing enabled on command line\n" );

9
light/ltface.c
View File

@ -2164,9 +2164,16 @@ LightFace(bsp2_dface_t *face, facesup_t *facesup, const modelinfo_t *modelinfo,
// make bounce light // make bounce light
if (bounce) { if (bounce) {
vec3_t gray = {127, 127, 127};
// lerp between gray and the texture color according to `bouncecolorscale`
vec3_t blendedcolor = {0, 0, 0};
VectorMA(blendedcolor, bouncecolorscale, lightsurf->texturecolor, blendedcolor);
VectorMA(blendedcolor, 1-bouncecolorscale, gray, blendedcolor);
vec3_t emitcolor; vec3_t emitcolor;
for (int k=0; k<3; k++) { for (int k=0; k<3; k++) {
emitcolor[k] = (lightsurf->radiosity[k] / 255.0f) * (lightsurf->texturecolor[k] / 255.0f); emitcolor[k] = (lightsurf->radiosity[k] / 255.0f) * (blendedcolor[k] / 255.0f);
} }
winding_t *w = WindingFromFace(bsp, face); winding_t *w = WindingFromFace(bsp, face);
AddBounceLight(lightsurf->midpoint, emitcolor, lightsurf->plane.normal, WindingArea(w), bsp); AddBounceLight(lightsurf->midpoint, emitcolor, lightsurf->plane.normal, WindingArea(w), bsp);