omar/panopainter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Extract grid UI operation planning

Browse Source
This commit is contained in:
omigamedev
2026-06-03 10:52:51 +02:00
parent a487b0ba48
commit 73fac0f8e4
9 changed files with 522 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

158
tools/pano_cli/main.cpp
View File

@@ -11,6 +11,7 @@
#include "app_core/document_route.h"
#include "app_core/document_sharing.h"
#include "app_core/document_session.h"
#include "app_core/grid_ui.h"
#include "assets/image_format.h"
#include "assets/image_metadata.h"
#include "assets/image_pixels.h"
@@ -263,6 +264,17 @@ struct PlanBrushOperationArgs {
bool has_brush = true;
};
struct PlanGridOperationArgs {
std::string kind = "pick";
std::string path;
bool has_heightmap = true;
bool has_canvas = true;
bool supports_float32 = false;
bool supports_float16 = false;
int texture_resolution = 1024;
int sample_count = 32;
};
struct SimulateAppSessionArgs {
bool has_canvas = true;
bool new_document = false;
@@ -592,6 +604,26 @@ const char* brush_ui_operation_name(pp::app::BrushUiOperation operation) noexcep
return "stroke-settings-changed";
}
const char* grid_ui_operation_name(pp::app::GridUiOperation operation) noexcept
{
switch (operation) {
case pp::app::GridUiOperation::request_heightmap_pick:
return "request-heightmap-pick";
case pp::app::GridUiOperation::load_heightmap:
return "load-heightmap";
case pp::app::GridUiOperation::clear_heightmap:
return "clear-heightmap";
case pp::app::GridUiOperation::reload_heightmap:
return "reload-heightmap";
case pp::app::GridUiOperation::render_lightmap:
return "render-lightmap";
case pp::app::GridUiOperation::commit_heightmap:
return "commit-heightmap";
}
return "request-heightmap-pick";
}
const char* document_file_write_decision_name(pp::app::DocumentFileWriteDecision decision) noexcept
{
switch (decision) {
@@ -847,6 +879,7 @@ void print_help()
<< " plan-layer-operation --kind add|duplicate|select|reorder|remove|opacity|visibility|alpha-lock|blend-mode|highlight [--layer-count N] [--index N] [--from-index N] [--to-index N] [--source-index N] [--name NAME] [--opacity N] [--blend-mode N] [--enabled]\n"
<< " plan-animation-operation --kind add|duplicate|remove|duration|move|goto|next|prev|onion [--frame-count N] [--total-duration N] [--current-frame N] [--selected-frame N] [--current-duration N] [--delta N] [--offset N] [--onion-size N]\n"
<< " plan-brush-operation --kind color|tip|pattern|dual|preset|settings [--path FILE] [--thumb FILE] [--r N] [--g N] [--b N] [--a N] [--no-brush]\n"
<< " plan-grid-operation --kind pick|load|reload|clear|render|commit [--path FILE] [--no-heightmap] [--no-canvas] [--float32] [--float16] [--texture-resolution N] [--samples N]\n"
<< " plan-share-file [--path FILE]\n"
<< " plan-picked-path [--path FILE]\n"
<< " plan-display-file [--path FILE]\n"
@@ -2885,6 +2918,127 @@ int plan_brush_operation(int argc, char** argv)
return 0;
}
pp::foundation::Status parse_plan_grid_operation_args(
int argc,
char** argv,
PlanGridOperationArgs& args)
{
for (int i = 2; i < argc; ++i) {
const std::string_view key(argv[i]);
if (key == "--kind" || key == "--path") {
if (i + 1 >= argc) {
return pp::foundation::Status::invalid_argument("missing value for option");
}
if (key == "--kind") {
args.kind = argv[++i];
} else {
args.path = argv[++i];
}
} else if (key == "--texture-resolution" || key == "--samples") {
if (i + 1 >= argc) {
return pp::foundation::Status::invalid_argument("missing value for option");
}
const auto value = parse_i32_arg(argv[++i]);
if (!value) {
return value.status();
}
if (key == "--texture-resolution") {
args.texture_resolution = value.value();
} else {
args.sample_count = value.value();
}
} else if (key == "--no-heightmap") {
args.has_heightmap = false;
} else if (key == "--no-canvas") {
args.has_canvas = false;
} else if (key == "--float32") {
args.supports_float32 = true;
} else if (key == "--float16") {
args.supports_float16 = true;
} else {
return pp::foundation::Status::invalid_argument("unknown option");
}
}
return pp::foundation::Status::success();
}
pp::foundation::Result<pp::app::GridUiPlan> make_grid_operation_plan(const PlanGridOperationArgs& args)
{
if (args.kind == "pick") {
return pp::foundation::Result<pp::app::GridUiPlan>::success(pp::app::plan_grid_heightmap_pick());
}
if (args.kind == "load") {
return pp::app::plan_grid_heightmap_load(args.path);
}
if (args.kind == "reload") {
return pp::app::plan_grid_heightmap_reload(args.path);
}
if (args.kind == "clear") {
return pp::foundation::Result<pp::app::GridUiPlan>::success(
pp::app::plan_grid_heightmap_clear(args.has_heightmap));
}
if (args.kind == "render") {
return pp::app::plan_grid_lightmap_render(
args.has_heightmap,
args.supports_float32,
args.supports_float16,
args.texture_resolution,
args.sample_count);
}
if (args.kind == "commit") {
return pp::foundation::Result<pp::app::GridUiPlan>::success(
pp::app::plan_grid_heightmap_commit(args.has_canvas));
}
return pp::foundation::Result<pp::app::GridUiPlan>::failure(
pp::foundation::Status::invalid_argument("unknown grid operation kind"));
}
int plan_grid_operation(int argc, char** argv)
{
PlanGridOperationArgs args;
const auto status = parse_plan_grid_operation_args(argc, argv, args);
if (!status.ok()) {
print_error("plan-grid-operation", status.message);
return 2;
}
const auto plan = make_grid_operation_plan(args);
if (!plan) {
print_error("plan-grid-operation", plan.status().message);
return 2;
}
const auto& value = plan.value();
std::cout << "{\"ok\":true,\"command\":\"plan-grid-operation\""
<< ",\"state\":{\"kind\":\"" << json_escape(args.kind)
<< "\",\"path\":\"" << json_escape(args.path)
<< "\",\"hasHeightmap\":" << json_bool(args.has_heightmap)
<< ",\"hasCanvas\":" << json_bool(args.has_canvas)
<< ",\"float32\":" << json_bool(args.supports_float32)
<< ",\"float16\":" << json_bool(args.supports_float16)
<< ",\"textureResolution\":" << args.texture_resolution
<< ",\"samples\":" << args.sample_count
<< "},\"plan\":{\"operation\":\"" << grid_ui_operation_name(value.operation)
<< "\",\"path\":\"" << json_escape(value.path)
<< "\",\"textureResolution\":" << value.texture_resolution
<< ",\"sampleCount\":" << value.sample_count
<< ",\"opensPicker\":" << json_bool(value.opens_picker)
<< ",\"loadsHeightmap\":" << json_bool(value.loads_heightmap)
<< ",\"clearsHeightmap\":" << json_bool(value.clears_heightmap)
<< ",\"rendersLightmap\":" << json_bool(value.renders_lightmap)
<< ",\"commitsHeightmap\":" << json_bool(value.commits_heightmap)
<< ",\"updatesPreview\":" << json_bool(value.updates_preview)
<< ",\"updatesGroundOpacity\":" << json_bool(value.updates_ground_opacity)
<< ",\"updatesShadingMode\":" << json_bool(value.updates_shading_mode)
<< ",\"showsUnsupportedMessage\":" << json_bool(value.shows_unsupported_message)
<< ",\"showsProgress\":" << json_bool(value.shows_progress)
<< ",\"mutatesGridState\":" << json_bool(value.mutates_grid_state)
<< "}}\n";
return 0;
}
pp::foundation::Status parse_plan_share_file_args(
int argc,
char** argv,
@@ -5305,6 +5459,10 @@ int main(int argc, char** argv)
return plan_brush_operation(argc, argv);
}
if (command == "plan-grid-operation") {
return plan_grid_operation(argc, argv);
}
if (command == "plan-share-file") {
return plan_share_file(argc, argv);
}