Route app frame decisions through app core

This commit is contained in:
2026-06-05 06:08:39 +02:00
parent 678bf2dcd6
commit f7979be80f
11 changed files with 287 additions and 12 deletions

View File

@@ -1,5 +1,6 @@
#include "app_core/about_menu.h"
#include "app_core/app_preferences.h"
#include "app_core/app_frame.h"
#include "app_core/app_status.h"
#include "app_core/app_startup.h"
#include "app_core/brush_package_import.h"
@@ -245,6 +246,16 @@ struct PlanAppStartupResourcesArgs {
bool bad_size = false;
};
struct PlanAppFrameArgs {
bool redraw = false;
bool animate = false;
bool has_canvas_node = true;
bool has_canvas_document = true;
bool vr_active = false;
bool ui_visible = true;
bool vr_only = false;
};
struct PlanBrushPackageExportArgs {
std::string path;
std::string author;
@@ -2010,6 +2021,7 @@ void print_help()
<< " 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-frame [--redraw] [--animate] [--no-canvas] [--no-canvas-document] [--vr-active] [--ui-hidden] [--vr-only]\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"
@@ -3715,6 +3727,68 @@ int plan_app_startup_resources(int argc, char** argv)
return 0;
}
pp::foundation::Status parse_plan_app_frame_args(
int argc,
char** argv,
PlanAppFrameArgs& args)
{
for (int i = 2; i < argc; ++i) {
const std::string_view key(argv[i]);
if (key == "--redraw") {
args.redraw = true;
} else if (key == "--animate") {
args.animate = true;
} else if (key == "--no-canvas") {
args.has_canvas_node = false;
args.has_canvas_document = false;
} else if (key == "--no-canvas-document") {
args.has_canvas_document = false;
} else if (key == "--vr-active") {
args.vr_active = true;
} else if (key == "--ui-hidden") {
args.ui_visible = false;
} else if (key == "--vr-only") {
args.vr_only = true;
} else {
return pp::foundation::Status::invalid_argument("unknown option");
}
}
return pp::foundation::Status::success();
}
int plan_app_frame(int argc, char** argv)
{
PlanAppFrameArgs args;
const auto status = parse_plan_app_frame_args(argc, argv, args);
if (!status.ok()) {
print_error("plan-app-frame", status.message);
return 2;
}
const auto surface = pp::app::plan_app_initial_surface();
const auto update = pp::app::plan_app_frame_update(args.redraw, args.animate);
const auto draw = pp::app::plan_app_frame_draw(
args.has_canvas_node,
args.has_canvas_document,
args.vr_active,
args.ui_visible,
args.vr_only);
std::cout << "{\"ok\":true,\"command\":\"plan-app-frame\""
<< ",\"surface\":{\"width\":" << surface.width
<< ",\"height\":" << surface.height
<< "},\"update\":{\"updateFrame\":" << json_bool(update.update_frame)
<< ",\"updateLayouts\":" << json_bool(update.update_layouts)
<< ",\"refreshCanvasToolbar\":" << json_bool(update.refresh_canvas_toolbar)
<< "},\"draw\":{\"drawCanvasStroke\":" << json_bool(draw.draw_canvas_stroke)
<< ",\"drawVrUi\":" << json_bool(draw.draw_vr_ui)
<< ",\"drawMainUi\":" << json_bool(draw.draw_main_ui)
<< ",\"resetRedraw\":" << json_bool(draw.reset_redraw)
<< "}}\n";
return 0;
}
pp::foundation::Status parse_plan_brush_package_import_args(
int argc,
char** argv,
@@ -9962,6 +10036,10 @@ int main(int argc, char** argv)
return plan_app_startup_resources(argc, argv);
}
if (command == "plan-app-frame") {
return plan_app_frame(argc, argv);
}
if (command == "plan-brush-package-import") {
return plan_brush_package_import(argc, argv);
}