Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2026-10-25 14:12:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(ugc): settings for the ray tracer, hidden-face method and denoising

Browse Source 
New UGC settings (ugcconfig.ini and the dashboard's settings page):

- ray_backend: builtin (default), embree or hiprt (falls back to embree when
  the build or machine can't); the hidden faces' paths and the occlusion rays
- hsr_method: toolbox (default, LU Toolbox's paths) or fast (the renders from
  around the model), and hsr_fast_resolution (1024) for the fast one
- denoise: off (default) or oidn (icons; off until a build has it)

UgcProcessOptions (dCommon/UgcKeys.h) names the choices for everything that
passes them on ("embree fast oidn", any order, left out: the setting's).
UgcJobs::ApplyOptions puts a choice over the settings and MadeWith says what a
make used after fallbacks; a made model's stats.json records it (rays,
hsrMethod, denoise). UgcServer --make-model and --make-modular take the
choices after the folder and print the CPU time and what made it.

Check: the defaults make the same files as before; the settings page shows the
four settings under UGC; UgcServer --make-model model.lxfml out embree fast.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
Aaron Kimbrell
2026-09-29 11:17:02 -05:00
parent 00607a20a6
commit 06be40471b
10 changed files with 206 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
tests/dUgcTests/UgcTests.cpp
View File

@@ -2063,6 +2063,54 @@ TEST(UgcHsr, FastMethodRendersFromAround) {
#endif
}
TEST(UgcProcessOptions, ParseApplyAndRecord) {
UgcProcessOptions::Choice choice;
ASSERT_TRUE(UgcProcessOptions::Parse("fast embree", choice));
EXPECT_EQ(choice.rays, "embree");
EXPECT_EQ(choice.hsr, "fast");
EXPECT_EQ(choice.denoise, "");
EXPECT_EQ(UgcProcessOptions::ToString(choice), "embree fast");
ASSERT_TRUE(UgcProcessOptions::Parse("default - oidn", choice));
EXPECT_EQ(UgcProcessOptions::ToString(choice), "oidn");
ASSERT_TRUE(UgcProcessOptions::Parse("", choice));
EXPECT_TRUE(choice.Empty());
EXPECT_FALSE(UgcProcessOptions::Parse("embree hiprt", choice)); // two backends
EXPECT_FALSE(UgcProcessOptions::Parse("optix", choice));
// The shared names are the UGC server's
for (const auto name : UgcProcessOptions::RAYS) EXPECT_EQ(UgcRays::Name(*UgcRays::Parse(name)), name);
for (const auto name : UgcProcessOptions::HSR) EXPECT_EQ(UgcHsr::Name(*UgcHsr::Parse(name)), name);
for (const auto name : UgcProcessOptions::DENOISE) EXPECT_EQ(UgcRender::Name(*UgcRender::ParseDenoise(name)), name);
// Applied over the settings; what made a model is recorded as it was used
UgcJobs::Settings settings;
EXPECT_EQ(UgcProcessOptions::ToString(UgcJobs::MadeWith(settings)), "builtin toolbox off");
ASSERT_TRUE(UgcProcessOptions::Parse("embree fast", choice));
UgcJobs::ApplyOptions(settings, choice);
EXPECT_EQ(settings.hsr.rays, UgcRays::eBackend::EMBREE);
EXPECT_EQ(settings.ao.rays, UgcRays::eBackend::EMBREE);
EXPECT_EQ(settings.icon.ao.rays, UgcRays::eBackend::EMBREE);
EXPECT_EQ(settings.hsr.method, UgcHsr::eMethod::FAST);
EXPECT_EQ(UgcProcessOptions::ToString(UgcJobs::MadeWith(settings)), "embree fast off");
ASSERT_TRUE(UgcProcessOptions::Parse("hiprt oidn", choice));
UgcJobs::ApplyOptions(settings, choice);
const auto made = UgcJobs::MadeWith(settings);
EXPECT_EQ(made.rays, UgcRays::Available(UgcRays::eBackend::HIPRT) ? "hiprt" : "embree");
EXPECT_EQ(made.denoise, UgcRender::Available(UgcRender::eDenoise::OIDN) ? "oidn" : "off");
// The make records it, in its stats too
UgcBricks::BrickLibrary library(MakeRes(), 0);
auto small = SmallSettings();
UgcJobs::ApplyOptions(small, choice);
const auto outcome = UgcJobs::ProcessModel(LXFML5, library, small, 7);
ASSERT_TRUE(outcome.ok) << outcome.error;
EXPECT_EQ(outcome.options, UgcProcessOptions::ToString(UgcJobs::MadeWith(small)));
const auto stats = nlohmann::json::parse(outcome.stats);
EXPECT_EQ(stats["settings"]["rays"], made.rays);
EXPECT_EQ(stats["settings"]["hsrMethod"], "toolbox");
EXPECT_EQ(stats["settings"]["denoise"], made.denoise);
}
TEST(UgcRays, NamesAndFallback) {
for (const auto backend : { UgcRays::eBackend::BUILTIN, UgcRays::eBackend::EMBREE, UgcRays::eBackend::HIPRT }) {
EXPECT_EQ(UgcRays::Parse(UgcRays::Name(backend)), backend);