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

fix build errors + test failures from double -> float changes

This commit is contained in:
Eric Wasylishen 2023-12-07 23:06:52 -07:00
parent 1eaf2170f8
commit 3673162f63
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
light/light.cc
View File

@ -199,7 +199,7 @@ worldspawn_keys::worldspawn_keys()
dirt{this, {"dirt", "dirty"}, false, &worldspawn_group,
"apply dirt to all lights (unless they override it) + sunlight + minlight"},
dirtmode{this, "dirtmode", 0.0f, &worldspawn_group},
dirtdepth{this, "dirtdepth", 128.0, 1.0, std::numeric_limits<vec_t>::infinity(), &worldspawn_group},
dirtdepth{this, "dirtdepth", 128.0, 1.0, std::numeric_limits<float>::infinity(), &worldspawn_group},
dirtscale{this, "dirtscale", 1.0, 0.0, 100.0, &worldspawn_group},
dirtgain{this, "dirtgain", 1.0, 0.0, 100.0, &worldspawn_group},
dirtangle{this, "dirtangle", 88.0, 1.0, 90.0, &worldspawn_group},
@ -312,10 +312,10 @@ light_settings::light_settings()
sunsamples{this, "sunsamples", 64, 8, 2048, &performance_group, "set samples for _sunlight2, default 64"},
arghradcompat{this, "arghradcompat", false, &output_group, "enable compatibility for Arghrad-specific keys"},
nolighting{this, "nolighting", false, &output_group, "don't output main world lighting (Q2RTX)"},
debugface{this, "debugface", std::numeric_limits<vec_t>::quiet_NaN(), std::numeric_limits<vec_t>::quiet_NaN(),
std::numeric_limits<vec_t>::quiet_NaN(), &debug_group, ""},
debugvert{this, "debugvert", std::numeric_limits<vec_t>::quiet_NaN(), std::numeric_limits<vec_t>::quiet_NaN(),
std::numeric_limits<vec_t>::quiet_NaN(), &debug_group, ""},
debugface{this, "debugface", std::numeric_limits<float>::quiet_NaN(), std::numeric_limits<float>::quiet_NaN(),
std::numeric_limits<float>::quiet_NaN(), &debug_group, ""},
debugvert{this, "debugvert", std::numeric_limits<float>::quiet_NaN(), std::numeric_limits<float>::quiet_NaN(),
std::numeric_limits<float>::quiet_NaN(), &debug_group, ""},
highlightseams{this, "highlightseams", false, &debug_group, ""},
soft{this, "soft", 0, -1, std::numeric_limits<int32_t>::max(), &postprocessing_group,
"blurs the lightmap. specify n to blur radius in samples, otherwise auto"},

6
tests/test.cc
View File

@ -86,7 +86,7 @@ TEST_SUITE("settings")
const char *arguments[] = {"qbsp.exe", "-scale", "1.54334E-34"};
token_parser_t p{std::size(arguments) - 1, arguments + 1, {}};
settings.parse(p);
REQUIRE(scalarSetting.value() == 1.54334E-34);
REQUIRE(scalarSetting.value() == 1.54334E-34f);
}
TEST_CASE("scalarEOF")
@ -331,7 +331,7 @@ TEST_SUITE("settings")
scalarSetting1.reset();
CHECK(settings::source::DEFAULT == scalarSetting1.get_source());
CHECK(12.34 == scalarSetting1.value());
CHECK(12.34f == scalarSetting1.value());
}
TEST_CASE("resetContainer")
@ -345,7 +345,7 @@ TEST_SUITE("settings")
settings.reset();
CHECK(settings::source::DEFAULT == vec3Setting1.get_source());
CHECK(qvec3d(3, 4, 5) == vec3Setting1.value());
CHECK(qvec3f(3, 4, 5) == vec3Setting1.value());
CHECK(settings::source::DEFAULT == stringSetting1.get_source());
CHECK("abc" == stringSetting1.value());