From d318484b4105b8635cd8eab81864dfc437c0c93e Mon Sep 17 00:00:00 2001 From: chasse20 Date: Thu, 5 Nov 2026 18:23:06 -0500 Subject: [PATCH] Checkpoint native SBS primitive workflow Replace the legacy Rust procedural library with clean-room native primitives, typed function execution and FX-Map graphs. Save supported content as native SBS and organize the model, evaluators, codecs and editors into focused modules. Add shared graph editing behavior, flat filtered node menus, frame and comment editing, named Explorer outputs and an original atomic sample. Document the tested scope and remaining interoperability work. --- AGENTS.md | 9 +- ATTRIBUTION.md | 7 +- Cargo.lock | 147 +- Cargo.toml | 1 + README.md | 33 +- ROADMAP.md | 48 +- apps/materialcraft-cli/src/main.rs | 31 +- apps/materialcraft/src/main.rs | 19 +- crates/automation/src/automation_error.rs | 19 + crates/automation/src/filesystem.rs | 10 + crates/automation/src/headless.rs | 75 +- crates/automation/src/lib.rs | 45 +- crates/automation/src/render_options.rs | 25 + crates/automation/src/rendered.rs | 6 + crates/automation/src/rpc.rs | 37 +- crates/automation/src/server/backend.rs | 10 + .../material_craft_mcp.rs} | 242 +- crates/automation/src/server/mod.rs | 6 + .../src/server/parameter/batch_params.rs | 9 + .../src/server/parameter/bitmap_params.rs | 11 + .../src/server/parameter/connect_params.rs | 16 + .../src/server/parameter/export_params.rs | 23 + .../src/server/parameter/filter_params.rs | 9 + .../src/server/parameter/input_params.rs | 9 + .../src/server/parameter/library_params.rs | 12 + .../src/server/parameter/menu_params.rs | 8 + crates/automation/src/server/parameter/mod.rs | 33 + .../src/server/parameter/new_graph_params.rs | 14 + .../src/server/parameter/node_add_params.rs | 18 + .../src/server/parameter/param_set_params.rs | 13 + .../src/server/parameter/path_params.rs | 8 + .../src/server/parameter/render_params.rs | 40 + .../src/server/parameter/run_params.rs | 12 + .../src/server/parameter/save_params.rs | 9 + .../src/server/parameter/screenshot_params.rs | 9 + crates/automation/src/workspace.rs | 34 +- crates/core/src/attributes.rs | 11 + crates/core/src/base_parameters.rs | 23 + crates/core/src/color.rs | 34 + crates/core/src/comment.rs | 15 + crates/core/src/connection.rs | 13 + crates/core/src/core_error.rs | 9 + crates/core/src/curve.rs | 78 + crates/core/src/curve_point.rs | 18 + crates/core/src/exposed_parameter.rs | 26 + crates/core/src/frame.rs | 31 + crates/core/src/function.rs | 67 - crates/core/src/function_graph.rs | 67 + crates/core/src/function_node.rs | 19 + crates/core/src/gradient.rs | 41 + crates/core/src/gradient_key.rs | 20 + crates/core/src/graph.rs | 283 +-- crates/core/src/graph_kind.rs | 10 + crates/core/src/lib.rs | 92 +- crates/core/src/missing_node.rs | 22 + crates/core/src/node.rs | 51 + crates/core/src/node_id.rs | 4 + crates/core/src/output_format.rs | 38 + crates/core/src/package.rs | 104 +- crates/core/src/pattern_graph.rs | 78 + crates/core/src/pattern_node.rs | 13 + crates/core/src/pattern_node_kind.rs | 50 + crates/core/src/pin.rs | 9 + crates/core/src/preset.rs | 11 + crates/core/src/resource.rs | 21 + crates/core/src/resource_bytes.rs | 71 + crates/core/src/size_mode.rs | 14 + crates/core/src/value.rs | 253 +- crates/core/src/value_tests.rs | 36 + crates/core/src/value_type.rs | 72 + crates/engine/examples/atomic_sample.rs | 7 + crates/engine/src/annotation_commands.rs | 41 + crates/engine/src/annotation_selection.rs | 18 + crates/engine/src/atomic_sample.rs | 83 + crates/engine/src/atomic_sample_commands.rs | 13 + crates/engine/src/clip.rs | 12 + crates/engine/src/commands.rs | 37 +- crates/engine/src/comment_commands.rs | 57 + crates/engine/src/connection_commands.rs | 120 + crates/engine/src/edit_cmds.rs | 83 +- crates/engine/src/engine_error.rs | 15 + crates/engine/src/exported.rs | 5 + crates/engine/src/file_cmds.rs | 172 +- crates/engine/src/frame_commands.rs | 110 + crates/engine/src/frame_contents.rs | 51 + crates/engine/src/function_commands.rs | 23 + crates/engine/src/graph_cmds.rs | 134 +- crates/engine/src/graph_grid.rs | 8 + crates/engine/src/inspect.rs | 17 +- crates/engine/src/lib.rs | 65 +- crates/engine/src/material_cmds.rs | 54 +- crates/engine/src/material_options.rs | 14 + crates/engine/src/node_cmds.rs | 123 +- crates/engine/src/node_graph_commands.rs | 41 + crates/engine/src/pattern_graph_commands.rs | 28 + crates/engine/src/samples.rs | 607 +---- crates/engine/src/session.rs | 29 +- crates/engine/src/snapshot.rs | 11 + crates/engine/src/startup.rs | 19 + crates/engine/src/value_input_commands.rs | 55 + crates/engine/src/wire_cmds.rs | 2 +- crates/engine/tests/annotations.rs | 68 + crates/engine/tests/atomics.rs | 187 ++ crates/engine/tests/function_graph.rs | 48 + crates/engine/tests/graph_interaction.rs | 262 +++ crates/engine/tests/pattern_graph.rs | 44 + crates/engine/tests/perf.rs | 12 +- crates/engine/tests/session.rs | 151 +- crates/eval/src/cache.rs | 64 + crates/eval/src/cache_key.rs | 13 + crates/eval/src/cooked.rs | 24 + crates/eval/src/graph_execution.rs | 400 ++++ crates/eval/src/lib.rs | 809 +------ crates/eval/src/node_output.rs | 32 + crates/eval/src/node_result.rs | 14 + crates/eval/src/node_size.rs | 33 + crates/eval/src/options.rs | 29 + crates/eval/src/port.rs | 94 + crates/eval/src/tests.rs | 244 ++ crates/eval/src/value_input_label.rs | 30 + crates/formats/Cargo.toml | 3 +- crates/formats/src/depth.rs | 19 + crates/formats/src/file.rs | 26 + crates/formats/src/format_error.rs | 9 + crates/formats/src/guard.rs | 5 + crates/formats/src/image.rs | 122 + crates/formats/src/lib.rs | 396 +--- .../src/{material.rs => material/archive.rs} | 96 +- crates/formats/src/material/image_input.rs | 8 + crates/formats/src/material/manifest.rs | 22 + crates/formats/src/material/map_entry.rs | 11 + crates/formats/src/material/mod.rs | 13 + crates/formats/src/material/parameter.rs | 10 + crates/formats/src/material/preset_entry.rs | 9 + crates/formats/src/sbs.rs | 2086 ----------------- crates/formats/src/sbs/base_parameters.rs | 82 + crates/formats/src/sbs/canvas.rs | 45 + crates/formats/src/sbs/connection.rs | 54 + crates/formats/src/sbs/constant.rs | 20 + crates/formats/src/sbs/embedded.rs | 32 + crates/formats/src/sbs/filter_map.rs | 125 + crates/formats/src/sbs/function_graph.rs | 131 ++ crates/formats/src/sbs/image_input.rs | 15 + crates/formats/src/sbs/input_bridge.rs | 7 + crates/formats/src/sbs/mod.rs | 32 + crates/formats/src/sbs/node_identifiers.rs | 6 + crates/formats/src/sbs/node_parameter.rs | 30 + crates/formats/src/sbs/output.rs | 49 + crates/formats/src/sbs/parameter_array.rs | 93 + crates/formats/src/sbs/pattern_graph.rs | 116 + crates/formats/src/sbs/placeholder.rs | 75 + crates/formats/src/sbs/read_node.rs | 10 + crates/formats/src/sbs/sbs_read.rs | 7 + crates/formats/src/sbs/sbs_reader.rs | 626 +++++ crates/formats/src/sbs/sbs_value.rs | 174 ++ crates/formats/src/sbs/sbs_writer.rs | 378 +++ crates/formats/src/sbs/standalone_function.rs | 28 + crates/formats/src/sbs/tests.rs | 303 +++ crates/formats/src/sbs/type_code.rs | 12 + crates/formats/src/sbs/warnings.rs | 31 + crates/formats/src/sbs/xml.rs | 45 + crates/formats/src/svg.rs | 32 + crates/formats/src/tests.rs | 52 + crates/nodes/src/atomic.rs | 555 ----- crates/nodes/src/atomic/bitmap.rs | 27 + crates/nodes/src/atomic/blend.rs | 34 + crates/nodes/src/atomic/blur.rs | 14 + crates/nodes/src/atomic/catalog.rs | 37 + crates/nodes/src/atomic/channels_shuffle.rs | 35 + crates/nodes/src/atomic/curve.rs | 22 + crates/nodes/src/atomic/direction.rs | 4 + crates/nodes/src/atomic/directional_blur.rs | 40 + crates/nodes/src/atomic/directional_warp.rs | 26 + crates/nodes/src/atomic/distance.rs | 56 + crates/nodes/src/atomic/dot.rs | 11 + crates/nodes/src/atomic/emboss.rs | 34 + crates/nodes/src/atomic/gradient_dynamic.rs | 26 + crates/nodes/src/atomic/gradient_map.rs | 24 + .../nodes/src/atomic/grayscale_conversion.rs | 32 + crates/nodes/src/atomic/hsl.rs | 28 + crates/nodes/src/atomic/input_color.rs | 18 + crates/nodes/src/atomic/input_grayscale.rs | 18 + crates/nodes/src/atomic/input_value.rs | 12 + crates/nodes/src/atomic/levels.rs | 69 + crates/nodes/src/atomic/mod.rs | 45 + crates/nodes/src/atomic/motion_blur.rs | 17 + crates/nodes/src/atomic/normal.rs | 33 + crates/nodes/src/atomic/output.rs | 22 + crates/nodes/src/atomic/pattern_map.rs | 18 + crates/nodes/src/atomic/pixel_processor.rs | 13 + crates/nodes/src/atomic/sharpen.rs | 24 + crates/nodes/src/atomic/svg.rs | 26 + crates/nodes/src/{ => atomic}/text.rs | 131 +- crates/nodes/src/atomic/transformation.rs | 42 + crates/nodes/src/atomic/uniform.rs | 23 + crates/nodes/src/atomic/value_processor.rs | 12 + crates/nodes/src/atomic/warp.rs | 26 + crates/nodes/src/catalog.rs | 411 +--- crates/nodes/src/cook_context.rs | 107 + crates/nodes/src/filters.rs | 961 -------- crates/nodes/src/filters_extra.rs | 244 -- crates/nodes/src/filters_more.rs | 490 ---- crates/nodes/src/flood_fill.rs | 306 --- crates/nodes/src/function.rs | 395 ---- crates/nodes/src/function/arithmetic.rs | 94 + crates/nodes/src/function/catalog.rs | 120 + crates/nodes/src/function/compile.rs | 59 + .../nodes/src/function/evaluation_context.rs | 12 + crates/nodes/src/function/evaluation_state.rs | 19 + crates/nodes/src/function/evaluation_step.rs | 11 + .../nodes/src/function/function_definition.rs | 8 + crates/nodes/src/function/inferred_type.rs | 21 + crates/nodes/src/function/instruction.rs | 11 + crates/nodes/src/function/mod.rs | 30 + crates/nodes/src/function/node_types.rs | 51 + crates/nodes/src/function/operation.rs | 108 + crates/nodes/src/function/processor.rs | 53 + crates/nodes/src/function/program.rs | 121 + crates/nodes/src/function/tests.rs | 164 ++ crates/nodes/src/function/value_type.rs | 65 + crates/nodes/src/function/vector.rs | 70 + crates/nodes/src/fx_map.rs | 282 --- crates/nodes/src/generators.rs | 413 ---- crates/nodes/src/image_input.rs | 9 + crates/nodes/src/lib.rs | 210 +- crates/nodes/src/material.rs | 90 - crates/nodes/src/material_more.rs | 274 --- crates/nodes/src/node_definition.rs | 38 + crates/nodes/src/node_definition_builder.rs | 155 ++ crates/nodes/src/noise.rs | 184 -- crates/nodes/src/noise3d.rs | 281 --- crates/nodes/src/noises_more.rs | 440 ---- crates/nodes/src/output_value_type.rs | 34 + crates/nodes/src/parameter.rs | 68 + crates/nodes/src/parameter_definition.rs | 19 + crates/nodes/src/pattern/catalog.rs | 42 + crates/nodes/src/pattern/evaluation.rs | 163 ++ crates/nodes/src/pattern/mod.rs | 12 + crates/nodes/src/pattern/pattern_stamp.rs | 11 + crates/nodes/src/pattern/pattern_visit.rs | 13 + crates/nodes/src/pattern/raster.rs | 96 + crates/nodes/src/pattern/shape.rs | 49 + crates/nodes/src/pattern/tests.rs | 60 + crates/nodes/src/patterns.rs | 548 ----- crates/nodes/src/patterns_more.rs | 532 ----- crates/nodes/src/port_definition.rs | 8 + crates/nodes/src/port_kind.rs | 9 + crates/nodes/src/random.rs | 10 + crates/nodes/src/raster/capsule_raster.rs | 62 + crates/nodes/src/raster/capsule_segment.rs | 6 + crates/nodes/src/raster/composite.rs | 22 + crates/nodes/src/raster/mod.rs | 7 + crates/nodes/src/svg.rs | 487 ---- crates/nodes/src/tests.rs | 112 + crates/nodes/src/weathering.rs | 296 --- .../src/annotation/comment_properties.rs | 19 + .../src/annotation/frame_properties.rs | 38 + crates/ui-egui/src/annotation/mod.rs | 13 + crates/ui-egui/src/control.rs | 22 +- crates/ui-egui/src/docking.rs | 2 +- crates/ui-egui/src/explorer.rs | 93 +- crates/ui-egui/src/explorer/tree_row.rs | 24 + crates/ui-egui/src/function/canvas.rs | 572 +++++ crates/ui-egui/src/function/context_menu.rs | 98 + crates/ui-egui/src/function/function_drag.rs | 7 + .../ui-egui/src/function/function_editor.rs | 49 + .../ui-egui/src/function/function_target.rs | 16 + crates/ui-egui/src/function/library.rs | 25 + crates/ui-egui/src/function/mod.rs | 14 + crates/ui-egui/src/function/port_label.rs | 26 + crates/ui-egui/src/function/properties.rs | 43 + crates/ui-egui/src/function/selection.rs | 104 + crates/ui-egui/src/function_editor.rs | 438 ---- crates/ui-egui/src/graph/actions.rs | 71 + crates/ui-egui/src/graph/add_node_menu.rs | 105 + crates/ui-egui/src/graph/annotation_canvas.rs | 104 + crates/ui-egui/src/graph/annotation_input.rs | 52 + .../src/{graph_view.rs => graph/canvas.rs} | 785 ++----- crates/ui-egui/src/graph/context_menu.rs | 118 + crates/ui-egui/src/graph/frame_hit.rs | 14 + crates/ui-egui/src/graph/frames.rs | 64 + crates/ui-egui/src/graph/graph_camera.rs | 16 + crates/ui-egui/src/graph/graph_drag.rs | 33 + crates/ui-egui/src/graph/graph_view.rs | 56 + crates/ui-egui/src/graph/input_visibility.rs | 11 + crates/ui-egui/src/graph/interaction_tests.rs | 470 ++++ crates/ui-egui/src/graph/library_drag.rs | 3 + crates/ui-egui/src/graph/mod.rs | 31 + crates/ui-egui/src/graph/node_card.rs | 55 + crates/ui-egui/src/graph/node_layout.rs | 9 + crates/ui-egui/src/graph/node_search.rs | 12 + crates/ui-egui/src/graph/node_selection.rs | 27 + crates/ui-egui/src/graph/port_hit.rs | 14 + crates/ui-egui/src/graph/port_label.rs | 13 + crates/ui-egui/src/levels_editor.rs | 62 +- crates/ui-egui/src/lib.rs | 291 +-- crates/ui-egui/src/library.rs | 14 +- crates/ui-egui/src/material_craft_app.rs | 264 +++ crates/ui-egui/src/menu_item.rs | 9 + crates/ui-egui/src/menus.rs | 121 +- crates/ui-egui/src/pattern/actions.rs | 55 + crates/ui-egui/src/pattern/canvas.rs | 158 ++ crates/ui-egui/src/pattern/context_menu.rs | 71 + crates/ui-egui/src/pattern/geometry.rs | 44 + crates/ui-egui/src/pattern/input.rs | 140 ++ crates/ui-egui/src/pattern/library.rs | 22 + crates/ui-egui/src/pattern/mod.rs | 17 + crates/ui-egui/src/pattern/node_canvas.rs | 31 + crates/ui-egui/src/pattern/parameter_value.rs | 45 + crates/ui-egui/src/pattern/pattern_drag.rs | 8 + crates/ui-egui/src/pattern/pattern_editor.rs | 67 + crates/ui-egui/src/pattern/properties.rs | 72 + crates/ui-egui/src/pattern/selection.rs | 88 + crates/ui-egui/src/properties.rs | 119 +- crates/ui-egui/src/state.rs | 167 -- crates/ui-egui/src/state/graph_camera.rs | 14 + crates/ui-egui/src/state/image_camera.rs | 16 + crates/ui-egui/src/state/mod.rs | 10 + crates/ui-egui/src/state/prefs.rs | 64 + crates/ui-egui/src/state/ui_state.rs | 68 + crates/ui-egui/src/state/windows.rs | 13 + crates/ui-egui/src/thumbs.rs | 51 +- crates/ui-egui/src/toast.rs | 30 + crates/ui-egui/src/user_directory.rs | 6 + crates/ui-egui/src/value_editor.rs | 57 + crates/ui-egui/src/value_input_editor.rs | 54 + crates/ui-egui/src/view2d.rs | 4 +- crates/ui-egui/src/web_files.rs | 44 +- crates/ui-egui/src/windows.rs | 150 +- crates/ui-egui/tests/numeric_input.rs | 39 +- crates/ui-egui/tests/snapshot.rs | 466 +++- docs/architecture.md | 34 +- docs/atomic-workflow.md | 107 + docs/control-protocol.md | 47 +- docs/file-format-parity.md | 4 + docs/gaps.md | 4 + docs/target-app-parity.md | 4 + examples/atomic_sample.sbs | 1 + 338 files changed, 15374 insertions(+), 14789 deletions(-) create mode 100644 crates/automation/src/automation_error.rs create mode 100644 crates/automation/src/filesystem.rs create mode 100644 crates/automation/src/render_options.rs create mode 100644 crates/automation/src/rendered.rs create mode 100644 crates/automation/src/server/backend.rs rename crates/automation/src/{server.rs => server/material_craft_mcp.rs} (56%) create mode 100644 crates/automation/src/server/mod.rs create mode 100644 crates/automation/src/server/parameter/batch_params.rs create mode 100644 crates/automation/src/server/parameter/bitmap_params.rs create mode 100644 crates/automation/src/server/parameter/connect_params.rs create mode 100644 crates/automation/src/server/parameter/export_params.rs create mode 100644 crates/automation/src/server/parameter/filter_params.rs create mode 100644 crates/automation/src/server/parameter/input_params.rs create mode 100644 crates/automation/src/server/parameter/library_params.rs create mode 100644 crates/automation/src/server/parameter/menu_params.rs create mode 100644 crates/automation/src/server/parameter/mod.rs create mode 100644 crates/automation/src/server/parameter/new_graph_params.rs create mode 100644 crates/automation/src/server/parameter/node_add_params.rs create mode 100644 crates/automation/src/server/parameter/param_set_params.rs create mode 100644 crates/automation/src/server/parameter/path_params.rs create mode 100644 crates/automation/src/server/parameter/render_params.rs create mode 100644 crates/automation/src/server/parameter/run_params.rs create mode 100644 crates/automation/src/server/parameter/save_params.rs create mode 100644 crates/automation/src/server/parameter/screenshot_params.rs create mode 100644 crates/core/src/attributes.rs create mode 100644 crates/core/src/base_parameters.rs create mode 100644 crates/core/src/color.rs create mode 100644 crates/core/src/comment.rs create mode 100644 crates/core/src/connection.rs create mode 100644 crates/core/src/core_error.rs create mode 100644 crates/core/src/curve.rs create mode 100644 crates/core/src/curve_point.rs create mode 100644 crates/core/src/exposed_parameter.rs create mode 100644 crates/core/src/frame.rs delete mode 100644 crates/core/src/function.rs create mode 100644 crates/core/src/function_graph.rs create mode 100644 crates/core/src/function_node.rs create mode 100644 crates/core/src/gradient.rs create mode 100644 crates/core/src/gradient_key.rs create mode 100644 crates/core/src/graph_kind.rs create mode 100644 crates/core/src/missing_node.rs create mode 100644 crates/core/src/node.rs create mode 100644 crates/core/src/node_id.rs create mode 100644 crates/core/src/output_format.rs create mode 100644 crates/core/src/pattern_graph.rs create mode 100644 crates/core/src/pattern_node.rs create mode 100644 crates/core/src/pattern_node_kind.rs create mode 100644 crates/core/src/pin.rs create mode 100644 crates/core/src/preset.rs create mode 100644 crates/core/src/resource.rs create mode 100644 crates/core/src/resource_bytes.rs create mode 100644 crates/core/src/size_mode.rs create mode 100644 crates/core/src/value_tests.rs create mode 100644 crates/core/src/value_type.rs create mode 100644 crates/engine/examples/atomic_sample.rs create mode 100644 crates/engine/src/annotation_commands.rs create mode 100644 crates/engine/src/annotation_selection.rs create mode 100644 crates/engine/src/atomic_sample.rs create mode 100644 crates/engine/src/atomic_sample_commands.rs create mode 100644 crates/engine/src/clip.rs create mode 100644 crates/engine/src/comment_commands.rs create mode 100644 crates/engine/src/connection_commands.rs create mode 100644 crates/engine/src/engine_error.rs create mode 100644 crates/engine/src/exported.rs create mode 100644 crates/engine/src/frame_commands.rs create mode 100644 crates/engine/src/frame_contents.rs create mode 100644 crates/engine/src/function_commands.rs create mode 100644 crates/engine/src/graph_grid.rs create mode 100644 crates/engine/src/material_options.rs create mode 100644 crates/engine/src/node_graph_commands.rs create mode 100644 crates/engine/src/pattern_graph_commands.rs create mode 100644 crates/engine/src/snapshot.rs create mode 100644 crates/engine/src/startup.rs create mode 100644 crates/engine/src/value_input_commands.rs create mode 100644 crates/engine/tests/annotations.rs create mode 100644 crates/engine/tests/atomics.rs create mode 100644 crates/engine/tests/function_graph.rs create mode 100644 crates/engine/tests/graph_interaction.rs create mode 100644 crates/engine/tests/pattern_graph.rs create mode 100644 crates/eval/src/cache.rs create mode 100644 crates/eval/src/cache_key.rs create mode 100644 crates/eval/src/cooked.rs create mode 100644 crates/eval/src/graph_execution.rs create mode 100644 crates/eval/src/node_output.rs create mode 100644 crates/eval/src/node_result.rs create mode 100644 crates/eval/src/node_size.rs create mode 100644 crates/eval/src/options.rs create mode 100644 crates/eval/src/port.rs create mode 100644 crates/eval/src/tests.rs create mode 100644 crates/eval/src/value_input_label.rs create mode 100644 crates/formats/src/depth.rs create mode 100644 crates/formats/src/file.rs create mode 100644 crates/formats/src/format_error.rs create mode 100644 crates/formats/src/guard.rs create mode 100644 crates/formats/src/image.rs rename crates/formats/src/{material.rs => material/archive.rs} (65%) create mode 100644 crates/formats/src/material/image_input.rs create mode 100644 crates/formats/src/material/manifest.rs create mode 100644 crates/formats/src/material/map_entry.rs create mode 100644 crates/formats/src/material/mod.rs create mode 100644 crates/formats/src/material/parameter.rs create mode 100644 crates/formats/src/material/preset_entry.rs delete mode 100644 crates/formats/src/sbs.rs create mode 100644 crates/formats/src/sbs/base_parameters.rs create mode 100644 crates/formats/src/sbs/canvas.rs create mode 100644 crates/formats/src/sbs/connection.rs create mode 100644 crates/formats/src/sbs/constant.rs create mode 100644 crates/formats/src/sbs/embedded.rs create mode 100644 crates/formats/src/sbs/filter_map.rs create mode 100644 crates/formats/src/sbs/function_graph.rs create mode 100644 crates/formats/src/sbs/image_input.rs create mode 100644 crates/formats/src/sbs/input_bridge.rs create mode 100644 crates/formats/src/sbs/mod.rs create mode 100644 crates/formats/src/sbs/node_identifiers.rs create mode 100644 crates/formats/src/sbs/node_parameter.rs create mode 100644 crates/formats/src/sbs/output.rs create mode 100644 crates/formats/src/sbs/parameter_array.rs create mode 100644 crates/formats/src/sbs/pattern_graph.rs create mode 100644 crates/formats/src/sbs/placeholder.rs create mode 100644 crates/formats/src/sbs/read_node.rs create mode 100644 crates/formats/src/sbs/sbs_read.rs create mode 100644 crates/formats/src/sbs/sbs_reader.rs create mode 100644 crates/formats/src/sbs/sbs_value.rs create mode 100644 crates/formats/src/sbs/sbs_writer.rs create mode 100644 crates/formats/src/sbs/standalone_function.rs create mode 100644 crates/formats/src/sbs/tests.rs create mode 100644 crates/formats/src/sbs/type_code.rs create mode 100644 crates/formats/src/sbs/warnings.rs create mode 100644 crates/formats/src/sbs/xml.rs create mode 100644 crates/formats/src/svg.rs create mode 100644 crates/formats/src/tests.rs delete mode 100644 crates/nodes/src/atomic.rs create mode 100644 crates/nodes/src/atomic/bitmap.rs create mode 100644 crates/nodes/src/atomic/blend.rs create mode 100644 crates/nodes/src/atomic/blur.rs create mode 100644 crates/nodes/src/atomic/catalog.rs create mode 100644 crates/nodes/src/atomic/channels_shuffle.rs create mode 100644 crates/nodes/src/atomic/curve.rs create mode 100644 crates/nodes/src/atomic/direction.rs create mode 100644 crates/nodes/src/atomic/directional_blur.rs create mode 100644 crates/nodes/src/atomic/directional_warp.rs create mode 100644 crates/nodes/src/atomic/distance.rs create mode 100644 crates/nodes/src/atomic/dot.rs create mode 100644 crates/nodes/src/atomic/emboss.rs create mode 100644 crates/nodes/src/atomic/gradient_dynamic.rs create mode 100644 crates/nodes/src/atomic/gradient_map.rs create mode 100644 crates/nodes/src/atomic/grayscale_conversion.rs create mode 100644 crates/nodes/src/atomic/hsl.rs create mode 100644 crates/nodes/src/atomic/input_color.rs create mode 100644 crates/nodes/src/atomic/input_grayscale.rs create mode 100644 crates/nodes/src/atomic/input_value.rs create mode 100644 crates/nodes/src/atomic/levels.rs create mode 100644 crates/nodes/src/atomic/mod.rs create mode 100644 crates/nodes/src/atomic/motion_blur.rs create mode 100644 crates/nodes/src/atomic/normal.rs create mode 100644 crates/nodes/src/atomic/output.rs create mode 100644 crates/nodes/src/atomic/pattern_map.rs create mode 100644 crates/nodes/src/atomic/pixel_processor.rs create mode 100644 crates/nodes/src/atomic/sharpen.rs create mode 100644 crates/nodes/src/atomic/svg.rs rename crates/nodes/src/{ => atomic}/text.rs (51%) create mode 100644 crates/nodes/src/atomic/transformation.rs create mode 100644 crates/nodes/src/atomic/uniform.rs create mode 100644 crates/nodes/src/atomic/value_processor.rs create mode 100644 crates/nodes/src/atomic/warp.rs create mode 100644 crates/nodes/src/cook_context.rs delete mode 100644 crates/nodes/src/filters.rs delete mode 100644 crates/nodes/src/filters_extra.rs delete mode 100644 crates/nodes/src/filters_more.rs delete mode 100644 crates/nodes/src/flood_fill.rs delete mode 100644 crates/nodes/src/function.rs create mode 100644 crates/nodes/src/function/arithmetic.rs create mode 100644 crates/nodes/src/function/catalog.rs create mode 100644 crates/nodes/src/function/compile.rs create mode 100644 crates/nodes/src/function/evaluation_context.rs create mode 100644 crates/nodes/src/function/evaluation_state.rs create mode 100644 crates/nodes/src/function/evaluation_step.rs create mode 100644 crates/nodes/src/function/function_definition.rs create mode 100644 crates/nodes/src/function/inferred_type.rs create mode 100644 crates/nodes/src/function/instruction.rs create mode 100644 crates/nodes/src/function/mod.rs create mode 100644 crates/nodes/src/function/node_types.rs create mode 100644 crates/nodes/src/function/operation.rs create mode 100644 crates/nodes/src/function/processor.rs create mode 100644 crates/nodes/src/function/program.rs create mode 100644 crates/nodes/src/function/tests.rs create mode 100644 crates/nodes/src/function/value_type.rs create mode 100644 crates/nodes/src/function/vector.rs delete mode 100644 crates/nodes/src/fx_map.rs delete mode 100644 crates/nodes/src/generators.rs create mode 100644 crates/nodes/src/image_input.rs delete mode 100644 crates/nodes/src/material.rs delete mode 100644 crates/nodes/src/material_more.rs create mode 100644 crates/nodes/src/node_definition.rs create mode 100644 crates/nodes/src/node_definition_builder.rs delete mode 100644 crates/nodes/src/noise.rs delete mode 100644 crates/nodes/src/noise3d.rs delete mode 100644 crates/nodes/src/noises_more.rs create mode 100644 crates/nodes/src/output_value_type.rs create mode 100644 crates/nodes/src/parameter.rs create mode 100644 crates/nodes/src/parameter_definition.rs create mode 100644 crates/nodes/src/pattern/catalog.rs create mode 100644 crates/nodes/src/pattern/evaluation.rs create mode 100644 crates/nodes/src/pattern/mod.rs create mode 100644 crates/nodes/src/pattern/pattern_stamp.rs create mode 100644 crates/nodes/src/pattern/pattern_visit.rs create mode 100644 crates/nodes/src/pattern/raster.rs create mode 100644 crates/nodes/src/pattern/shape.rs create mode 100644 crates/nodes/src/pattern/tests.rs delete mode 100644 crates/nodes/src/patterns.rs delete mode 100644 crates/nodes/src/patterns_more.rs create mode 100644 crates/nodes/src/port_definition.rs create mode 100644 crates/nodes/src/port_kind.rs create mode 100644 crates/nodes/src/random.rs create mode 100644 crates/nodes/src/raster/capsule_raster.rs create mode 100644 crates/nodes/src/raster/capsule_segment.rs create mode 100644 crates/nodes/src/raster/composite.rs create mode 100644 crates/nodes/src/raster/mod.rs delete mode 100644 crates/nodes/src/svg.rs create mode 100644 crates/nodes/src/tests.rs delete mode 100644 crates/nodes/src/weathering.rs create mode 100644 crates/ui-egui/src/annotation/comment_properties.rs create mode 100644 crates/ui-egui/src/annotation/frame_properties.rs create mode 100644 crates/ui-egui/src/annotation/mod.rs create mode 100644 crates/ui-egui/src/explorer/tree_row.rs create mode 100644 crates/ui-egui/src/function/canvas.rs create mode 100644 crates/ui-egui/src/function/context_menu.rs create mode 100644 crates/ui-egui/src/function/function_drag.rs create mode 100644 crates/ui-egui/src/function/function_editor.rs create mode 100644 crates/ui-egui/src/function/function_target.rs create mode 100644 crates/ui-egui/src/function/library.rs create mode 100644 crates/ui-egui/src/function/mod.rs create mode 100644 crates/ui-egui/src/function/port_label.rs create mode 100644 crates/ui-egui/src/function/properties.rs create mode 100644 crates/ui-egui/src/function/selection.rs delete mode 100644 crates/ui-egui/src/function_editor.rs create mode 100644 crates/ui-egui/src/graph/actions.rs create mode 100644 crates/ui-egui/src/graph/add_node_menu.rs create mode 100644 crates/ui-egui/src/graph/annotation_canvas.rs create mode 100644 crates/ui-egui/src/graph/annotation_input.rs rename crates/ui-egui/src/{graph_view.rs => graph/canvas.rs} (63%) create mode 100644 crates/ui-egui/src/graph/context_menu.rs create mode 100644 crates/ui-egui/src/graph/frame_hit.rs create mode 100644 crates/ui-egui/src/graph/frames.rs create mode 100644 crates/ui-egui/src/graph/graph_camera.rs create mode 100644 crates/ui-egui/src/graph/graph_drag.rs create mode 100644 crates/ui-egui/src/graph/graph_view.rs create mode 100644 crates/ui-egui/src/graph/input_visibility.rs create mode 100644 crates/ui-egui/src/graph/interaction_tests.rs create mode 100644 crates/ui-egui/src/graph/library_drag.rs create mode 100644 crates/ui-egui/src/graph/mod.rs create mode 100644 crates/ui-egui/src/graph/node_card.rs create mode 100644 crates/ui-egui/src/graph/node_layout.rs create mode 100644 crates/ui-egui/src/graph/node_search.rs create mode 100644 crates/ui-egui/src/graph/node_selection.rs create mode 100644 crates/ui-egui/src/graph/port_hit.rs create mode 100644 crates/ui-egui/src/graph/port_label.rs create mode 100644 crates/ui-egui/src/material_craft_app.rs create mode 100644 crates/ui-egui/src/menu_item.rs create mode 100644 crates/ui-egui/src/pattern/actions.rs create mode 100644 crates/ui-egui/src/pattern/canvas.rs create mode 100644 crates/ui-egui/src/pattern/context_menu.rs create mode 100644 crates/ui-egui/src/pattern/geometry.rs create mode 100644 crates/ui-egui/src/pattern/input.rs create mode 100644 crates/ui-egui/src/pattern/library.rs create mode 100644 crates/ui-egui/src/pattern/mod.rs create mode 100644 crates/ui-egui/src/pattern/node_canvas.rs create mode 100644 crates/ui-egui/src/pattern/parameter_value.rs create mode 100644 crates/ui-egui/src/pattern/pattern_drag.rs create mode 100644 crates/ui-egui/src/pattern/pattern_editor.rs create mode 100644 crates/ui-egui/src/pattern/properties.rs create mode 100644 crates/ui-egui/src/pattern/selection.rs delete mode 100644 crates/ui-egui/src/state.rs create mode 100644 crates/ui-egui/src/state/graph_camera.rs create mode 100644 crates/ui-egui/src/state/image_camera.rs create mode 100644 crates/ui-egui/src/state/mod.rs create mode 100644 crates/ui-egui/src/state/prefs.rs create mode 100644 crates/ui-egui/src/state/ui_state.rs create mode 100644 crates/ui-egui/src/state/windows.rs create mode 100644 crates/ui-egui/src/toast.rs create mode 100644 crates/ui-egui/src/user_directory.rs create mode 100644 crates/ui-egui/src/value_editor.rs create mode 100644 crates/ui-egui/src/value_input_editor.rs create mode 100644 docs/atomic-workflow.md create mode 100644 examples/atomic_sample.sbs diff --git a/AGENTS.md b/AGENTS.md index 19ce8f5..812eeef 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -11,8 +11,7 @@ The product name is always written **MaterialCraft** (`{Function}Craft` in Pasca siblings PhotoCraft, VectorCraft, FilmCraft, LightCraft, PdfCraft, EffectCraft, DesignCraft, TextureCraft) in user-facing text: UI, window titles, About, installers, release names, docs prose. Machine names stay lowercase: crates (`materialcraft-*`), binaries, file names, ids -(`ai.storyteller.materialcraft`). The main project format is SBS (`.sbs`); the older native -package extension `.mcraft` is still read and written. +(`ai.storyteller.materialcraft`). The project format is SBS (`.sbs`). Legacy package compatibility is not required. Standards and learnings shared across the crafting apps live in `../craftrules` (checked out next to this repo, or `storytold/craftrules`). Read its `AGENTS.md` at the start of a session, follow its @@ -41,8 +40,8 @@ file first, then `docs/`. ```text crates/ core image geom L0 document model (package, graphs, nodes, values, function graphs); float images; meshes, BVH, camera - nodes L1 the node library: definitions + CPU cooks (atomic nodes, noises, patterns, filters, PBR utilities, function evaluator) - eval formats L2 graph cooking (topological order, sizes, content-addressed cache, sub-graphs); .sbs and .mcraft packages, bitmaps, texture export + nodes L1 the node library: native primitive definitions + CPU cooks, function evaluator and pattern graphs + eval formats L2 graph cooking (topological order, sizes, content-addressed cache, sub-graphs); native .sbs packages, bitmaps, texture export engine render L3 Session + command registry (every action is a command), inspect, samples; the 3D preview renderer (CPU PBR + IBL) automation L4 MCP server + headless JSON-lines RPC + bridge to the running app ui-egui L5 egui shell (thin: every edit goes through engine commands) @@ -98,7 +97,7 @@ and simplex gradient noise, Worley/cellular noise, fractal sums, Gaussian and bo Felzenszwalb–Huttenlocher distance transforms, Sobel/central-difference normals, reoriented normal mapping, HSL, levels, monotone cubic curves, W3C blend modes, GGX/Smith/Schlick PBR, split-sum IBL, ACES fitted tone mapping). Never copy proprietary code, shaders, node implementations or presets. -SBS packages are the main project format (issue #49): `crates/formats/src/sbs.rs` reads and writes +SBS packages are the main project format (issue #49): `crates/formats/src/sbs/` reads and writes them with MaterialCraft's own code, written from the format's public documentation and sample files, never from another implementation. Always describe MaterialCraft as a clean-room implementation, in code, docs and commits. diff --git a/ATTRIBUTION.md b/ATTRIBUTION.md index 80e577f..631c6cf 100644 --- a/ATTRIBUTION.md +++ b/ATTRIBUTION.md @@ -31,7 +31,8 @@ images, materials, sample graphs, presets, environments) may ever be added. | `docs/images/materialcraft-materials.png` | README render: eight sample materials on spheres | MaterialCraft contributors | `materialcraft-cli render --scene sphere --full --hq` of the templates, eight renders in a grid | MIT OR Apache-2.0 | | `docs/images/materialcraft-levels-editor.png` | Docs screenshot: the Levels editor with the input histogram | MaterialCraft contributors | Offscreen render of MaterialCraft's UI (`crates/ui-egui/tests/snapshot.rs`) | MIT OR Apache-2.0 | | `docs/brand/artcraft-*.svg`, `docs/brand/artcraft-*.png` | ArtCraft logo and mark | ArtCraft Team | storytold/craftrules `assets/brand/` | ArtCraft brand terms, not open source ([`docs/brand/LICENSE-brand.txt`](docs/brand/LICENSE-brand.txt)) | -| `crates/nodes/src/text.rs` (`GLYPHS`) | Single-stroke vector font of the Text node (A–Z, a–z, 0–9, punctuation) | MaterialCraft contributors | Original, designed as stroke data in code | MIT OR Apache-2.0 | +| `crates/nodes/src/atomic/text.rs` (`GLYPHS`) | Single-stroke vector font of the Text node (A–Z, a–z, 0–9, punctuation) | MaterialCraft contributors | Original, designed as stroke data in code | MIT OR Apache-2.0 | +| `examples/atomic_sample.sbs` | Atomic sample graph | MaterialCraft contributors | Original graph built by `crates/engine/src/atomic_sample.rs` | MIT OR Apache-2.0 | ## Third-party assets compiled into the binary @@ -44,10 +45,10 @@ These come from Rust crate dependencies (not files in this repository) and keep ## Procedural content (no asset files) -The node library's noises and patterns (`crates/nodes`), the sample materials and graph templates +The node library's primitives (`crates/nodes`), the sample materials and graph templates (`crates/engine/src/samples.rs`), the 3D view's environments (`crates/render/src/ibl.rs`, procedural HDR skies and soft boxes), the built-in meshes (`crates/geom/src/primitives.rs`), the library's node -previews (`crates/ui-egui/src/thumbs.rs`, each node cooked on sample noise) and the New graph +previews (`crates/ui-egui/src/thumbs.rs`, each node cooked on sample waves) and the New graph dialog's template spheres (`crates/ui-egui/src/windows.rs`) are generated in code by MaterialCraft contributors (MIT OR Apache-2.0). None of them is derived from another product's presets, shaders, materials, sample graphs or images. diff --git a/Cargo.lock b/Cargo.lock index be56391..f6d7264 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -214,6 +214,12 @@ dependencies = [ "x11rb", ] +[[package]] +name = "arrayref" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76a2e8124351fda1ef8aaaa3bbd7ebbcb486bbcd4225aca0aa0d84bb2db8fecb" + [[package]] name = "arrayvec" version = "0.7.8" @@ -875,6 +881,12 @@ dependencies = [ "syn 3.0.9", ] +[[package]] +name = "data-url" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be1e0bca6c3637f992fc1cc7cbc52a78c1ef6db076dbf1059c4323d6a2048376" + [[package]] name = "derive_arbitrary" version = "1.5.0" @@ -1327,6 +1339,12 @@ dependencies = [ "zlib-rs", ] +[[package]] +name = "float-cmp" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4" + [[package]] name = "foldhash" version = "0.1.5" @@ -2013,6 +2031,12 @@ dependencies = [ "quick-error", ] +[[package]] +name = "imagesize" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09e54e57b4c48b40f7aec75635392b12b3421fa26fe8b4332e63138ed278459c" + [[package]] name = "indexmap" version = "2.14.2" @@ -2398,7 +2422,8 @@ dependencies = [ "materialcraft-geom", "materialcraft-image", "materialcraft-nodes", - "roxmltree", + "resvg", + "roxmltree 0.20.0", "serde", "serde_json", "thiserror 2.0.21", @@ -3167,6 +3192,12 @@ dependencies = [ "siphasher", ] +[[package]] +name = "pico-args" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315" + [[package]] name = "pin-project" version = "1.1.13" @@ -3518,6 +3549,20 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "19b30a45b0cd0bcca8037f3d0dc3421eaf95327a17cad11964fb8179b4fc4832" +[[package]] +name = "resvg" +version = "0.47.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9be183ad6a216aa96f33e4c8033b0988b8b3ea6fd2359d19af5bac4643fd8e81" +dependencies = [ + "log", + "pico-args", + "rgb", + "svgtypes", + "tiny-skia", + "usvg", +] + [[package]] name = "rfd" version = "0.17.2" @@ -3545,6 +3590,15 @@ dependencies = [ "windows-sys 0.61.2", ] +[[package]] +name = "rgb" +version = "0.8.53" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47b34b781b31e5d73e9fbc8689c70551fd1ade9a19e3e28cfec8580a79290cc4" +dependencies = [ + "bytemuck", +] + [[package]] name = "rmcp" version = "3.8.0" @@ -3601,6 +3655,15 @@ version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c20b6793b5c2fa6553b250154b78d6d0db37e72700ae35fad9387a46f487c97" +[[package]] +name = "roxmltree" +version = "0.21.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9da7f59328b09405b181fee1018925fad50f157afb43c0c0f5c522c256dd5907" +dependencies = [ + "memchr", +] + [[package]] name = "rustc-hash" version = "1.1.0" @@ -3841,6 +3904,15 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3a9fe34e3e7a50316060351f37187a3f546bce95496156754b601a5fa71b76e" +[[package]] +name = "simplecss" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a9c6883ca9c3c7c90e888de77b7a5c849c779d25d74a1269b0218b14e8b136c" +dependencies = [ + "log", +] + [[package]] name = "siphasher" version = "1.0.4" @@ -3946,12 +4018,31 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" +[[package]] +name = "strict-num" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6637bab7722d379c8b41ba849228d680cc12d0a45ba1fa2b48f2a30577a06731" +dependencies = [ + "float-cmp", +] + [[package]] name = "strsim" version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" +[[package]] +name = "svgtypes" +version = "0.16.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f12b12995e3638c70618c1facb1ce65302f6a6f706b675f07c58a5d7391120e" +dependencies = [ + "kurbo", + "siphasher", +] + [[package]] name = "syn" version = "2.0.119" @@ -4073,6 +4164,32 @@ dependencies = [ "zune-jpeg", ] +[[package]] +name = "tiny-skia" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47ffee5eaaf5527f630fb0e356b90ebdec84d5d18d937c5e440350f88c5a91ea" +dependencies = [ + "arrayref", + "arrayvec", + "bytemuck", + "cfg-if", + "log", + "png", + "tiny-skia-path", +] + +[[package]] +name = "tiny-skia-path" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edca365c3faccca67d06593c5980fa6c57687de727a03131735bb85f01fdeeb9" +dependencies = [ + "arrayref", + "bytemuck", + "strict-num", +] + [[package]] name = "tinystr" version = "0.8.5" @@ -4302,6 +4419,28 @@ version = "2.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" +[[package]] +name = "usvg" +version = "0.47.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d46cf96c5f498d36b7a9693bc6a7075c0bb9303189d61b2249b0dc3d309c07de" +dependencies = [ + "base64 0.22.1", + "data-url", + "flate2", + "imagesize", + "kurbo", + "log", + "pico-args", + "roxmltree 0.21.2", + "simplecss", + "siphasher", + "strict-num", + "svgtypes", + "tiny-skia-path", + "xmlwriter", +] + [[package]] name = "utf16_iter" version = "1.1.0" @@ -5245,6 +5384,12 @@ version = "0.8.29" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e450f9b2ed1dff33c94c12589a87338689467b9c4f5d8a5710bd09a847d2c8a7" +[[package]] +name = "xmlwriter" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec7a2a501ed189703dba8b08142f057e887dfc4b2cc4db2d343ac6376ba3e0b9" + [[package]] name = "xtask" version = "0.1.2" diff --git a/Cargo.toml b/Cargo.toml index 0cca8f8..7761605 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -42,6 +42,7 @@ rust-version = "1.95" repository = "https://github.com/storytold/materialcraft" [workspace.dependencies] +resvg = { version = "0.47", default-features = false } # internal materialcraft-core = { path = "crates/core" } materialcraft-image = { path = "crates/image" } diff --git a/README.md b/README.md index 6c2f537..be0fae1 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@

- Build tileable PBR materials from noises, patterns and filters in a node graph, watch them + Build procedural materials from primitives and functions in a node graph, watch them update live in 2D and on a 3D model, and export the maps for any engine. It runs natively on macOS, Windows, Linux and FreeBSD, and in the browser via WebAssembly. Built by the ArtCraft team.

@@ -67,6 +67,9 @@ ## A look around +These screenshots show the earlier procedural library. The current build uses the primitive +catalog described in [the primitive workflow](docs/atomic-workflow.md). +
@@ -92,7 +95,8 @@ ## Made in MaterialCraft -Every material below is a node graph that ships with MaterialCraft as a template, built only from +These historical renders used the former Rust library and are no longer bundled as templates. +They were built from its own procedural nodes (no photos, scans or textures from anywhere else) and rendered by `materialcraft-cli render --scene sphere --full --hq` (the height output displaces the mesh, with ray-traced ambient occlusion and a shadowed key light). @@ -110,12 +114,12 @@ ray-traced ambient occlusion and a shadowed key light). histogram of its input, see [docs/levels-editor.md](docs/levels-editor.md)). Space opens the node search. - **Fast.** Every node cooks on every CPU core, and a content-addressed cache means an edit - re-cooks only what lies downstream: the brick wall sample cooks in about 40 ms at preview size. + re-cooks only what lies downstream. Cooking runs on a worker thread, so the UI never waits. - **Tileable by design.** Noises and patterns live on whole-number lattices, so everything tiles seamlessly at any resolution, from 16 px to 8K. - **Robust.** No panics in shipped code, every command tested with hostile input, every node cooked - with odd inputs in tests, unlimited undo from snapshots, and lossless project files. + with odd inputs in tests, undo from snapshots, and native SBS project files. - **Open.** Export base color, normal, roughness, metallic, height and ambient occlusion as PNG, JPEG, TGA, TIFF, BMP, WEBP, EXR or HDR at 8, 16 or 32 bits, with your own file name pattern. - **Works with TextureCraft.** **File ▸ Send to TextureCraft** puts a material on TextureCraft's @@ -134,7 +138,7 @@ git clone https://github.com/storytold/materialcraft cd materialcraft cargo run --release -p materialcraft # desktop app -cargo run --release -p materialcraft -- package.sbs # open a package (.sbs or .mcraft) +cargo run --release -p materialcraft -- package.sbs # open an SBS package cargo run --release -p materialcraft -- --control 7878 # + JSON control channel cargo run --release -p materialcraft-cli -- mcp # MCP server (stdio) cargo run --release -p materialcraft-cli -- new wood wood.sbs @@ -170,21 +174,12 @@ The details are in [`docs/control-protocol.md`](docs/control-protocol.md). MaterialCraft is under active development. [**ROADMAP.md**](ROADMAP.md) has the parity estimate by area, the remaining work and what's next. -**Where we are (2026-11-02):** the node engine and 227 nodes (the atomic nodes including FX-Map, -SVG and Text, noises including tileable 3D ones, patterns, filters, the flood fill family, -whole-material blending and weathering), function graphs with a visual editor and dynamic -parameters, sub-graphs with exposed inputs and presets, the full editor (graph, library, -properties, 2D view with histogram, 3D view with your own OBJ/glTF meshes, alpha transparency and an -alpha channel view; wires you can select, delete, swap (X) and reroute with dots, see -[docs/wires-and-alpha.md](docs/wires-and-alpha.md)), SBS project files (`.mcraft` too), -texture export, portable `.mcmat` materials that TextureCraft paints with (inputs stay editable -there), the browser build with file I/O, the CLI, the control channel and the MCP server -all work today. We estimate about two thirds (≈ 67%) of a material artist's daily workflow works -end to end; [docs/target-app-parity.md](docs/target-app-parity.md) has the breakdown. +**Current focus (2026-11-05):** primitive editing and native SBS save/load. The old Rust +procedural library has been removed. The replacement includes 30 main-graph entries, 85 function +operations and three pattern node kinds. Start with **File → New → Atomic sample**. -**What's missing:** the rest of the node library, a GPU 3D view with tessellation and lights, -mesh-based nodes, translations and the first signed release. The ranked list is in -[`docs/gaps.md`](docs/gaps.md). +See [the primitive workflow](docs/atomic-workflow.md) for usage, validation scope and limitations. +Reference-app rendering parity and full SBS library loading are still pending. **Workspace:** `crates/{core, image, geom, nodes, eval, formats, engine, render, automation, ui-egui}` and `apps/{materialcraft, materialcraft-cli, materialcraft-web}`. The egui frontend is its own diff --git a/ROADMAP.md b/ROADMAP.md index 9a58e92..0e97d7b 100644 --- a/ROADMAP.md +++ b/ROADMAP.md @@ -1,46 +1,20 @@ # MaterialCraft roadmap -> **Last reviewed:** 2026-11-02 · **Last updated:** 2026-11-02 · **Change:** minor (≈ 67%: portable materials for TextureCraft) · **Target:** the professional node-based material workflow +**Current focus (2026-11-05):** native primitive editing, evaluation and SBS save/load. -**Stage:** alpha (in active development). MaterialCraft aims for full parity with the professional -node-based procedural material workflow, with better performance, every feature drivable by agents -(MCP, CLI, control channel), and builds for Windows, macOS, Linux, FreeBSD and the web. +The old Rust procedural library has been removed. The main catalog has 30 entries: 26 native +primitives and four graph input/output items. Functions have 85 operations; pattern graphs have +Quadrant, Switch, Iterate and Dot. See [the primitive workflow](docs/atomic-workflow.md) for usage and limits. -## Headline numbers +Earlier percentage estimates and node counts are superseded by this change. Reference-app +rendering parity and arbitrary SBS round trips have not been established. -- **Parity: ≈ 67%** of a material artist's daily workflow works end to end - ([docs/target-app-parity.md](docs/target-app-parity.md)). -- **Remaining: ≈ 83 Opus 5.5 agent hours** ([docs/roadmap.md](docs/roadmap.md)). -- **Nodes:** 227 (all tileable), cooked on every CPU core through a content-addressed cache; the - brick wall sample cooks in about 40 ms at preview size. +## Next steps -## By area - -| Area | Weight | Done | -|---|---:|---:| -| Graph editing | 15 | 75% | -| Atomic nodes | 12 | 95% | -| Node library | 20 | 45% | -| Function graphs | 10 | 70% | -| Graph parameters and instances | 8 | 70% | -| 2D view | 5 | 80% | -| 3D view | 10 | 55% | -| Files | 8 | 70% | -| UI and UX | 8 | 70% | -| Platforms | 4 | 50% | -| **Total** | **100** | **≈ 67%** | - -## What's next - -1. The rest of the node library: scan processing, more grunges, spline tools, SDF shapes. -2. A GPU 3D view with tessellation and lights. -3. Mesh-based generators and bakers. -4. Function loops and reusable functions. -5. The first release on every platform. - -The ranked work list is [docs/gaps.md](docs/gaps.md); file formats are in -[docs/file-format-parity.md](docs/file-format-parity.md) and languages in -[docs/localization-parity.md](docs/localization-parity.md). +1. Verify the original atomic sample in the reference application +2. Compare primitive outputs and parameter semantics against reference results +3. Add SBS graph references with cycle-safe resolution +4. Build the library from SBS definitions instead of duplicate Rust nodes ## Progress log diff --git a/apps/materialcraft-cli/src/main.rs b/apps/materialcraft-cli/src/main.rs index 261ce77..04d93e1 100644 --- a/apps/materialcraft-cli/src/main.rs +++ b/apps/materialcraft-cli/src/main.rs @@ -1,12 +1,11 @@ -//! Headless MaterialCraft command line: inspect, script, cook, export and render packages, and -//! serve agents over MCP or JSON lines. Never opens a window. +//! Headless MaterialCraft command line: inspect, script, cook, export and render packages, and serve agents over MCP or JSON lines. Never opens a window #![forbid(unsafe_code)] #![deny(clippy::unwrap_used, clippy::expect_used, clippy::panic, clippy::unimplemented, clippy::todo, clippy::unreachable)] use std::sync::{Arc, Mutex}; use materialcraft_automation::security::{client_token, server_token}; -use materialcraft_automation::{AuthorizedWorkspace, BridgeClient, Filesystem, Headless, MaterialcraftMcp, RenderOptions, rpc}; +use materialcraft_automation::{AuthorizedWorkspace, BridgeClient, Filesystem, Headless, MaterialCraftMcp, RenderOptions, rpc}; use serde_json::{Value, json}; const USAGE: &str = "\ @@ -14,7 +13,7 @@ materialcraft-cli: headless MaterialCraft USAGE: materialcraft-cli --version - materialcraft-cli info + materialcraft-cli info Graphs, nodes, outputs and cook results, as JSON. materialcraft-cli commands [--filter ] List the engine commands (id, label, params). @@ -25,8 +24,7 @@ USAGE: materialcraft-cli batch Run [{\"id\", \"params\"}, ...] or {\"open\": , \"steps\": [...], \"save\": }. materialcraft-cli new