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

Extract canvas toolbar state planning

Browse Source
This commit is contained in:
omigamedev
2026-06-03 11:26:58 +02:00
parent 2087505921
commit 91e1c2c9a3
7 changed files with 263 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

116
tools/pano_cli/main.cpp
View File

@@ -290,6 +290,12 @@ struct PlanCanvasToolArgs {
bool current_mode_draw = false;
};
struct PlanCanvasToolStateArgs {
std::string mode = "draw";
bool picking = false;
bool touch_lock = false;
};
struct PlanQuickOperationArgs {
std::string kind = "brush";
int current_index = 0;
@@ -1005,6 +1011,7 @@ void print_help()
<< " 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-canvas-tool --kind draw|erase|line|camera|grid|copy|cut|fill|mask-free|mask-line|bucket|pick|touch-lock [--current-mode-draw]\n"
<< " plan-canvas-tool-state [--mode draw|erase|line|camera|grid|copy|cut|fill|mask-free|mask-line|bucket] [--picking] [--touch-lock]\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-history-operation --kind undo|redo|clear [--undo-count N] [--redo-count N] [--memory-bytes N]\n"
<< " plan-quick-operation --kind brush|color|restore|reset [--current-index N] [--slot-index N] [--brush-index N] [--color-index N] [--slot-count N] [--fire-event]\n"
@@ -3127,6 +3134,46 @@ pp::foundation::Result<pp::app::CanvasToolPlan> make_canvas_tool_plan(const Plan
pp::foundation::Status::invalid_argument("unknown canvas tool kind"));
}
pp::foundation::Result<pp::app::CanvasToolMode> parse_canvas_tool_mode(std::string_view mode)
{
if (mode == "draw") {
return pp::foundation::Result<pp::app::CanvasToolMode>::success(pp::app::CanvasToolMode::draw);
}
if (mode == "erase") {
return pp::foundation::Result<pp::app::CanvasToolMode>::success(pp::app::CanvasToolMode::erase);
}
if (mode == "line") {
return pp::foundation::Result<pp::app::CanvasToolMode>::success(pp::app::CanvasToolMode::line);
}
if (mode == "camera") {
return pp::foundation::Result<pp::app::CanvasToolMode>::success(pp::app::CanvasToolMode::camera);
}
if (mode == "grid") {
return pp::foundation::Result<pp::app::CanvasToolMode>::success(pp::app::CanvasToolMode::grid);
}
if (mode == "copy") {
return pp::foundation::Result<pp::app::CanvasToolMode>::success(pp::app::CanvasToolMode::copy);
}
if (mode == "cut") {
return pp::foundation::Result<pp::app::CanvasToolMode>::success(pp::app::CanvasToolMode::cut);
}
if (mode == "fill") {
return pp::foundation::Result<pp::app::CanvasToolMode>::success(pp::app::CanvasToolMode::fill);
}
if (mode == "mask-free") {
return pp::foundation::Result<pp::app::CanvasToolMode>::success(pp::app::CanvasToolMode::mask_free);
}
if (mode == "mask-line") {
return pp::foundation::Result<pp::app::CanvasToolMode>::success(pp::app::CanvasToolMode::mask_line);
}
if (mode == "bucket") {
return pp::foundation::Result<pp::app::CanvasToolMode>::success(pp::app::CanvasToolMode::flood_fill);
}
return pp::foundation::Result<pp::app::CanvasToolMode>::failure(
pp::foundation::Status::invalid_argument("unknown canvas tool mode"));
}
int plan_canvas_tool(int argc, char** argv)
{
PlanCanvasToolArgs args;
@@ -3159,6 +3206,71 @@ int plan_canvas_tool(int argc, char** argv)
return 0;
}
pp::foundation::Status parse_plan_canvas_tool_state_args(
int argc,
char** argv,
PlanCanvasToolStateArgs& args)
{
for (int i = 2; i < argc; ++i) {
const std::string_view key(argv[i]);
if (key == "--mode") {
if (i + 1 >= argc) {
return pp::foundation::Status::invalid_argument("missing value for option");
}
args.mode = argv[++i];
} else if (key == "--picking") {
args.picking = true;
} else if (key == "--touch-lock") {
args.touch_lock = true;
} else {
return pp::foundation::Status::invalid_argument("unknown option");
}
}
return pp::foundation::Status::success();
}
int plan_canvas_tool_state(int argc, char** argv)
{
PlanCanvasToolStateArgs args;
const auto status = parse_plan_canvas_tool_state_args(argc, argv, args);
if (!status.ok()) {
print_error("plan-canvas-tool-state", status.message);
return 2;
}
const auto mode = parse_canvas_tool_mode(args.mode);
if (!mode) {
print_error("plan-canvas-tool-state", mode.status().message);
return 2;
}
const auto state = pp::app::plan_canvas_tool_button_state(
mode.value(),
args.picking,
args.touch_lock);
std::cout << "{\"ok\":true,\"command\":\"plan-canvas-tool-state\""
<< ",\"state\":{\"mode\":\"" << json_escape(args.mode)
<< "\",\"picking\":" << json_bool(args.picking)
<< ",\"touchLock\":" << json_bool(args.touch_lock)
<< "},\"toolbar\":{\"mode\":\"" << canvas_tool_mode_name(state.mode)
<< "\",\"pickActive\":" << json_bool(state.pick_active)
<< ",\"touchLockActive\":" << json_bool(state.touch_lock_active)
<< ",\"penActive\":" << json_bool(state.pen_active)
<< ",\"eraseActive\":" << json_bool(state.erase_active)
<< ",\"lineActive\":" << json_bool(state.line_active)
<< ",\"cameraActive\":" << json_bool(state.camera_active)
<< ",\"gridActive\":" << json_bool(state.grid_active)
<< ",\"copyActive\":" << json_bool(state.copy_active)
<< ",\"cutActive\":" << json_bool(state.cut_active)
<< ",\"fillActive\":" << json_bool(state.fill_active)
<< ",\"maskFreeActive\":" << json_bool(state.mask_free_active)
<< ",\"maskLineActive\":" << json_bool(state.mask_line_active)
<< ",\"bucketActive\":" << json_bool(state.flood_fill_active)
<< "}}\n";
return 0;
}
pp::foundation::Status parse_plan_grid_operation_args(
int argc,
char** argv,
@@ -5907,6 +6019,10 @@ int main(int argc, char** argv)
return plan_canvas_tool(argc, argv);
}
if (command == "plan-canvas-tool-state") {
return plan_canvas_tool_state(argc, argv);
}
if (command == "plan-grid-operation") {
return plan_grid_operation(argc, argv);
}