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

light: test out _sunlight3

This commit is contained in:
Eric Wasylishen 2015-12-05 21:40:15 -07:00
parent e6fcf3d6da
commit fe65004f17
1 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
light/entities.c
View File

@ -40,6 +40,7 @@ static void MakeSurfaceLights(const bsp2_t *bsp);
created. */ created. */
static lightsample_t sunlight = { 0, { 255, 255, 255 } }; static lightsample_t sunlight = { 0, { 255, 255, 255 } };
static lightsample_t sunlight2 = { 0, { 255, 255, 255 } }; static lightsample_t sunlight2 = { 0, { 255, 255, 255 } };
static lightsample_t sunlight3 = { 0, { 255, 255, 255 } };
static int sunlight_dirt = 0; static int sunlight_dirt = 0;
static int sunlight2_dirt = 0; static int sunlight2_dirt = 0;
static vec3_t sunvec = { 0, 0, -1 }; /* defaults to straight down */ static vec3_t sunvec = { 0, 0, -1 }; /* defaults to straight down */
@ -390,7 +391,7 @@ SetupSkyDome()
iterations = qmax(iterations, 2); iterations = qmax(iterations, 2);
/* dummy check */ /* dummy check */
if ( sunlight2.light <= 0.0f ) { if ( sunlight2.light <= 0.0f && sunlight3.light <= 0.0f ) {
return; return;
} }
@ -404,7 +405,9 @@ SetupSkyDome()
/* calc individual sun brightness */ /* calc individual sun brightness */
numSuns = angleSteps * elevationSteps + 1; numSuns = angleSteps * elevationSteps + 1;
logprint("using %d suns for _sunlight2. total light: %f color: %f %f %f\n", numSuns, sunlight2.light, sunlight2.color[0], sunlight2.color[1], sunlight2.color[2]); logprint("using %d suns for _sunlight2. total light: %f color: %f %f %f\n", numSuns, sunlight2.light, sunlight2.color[0], sunlight2.color[1], sunlight2.color[2]);
logprint("using %d suns for _sunlight3. total light: %f color: %f %f %f\n", numSuns, sunlight3.light, sunlight3.color[0], sunlight3.color[1], sunlight3.color[2]);
sunlight2.light /= numSuns; sunlight2.light /= numSuns;
sunlight3.light /= numSuns;
/* iterate elevation */ /* iterate elevation */
elevation = elevationStep * 0.5f; elevation = elevationStep * 0.5f;
@ -421,6 +424,13 @@ SetupSkyDome()
AddSun(direction, sunlight2, 0.0, sunlight2_dirt); AddSun(direction, sunlight2, 0.0, sunlight2_dirt);
/* create bottom hemisphere */
if (sunlight3.light > 0) {
direction[ 2 ] = -direction[ 2 ];
AddSun(direction, sunlight3, 0.0, sunlight2_dirt);
}
/* move */ /* move */
angle += angleStep; angle += angleStep;
} }
@ -434,6 +444,12 @@ SetupSkyDome()
VectorSet( direction, 0.0f, 0.0f, 1.0f ); VectorSet( direction, 0.0f, 0.0f, 1.0f );
AddSun(direction, sunlight2, 0.0, sunlight2_dirt); AddSun(direction, sunlight2, 0.0, sunlight2_dirt);
if (sunlight3.light > 0) {
VectorSet( direction, 0.0f, 0.0f, -1.0f );
AddSun(direction, sunlight3, 0.0, sunlight2_dirt);
}
} }
#if 0 #if 0
@ -702,10 +718,15 @@ LoadEntities(const bsp2_t *bsp)
normalize_color_format(sunlight.color); normalize_color_format(sunlight.color);
} else if (!strcmp(key, "_sunlight2")) } else if (!strcmp(key, "_sunlight2"))
sunlight2.light = atof(com_token); sunlight2.light = atof(com_token);
else if (!strcmp(key, "_sunlight2_color") || !strcmp(key, "_sunlight_color2")) { else if (!strcmp(key, "_sunlight3"))
sunlight3.light = atof(com_token);
else if (!strcmp(key, "_sunlight2_color") || !strcmp(key, "_sunlight_color2")) {
scan_vec3(sunlight2.color, com_token, key); scan_vec3(sunlight2.color, com_token, key);
normalize_color_format(sunlight2.color); normalize_color_format(sunlight2.color);
} else if (!strcmp(key, "_minlight_color")) { } else if (!strcmp(key, "_sunlight3_color") || !strcmp(key, "_sunlight_color3")) {
scan_vec3(sunlight3.color, com_token, key);
normalize_color_format(sunlight3.color);
} else if (!strcmp(key, "_minlight_color")) {
scan_vec3(minlight.color, com_token, "_minlight_color"); scan_vec3(minlight.color, com_token, "_minlight_color");
normalize_color_format(minlight.color); normalize_color_format(minlight.color);
} else if (!strcmp(key, "_anglesense") || !strcmp(key, "_anglescale")) } else if (!strcmp(key, "_anglesense") || !strcmp(key, "_anglescale"))
@ -857,7 +878,8 @@ LoadEntities(const bsp2_t *bsp)
if (!VectorCompare(sunlight.color, vec3_white) || if (!VectorCompare(sunlight.color, vec3_white) ||
!VectorCompare(minlight.color, vec3_white) || !VectorCompare(minlight.color, vec3_white) ||
!VectorCompare(sunlight2.color, vec3_white)) { !VectorCompare(sunlight2.color, vec3_white) ||
!VectorCompare(sunlight3.color, vec3_white)) {
if (!write_litfile) { if (!write_litfile) {
write_litfile = true; write_litfile = true;
logprint("Colored light entities detected: " logprint("Colored light entities detected: "