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

fix "soft"'s special weirdness

This commit is contained in:
Jonathan 2022-05-15 21:27:34 -04:00
parent 8012d46e46
commit e5685b0909
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/light/light.hh
View File

@ -334,7 +334,7 @@ public:
bool parse(const std::string &settingName, parser_base_t &parser, bool locked = false) override bool parse(const std::string &settingName, parser_base_t &parser, bool locked = false) override
{ {
if (!parser.parse_token()) { if (!parser.parse_token(PARSE_PEEK)) {
return false; return false;
} }
@ -343,6 +343,8 @@ public:
setValueFromParse(f, locked); setValueFromParse(f, locked);
parser.parse_token();
return true; return true;
} }
catch (std::exception &) { catch (std::exception &) {
@ -396,7 +398,7 @@ public:
setting_vec3 debugvert{this, "debugvert", std::numeric_limits<vec_t>::quiet_NaN(), setting_vec3 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, ""}; std::numeric_limits<vec_t>::quiet_NaN(), std::numeric_limits<vec_t>::quiet_NaN(), &debug_group, ""};
setting_bool highlightseams{this, "highlightseams", false, &debug_group, ""}; setting_bool highlightseams{this, "highlightseams", false, &debug_group, ""};
setting_soft soft{this, "soft", 0, 0, std::numeric_limits<int32_t>::max(), &postprocessing_group, setting_soft 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"}; "blurs the lightmap. specify n to blur radius in samples, otherwise auto"};
setting_string radlights{this, "radlights", "", "\"filename.rad\"", &experimental_group, setting_string radlights{this, "radlights", "", "\"filename.rad\"", &experimental_group,
"loads a <surfacename> <r> <g> <b> <intensity> file"}; "loads a <surfacename> <r> <g> <b> <intensity> file"};