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

light: refactor checking if we need to write a litfile

This commit is contained in:
Eric Wasylishen 2016-07-31 18:06:44 -06:00
parent cbd7290e3c
commit fee5669dbf
2 changed files with 40 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
light/entities.cc
View File

@ -214,22 +214,6 @@ CheckEntityFields(light_t *entity)
entity->light.setFloatValue(entity->light.floatValue() / entity->samples.intValue());
}
if (!VectorCompare(*entity->color.vec3Value(), vec3_origin)) {
if (!write_litfile) {
if (scaledonly) {
write_litfile = 2;
logprint("Colored light entities detected: "
"bspxlit output enabled.\n");
} else {
write_litfile = 1;
logprint("Colored light entities detected: "
".lit output enabled.\n");
}
}
} else {
entity->color.setStringValue("255 255 255");
}
if (entity->style.intValue() < 0 || entity->style.intValue() > 254) {
Error("Bad light style %i (must be 0-254)", entity->style.intValue());
}
@ -940,17 +924,6 @@ LoadEntities(const bsp2_t *bsp)
}
}
if (!VectorCompare(*sunlight_color.vec3Value(), vec3_white) ||
!VectorCompare(*minlight_color.vec3Value(), vec3_white) ||
!VectorCompare(*sunlight2_color.vec3Value(), vec3_white) ||
!VectorCompare(*sunlight3_color.vec3Value(), vec3_white)) {
if (!write_litfile) {
write_litfile = true;
logprint("Colored light entities detected: "
".lit output enabled.\n");
}
}
logprint("%d entities read, %d are lights.\n",
static_cast<int>(entdicts.size()),
static_cast<int>(all_lights.size()));

49
light/light.cc
View File

@ -416,15 +416,6 @@ FindModelInfo(const bsp2_t *bsp, const char *lmscaleoverride)
assert(info->offset[1] == 0);
assert(info->offset[2] == 0);
}
/* Enable .lit if needed */
// TODO: move elsewhere?
vec3_t white = {255,255,255};
if (!VectorCompare(white, *info->minlight_color.vec3Value())) {
if (!write_litfile) {
write_litfile = scaledonly?2:1;
}
}
}
assert(modelinfo.size() == bsp->nummodels);
@ -1352,6 +1343,45 @@ void FindDebugVert(const bsp2_t *bsp)
dump_vertnum = v;
}
static void SetLitNeeded()
{
if (!write_litfile) {
if (scaledonly) {
write_litfile = 2;
logprint("Colored light entities/settings detected: "
"bspxlit output enabled.\n");
} else {
write_litfile = 1;
logprint("Colored light entities/settings detected: "
".lit output enabled.\n");
}
}
}
static void CheckLitNeeded()
{
const vec3_t white = {255,255,255};
// check lights
for (const auto &light : GetLights()) {
if (!VectorCompare(white, *light.color.vec3Value())) {
SetLitNeeded();
return;
}
}
// check global settings
if (bouncecolorscale.floatValue() != 0 ||
!VectorCompare(*minlight_color.vec3Value(), white) ||
!VectorCompare(*sunlight_color.vec3Value(), white) ||
!VectorCompare(*sun2_color.vec3Value(), white) ||
!VectorCompare(*sunlight2_color.vec3Value(), white) ||
!VectorCompare(*sunlight3_color.vec3Value(), white)) {
SetLitNeeded();
return;
}
}
static void PrintUsage()
{
printf("usage: light [options] mapname.bsp\n"
@ -1741,6 +1771,7 @@ main(int argc, const char **argv)
if (!onlyents)
{
CheckLitNeeded();
SetupDirt();
MakeTnodes(bsp);