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

tests: fix light settings not clearing across tests

This commit is contained in:
Eric Wasylishen 2022-11-19 19:02:55 -07:00
parent 91a0c8e86a
commit 37ced86cec
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/light/light.hh
View File

@ -399,6 +399,7 @@ public:
void setParameters(int argc, const char **argv) override; void setParameters(int argc, const char **argv) override;
void initialize(int argc, const char **argv) override; void initialize(int argc, const char **argv) override;
void postinitialize(int argc, const char **argv) override; void postinitialize(int argc, const char **argv) override;
void reset() override;
}; };
}; // namespace settings }; // namespace settings

13
light/light.cc
View File

@ -448,6 +448,17 @@ void light_settings::postinitialize(int argc, const char **argv)
common_settings::postinitialize(argc, argv); common_settings::postinitialize(argc, argv);
} }
void light_settings::reset()
{
common_settings::reset();
sourceMap = fs::path();
write_litfile = lightfile::none;
write_luxfile = lightfile::none;
debugmode = debugmodes::none;
}
} // namespace settings } // namespace settings
settings::light_settings light_options; settings::light_settings light_options;
@ -1511,6 +1522,8 @@ void light_reset()
ResetPhong(); ResetPhong();
ResetSurflight(); ResetSurflight();
ResetEmbree(); ResetEmbree();
light_options.reset();
} }
/* /*