Route startup resources through app core

This commit is contained in:
2026-06-05 05:55:23 +02:00
parent e42afcc83f
commit 678bf2dcd6
10 changed files with 347 additions and 21 deletions

View File

@@ -239,6 +239,12 @@ struct PlanAppStartupArgs {
bool license_valid = true;
};
struct PlanAppStartupResourcesArgs {
float width = 1280.0F;
float height = 720.0F;
bool bad_size = false;
};
struct PlanBrushPackageExportArgs {
std::string path;
std::string author;
@@ -2003,6 +2009,7 @@ void print_help()
<< " plan-recording-session [--running] [--frame-count N] [--platform-deletes-recorded-files]\n"
<< " plan-app-preferences [--ui-scale N] [--display-density N] [--current-scale N] [--scale-option N] [--viewport-scale N] [--rtl] [--timelapse-disabled] [--recording-running] [--vr-controllers-disabled] [--cursor-mode N]\n"
<< " plan-app-startup [--run-counter N] [--auto-timelapse-disabled] [--vr-controllers-disabled] [--license-invalid]\n"
<< " plan-app-startup-resources [--width N] [--height N] [--bad-size]\n"
<< " plan-app-status [--doc-name NAME] [--unsaved] [--resolution N] [--resolution-index N] [--zoom N] [--history-bytes N] [--recording-running] [--encoder-available] [--encoded-frames N] [--framebuffer-fetch] [--float32] [--float32-linear] [--float16]\n"
<< " plan-brush-package-import --kind abr|ppbr --path FILE\n"
<< " plan-brush-package-export --path FILE [--author NAME] [--email EMAIL] [--url URL] [--description TEXT] [--dest-path DIR] [--export-data|--no-export-data] [--header-image]\n"
@@ -3644,6 +3651,70 @@ int plan_app_startup(int argc, char** argv)
return 0;
}
pp::foundation::Status parse_plan_app_startup_resources_args(
int argc,
char** argv,
PlanAppStartupResourcesArgs& args)
{
for (int i = 2; i < argc; ++i) {
const std::string_view key(argv[i]);
if (key == "--width") {
if (i + 1 >= argc) {
return pp::foundation::Status::invalid_argument("missing value for option");
}
const auto value = parse_float_arg(argv[++i]);
if (!value) {
return value.status();
}
args.width = value.value();
} else if (key == "--height") {
if (i + 1 >= argc) {
return pp::foundation::Status::invalid_argument("missing value for option");
}
const auto value = parse_float_arg(argv[++i]);
if (!value) {
return value.status();
}
args.height = value.value();
} else if (key == "--bad-size") {
args.bad_size = true;
} else {
return pp::foundation::Status::invalid_argument("unknown option");
}
}
return pp::foundation::Status::success();
}
int plan_app_startup_resources(int argc, char** argv)
{
PlanAppStartupResourcesArgs args;
const auto status = parse_plan_app_startup_resources_args(argc, argv, args);
if (!status.ok()) {
print_error("plan-app-startup-resources", status.message);
return 2;
}
const auto plan = pp::app::plan_app_startup_resources(
args.bad_size ? 0.0F : args.width,
args.bad_size ? std::nanf("") : args.height);
if (!plan) {
print_error("plan-app-startup-resources", plan.status().message);
return 2;
}
std::cout << "{\"ok\":true,\"command\":\"plan-app-startup-resources\""
<< ",\"plan\":{\"uiRenderTargetWidth\":" << plan.value().ui_render_target_width
<< ",\"uiRenderTargetHeight\":" << plan.value().ui_render_target_height
<< ",\"initializeShaders\":" << json_bool(plan.value().initialize_shaders)
<< ",\"initializeAssets\":" << json_bool(plan.value().initialize_assets)
<< ",\"initializeLayout\":" << json_bool(plan.value().initialize_layout)
<< ",\"updateTitle\":" << json_bool(plan.value().update_title)
<< ",\"createUiRenderTarget\":" << json_bool(plan.value().create_ui_render_target)
<< "}}\n";
return 0;
}
pp::foundation::Status parse_plan_brush_package_import_args(
int argc,
char** argv,
@@ -9887,6 +9958,10 @@ int main(int argc, char** argv)
return plan_app_startup(argc, argv);
}
if (command == "plan-app-startup-resources") {
return plan_app_startup_resources(argc, argv);
}
if (command == "plan-brush-package-import") {
return plan_brush_package_import(argc, argv);
}