Add merging nodes into a subgraph with Ctrl+M and basic subgraph signature customization #2097
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
adamgerhant
force-pushed
the
user-created-nodes
branch
from
9297b83 to
3bfc82a
Compare
Keavon
force-pushed
the
user-created-nodes
branch
from
8b65941 to
4828171
Compare
0HyperCube
approved these changes
Nov 10, 2024
| @@ -64,6 +64,23 @@ static DOCUMENT_NODE_TYPES: once_cell::sync::Lazy<Vec<DocumentNodeDefinition>> = | |||
| /// The [`DocumentNode`] is the instance while these [`DocumentNodeDefinition`]s are the "classes" or "blueprints" from which the instances are built. | |||
| fn static_nodes() -> Vec<DocumentNodeDefinition> { | |||
| let mut custom = vec![ | |||
| // TODO: Auto-generate this from its proto node macro | |||
There was a problem hiding this comment.
There are no protonodes here?
There was a problem hiding this comment.
Yes, that should be deleted, as well as all other comments for network implementation node definitions.
| @@ -345,6 +349,171 @@ impl<'a> MessageHandler<NodeGraphMessage, NodeGraphHandlerData<'a>> for NodeGrap | |||
| } => { | |||
| network_interface.insert_node_between(&node_id, &input_connector, insert_node_input_index, selection_network_path); | |||
| } | |||
| NodeGraphMessage::MergeSelectedNodes => { | |||
There was a problem hiding this comment.
Would it be easier to understand if you split this into separate functions?
e.g:
- checking if the nodes are discontinuous in a line of dependencies
- Collecting the existing inputs and exports (and targets)
- Crafting the new node and reconnecting.
| let bounding_box_top_right = DVec2::new((all_nodes_bounding_box[1].x / 24. + 0.5).floor() * 24., (all_nodes_bounding_box[0].y / 24. + 0.5).floor() * 24.) + offset_from_top_right; | ||
| let export_top_right = DVec2::new(viewport_top_right.x.max(bounding_box_top_right.x), viewport_top_right.y.min(bounding_box_top_right.y)); | ||
| let add_export_center = export_top_right + DVec2::new(0., network.exports.len() as f64 * 24.); | ||
| let add_export = ClickTarget::new(Subpath::new_ellipse(add_export_center - DVec2::new(8., 8.), add_export_center + DVec2::new(8., 8.)), 0.); |
There was a problem hiding this comment.
Would it be possible to avoid hardcoding the size & shape of the buttons here as well as in the frontend?
There was a problem hiding this comment.
The frontend button in the UI is purely visual. The click targets are currently incorrect, since they are spherical while the button is a rounded square. I also need to add it to the alt+C debug overlay. But they do need to be hardcoded in Rust.
Keavon
force-pushed
the
user-created-nodes
branch
from
4828171 to
d96e57f
Compare
Keavon
changed the title
5 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Closes #2043, closes #2099
Adds UI elements in order to access the various functions provided by the network interface to add/remove/rename exports.
Adds a "Merge Selected Nodes" macro to automatically group a set of nodes into a subnetwork.