brossferatu/coven
Public Access
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Tiny refactor

Browse Source
This commit is contained in:
Daniel Bross
2024-10-18 16:12:24 +02:00
parent 8ee000ab74
commit 1d5b4499a4
38 changed files with 645 additions and 637 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
modules/ufbx/examples/picort/picort.cpp
View File

@@ -533,9 +533,9 @@ Image read_png(const void *data, size_t size)
retain.initialized = false;
ufbx_inflate_input input = { 0 };
input.total_size = deflate_data.size();
input.data_size = deflate_data.size();
input.data = deflate_data.data();
engine.input.total_size = deflate_data.size();
engine.input.data_size = deflate_data.size();
engine.input.data = deflate_data.data();
ptrdiff_t res = ufbx_inflate(src.data(), src.size(), &input, &retain);
if (res < 0) return { "deflate error" };
@@ -3309,7 +3309,7 @@ void render_frame(ufbx_scene *original_scene, const Opts &opts, int frame_offset
void render_file(const Opts &opts)
{
verbosef("Loading scene: %s\n", opts.input.value.c_str());
verbosef("Loading scene: %s\n", opts.engine.input.value.c_str());
ProgressState progress_state = { };
@@ -3371,9 +3371,9 @@ void parse_args(Opts &opts, int argc, char **argv, bool ignore_input)
}
} else {
if (!ignore_input) {
opts.input.value = arg;
opts.input.defined = true;
opts.input.from_arg = true;
opts.engine.input.value = arg;
opts.engine.input.defined = true;
opts.engine.input.from_arg = true;
}
}
}
@@ -3489,7 +3489,7 @@ int main(int argc, char **argv)
parse_args(opts, argc, argv, false);
if (opts.help.value) {
fprintf(stderr, "Usage: picort input.fbx <opts> (--help)\n");
fprintf(stderr, "Usage: picort engine.input.fbx <opts> (--help)\n");
for (OptBase &opt : opts) {
char name[64];
if (opt.alias) {
@@ -3511,13 +3511,13 @@ int main(int argc, char **argv)
return 0;
}
if (!opts.input.defined) {
fprintf(stderr, "Usage: picort input.fbx/.picort.txt <opts> (--help)\n");
if (!opts.engine.input.defined) {
fprintf(stderr, "Usage: picort engine.input.fbx/.picort.txt <opts> (--help)\n");
return 0;
}
if (ends_with(opts.input.value, ".txt")) {
std::string path = std::move(opts.input.value);
if (ends_with(opts.engine.input.value, ".txt")) {
std::string path = std::move(opts.engine.input.value);
opts = Opts{};
parse_file(opts, path.c_str());
parse_args(opts, argc, argv, true);