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

light: cleanup _sunlight3 code, support _sunlight3 without _sunlight2 properly

This commit is contained in:
Eric Wasylishen 2015-12-10 14:58:49 -07:00
parent 59beb66544
commit 7a5c7bbf6b
1 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
light/entities.c
View File

@ -404,8 +404,12 @@ 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]); if (sunlight2.light > 0) {
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]); 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]);
}
if (sunlight3.light > 0) {
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; sunlight3.light /= numSuns;
@ -422,12 +426,15 @@ SetupSkyDome()
direction[ 1 ] = sin( angle ) * cos( elevation ); direction[ 1 ] = sin( angle ) * cos( elevation );
direction[ 2 ] = -sin( elevation ); direction[ 2 ] = -sin( elevation );
AddSun(direction, sunlight2, 0.0, sunlight2_dirt); /* insert top hemisphere light */
if (sunlight2.light > 0) {
AddSun(direction, sunlight2, 0.0, sunlight2_dirt);
}
/* create bottom hemisphere */ direction[ 2 ] = -direction[ 2 ];
/* insert bottom hemisphere light */
if (sunlight3.light > 0) { if (sunlight3.light > 0) {
direction[ 2 ] = -direction[ 2 ];
AddSun(direction, sunlight3, 0.0, sunlight2_dirt); AddSun(direction, sunlight3, 0.0, sunlight2_dirt);
} }
@ -443,11 +450,13 @@ SetupSkyDome()
/* create vertical sun */ /* create vertical sun */
VectorSet( direction, 0.0f, 0.0f, 1.0f ); VectorSet( direction, 0.0f, 0.0f, 1.0f );
AddSun(direction, sunlight2, 0.0, sunlight2_dirt); if (sunlight2.light > 0) {
AddSun(direction, sunlight2, 0.0, sunlight2_dirt);
}
VectorSet( direction, 0.0f, 0.0f, -1.0f );
if (sunlight3.light > 0) { if (sunlight3.light > 0) {
VectorSet( direction, 0.0f, 0.0f, -1.0f );
AddSun(direction, sunlight3, 0.0, sunlight2_dirt); AddSun(direction, sunlight3, 0.0, sunlight2_dirt);
} }
} }