Extend app frame planning to tick and resize
This commit is contained in:
@@ -250,11 +250,16 @@ struct PlanAppStartupResourcesArgs {
|
||||
struct PlanAppFrameArgs {
|
||||
bool redraw = false;
|
||||
bool animate = false;
|
||||
bool has_designer_layout = true;
|
||||
bool has_main_layout = true;
|
||||
bool has_canvas_node = true;
|
||||
bool has_canvas_document = true;
|
||||
bool vr_active = false;
|
||||
bool ui_visible = true;
|
||||
bool vr_only = false;
|
||||
float resize_width = 1280.0F;
|
||||
float resize_height = 720.0F;
|
||||
bool bad_resize = false;
|
||||
};
|
||||
|
||||
struct PlanBrushPackageExportArgs {
|
||||
@@ -2022,7 +2027,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-frame [--redraw] [--animate] [--no-designer-layout] [--no-main-layout] [--no-canvas] [--no-canvas-document] [--vr-active] [--ui-hidden] [--vr-only] [--resize-width N] [--resize-height N] [--bad-resize]\n"
|
||||
<< " plan-app-shutdown\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"
|
||||
@@ -3740,6 +3745,10 @@ pp::foundation::Status parse_plan_app_frame_args(
|
||||
args.redraw = true;
|
||||
} else if (key == "--animate") {
|
||||
args.animate = true;
|
||||
} else if (key == "--no-designer-layout") {
|
||||
args.has_designer_layout = false;
|
||||
} else if (key == "--no-main-layout") {
|
||||
args.has_main_layout = false;
|
||||
} else if (key == "--no-canvas") {
|
||||
args.has_canvas_node = false;
|
||||
args.has_canvas_document = false;
|
||||
@@ -3751,6 +3760,26 @@ pp::foundation::Status parse_plan_app_frame_args(
|
||||
args.ui_visible = false;
|
||||
} else if (key == "--vr-only") {
|
||||
args.vr_only = true;
|
||||
} else if (key == "--resize-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.resize_width = value.value();
|
||||
} else if (key == "--resize-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.resize_height = value.value();
|
||||
} else if (key == "--bad-resize") {
|
||||
args.bad_resize = true;
|
||||
} else {
|
||||
return pp::foundation::Status::invalid_argument("unknown option");
|
||||
}
|
||||
@@ -3770,12 +3799,20 @@ int plan_app_frame(int argc, char** argv)
|
||||
|
||||
const auto surface = pp::app::plan_app_initial_surface();
|
||||
const auto update = pp::app::plan_app_frame_update(args.redraw, args.animate);
|
||||
const auto tick = pp::app::plan_app_frame_tick(args.has_designer_layout, args.has_main_layout);
|
||||
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);
|
||||
const auto resize = pp::app::plan_app_resize(
|
||||
args.bad_resize ? 0.0F : args.resize_width,
|
||||
args.bad_resize ? std::nanf("") : args.resize_height);
|
||||
if (!resize) {
|
||||
print_error("plan-app-frame", resize.status().message);
|
||||
return 2;
|
||||
}
|
||||
|
||||
std::cout << "{\"ok\":true,\"command\":\"plan-app-frame\""
|
||||
<< ",\"surface\":{\"width\":" << surface.width
|
||||
@@ -3783,10 +3820,18 @@ int plan_app_frame(int argc, char** argv)
|
||||
<< "},\"update\":{\"updateFrame\":" << json_bool(update.update_frame)
|
||||
<< ",\"updateLayouts\":" << json_bool(update.update_layouts)
|
||||
<< ",\"refreshCanvasToolbar\":" << json_bool(update.refresh_canvas_toolbar)
|
||||
<< "},\"tick\":{\"tickDesignerLayout\":" << json_bool(tick.tick_designer_layout)
|
||||
<< ",\"tickMainLayout\":" << json_bool(tick.tick_main_layout)
|
||||
<< "},\"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)
|
||||
<< "},\"resize\":{\"width\":" << resize.value().width
|
||||
<< ",\"height\":" << resize.value().height
|
||||
<< ",\"renderTargetWidth\":" << resize.value().render_target_width
|
||||
<< ",\"renderTargetHeight\":" << resize.value().render_target_height
|
||||
<< ",\"recreateUiRenderTarget\":" << json_bool(resize.value().recreate_ui_render_target)
|
||||
<< ",\"requestRedraw\":" << json_bool(resize.value().request_redraw)
|
||||
<< "}}\n";
|
||||
return 0;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user