jess
/
Graphite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix Poisson-Disk Points node transform of input shape (#1784) 

Fix poisson-disk, node gap spacing
This commit is contained in:
adamgerhant 2024-06-15 15:16:12 -07:00 committed by GitHub
parent 02360c7bc8
commit d8973ec8da
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
editor/src/messages/portfolio/document/graph_operation/utility_types.rs
View File

@ -324,13 +324,13 @@ impl<'a> ModifyInputsContext<'a> {
let stroke = resolve_document_node_type("Stroke").expect("Stroke node does not exist").default_document_node(); let stroke = resolve_document_node_type("Stroke").expect("Stroke node does not exist").default_document_node();
let stroke_id = NodeId(generate_uuid()); let stroke_id = NodeId(generate_uuid());
ModifyInputsContext::insert_node_before(self.node_graph, self.document_network, stroke_id, layer, 1, stroke, IVec2::new(-8, 0)); ModifyInputsContext::insert_node_before(self.node_graph, self.document_network, stroke_id, layer, 1, stroke, IVec2::new(-7, 0));
let fill_id = NodeId(generate_uuid()); let fill_id = NodeId(generate_uuid());
ModifyInputsContext::insert_node_before(self.node_graph, self.document_network, fill_id, stroke_id, 0, fill, IVec2::new(-8, 0)); ModifyInputsContext::insert_node_before(self.node_graph, self.document_network, fill_id, stroke_id, 0, fill, IVec2::new(-6, 0));
let transform_id = NodeId(generate_uuid()); let transform_id = NodeId(generate_uuid());
ModifyInputsContext::insert_node_before(self.node_graph, self.document_network, transform_id, fill_id, 0, transform, IVec2::new(-8, 0)); ModifyInputsContext::insert_node_before(self.node_graph, self.document_network, transform_id, fill_id, 0, transform, IVec2::new(-6, 0));
let shape_id = NodeId(generate_uuid()); let shape_id = NodeId(generate_uuid());
ModifyInputsContext::insert_node_before(self.node_graph, self.document_network, shape_id, transform_id, 0, shape, IVec2::new(-8, 0)); ModifyInputsContext::insert_node_before(self.node_graph, self.document_network, shape_id, transform_id, 0, shape, IVec2::new(-6, 0));
self.responses.add(NodeGraphMessage::RunDocumentGraph); self.responses.add(NodeGraphMessage::RunDocumentGraph);
} }
@ -349,13 +349,13 @@ impl<'a> ModifyInputsContext<'a> {
let stroke = resolve_document_node_type("Stroke").expect("Stroke node does not exist").default_document_node(); let stroke = resolve_document_node_type("Stroke").expect("Stroke node does not exist").default_document_node();
let stroke_id = NodeId(generate_uuid()); let stroke_id = NodeId(generate_uuid());
ModifyInputsContext::insert_node_before(self.node_graph, self.document_network, stroke_id, layer, 1, stroke, IVec2::new(-8, 0)); ModifyInputsContext::insert_node_before(self.node_graph, self.document_network, stroke_id, layer, 1, stroke, IVec2::new(-7, 0));
let fill_id = NodeId(generate_uuid()); let fill_id = NodeId(generate_uuid());
ModifyInputsContext::insert_node_before(self.node_graph, self.document_network, fill_id, stroke_id, 0, fill, IVec2::new(-8, 0)); ModifyInputsContext::insert_node_before(self.node_graph, self.document_network, fill_id, stroke_id, 0, fill, IVec2::new(-6, 0));
let transform_id = NodeId(generate_uuid()); let transform_id = NodeId(generate_uuid());
ModifyInputsContext::insert_node_before(self.node_graph, self.document_network, transform_id, fill_id, 0, transform, IVec2::new(-8, 0)); ModifyInputsContext::insert_node_before(self.node_graph, self.document_network, transform_id, fill_id, 0, transform, IVec2::new(-6, 0));
let text_id = NodeId(generate_uuid()); let text_id = NodeId(generate_uuid());
ModifyInputsContext::insert_node_before(self.node_graph, self.document_network, text_id, transform_id, 0, text, IVec2::new(-8, 0)); ModifyInputsContext::insert_node_before(self.node_graph, self.document_network, text_id, transform_id, 0, text, IVec2::new(-6, 0));
self.responses.add(NodeGraphMessage::RunDocumentGraph); self.responses.add(NodeGraphMessage::RunDocumentGraph);
} }
@ -367,10 +367,10 @@ impl<'a> ModifyInputsContext<'a> {
let transform = resolve_document_node_type("Transform").expect("Transform node does not exist").default_document_node(); let transform = resolve_document_node_type("Transform").expect("Transform node does not exist").default_document_node();
let transform_id = NodeId(generate_uuid()); let transform_id = NodeId(generate_uuid());
ModifyInputsContext::insert_node_before(node_graph, document_network, transform_id, layer, 1, transform, IVec2::new(-8, 0)); ModifyInputsContext::insert_node_before(node_graph, document_network, transform_id, layer, 1, transform, IVec2::new(-6, 0));
let image_id = NodeId(generate_uuid()); let image_id = NodeId(generate_uuid());
ModifyInputsContext::insert_node_before(node_graph, document_network, image_id, transform_id, 0, image, IVec2::new(-8, 0)); ModifyInputsContext::insert_node_before(node_graph, document_network, image_id, transform_id, 0, image, IVec2::new(-5, 0));
responses.add(NodeGraphMessage::RunDocumentGraph); responses.add(NodeGraphMessage::RunDocumentGraph);
} }

2
editor/src/messages/tool/tool_messages/brush_tool.rs
View File

@ -415,7 +415,7 @@ fn new_brush_layer(document: &DocumentMessageHandler, responses: &mut VecDeque<M
let brush_node = resolve_document_node_type("Brush") let brush_node = resolve_document_node_type("Brush")
.expect("Brush node does not exist") .expect("Brush node does not exist")
.to_document_node_default_inputs([], DocumentNodeMetadata::position((-8, 0))); .to_document_node_default_inputs([], DocumentNodeMetadata::position((-6, 0)));
let id = NodeId(generate_uuid()); let id = NodeId(generate_uuid());
responses.add(GraphOperationMessage::NewCustomLayer { responses.add(GraphOperationMessage::NewCustomLayer {

2
node-graph/gcore/src/vector/vector_nodes.rs
View File

@ -370,7 +370,7 @@ fn poisson_disk_points(vector_data: VectorData, separation_disk_diameter: f64) -
subpath.apply_transform(vector_data.transform); subpath.apply_transform(vector_data.transform);
for point in subpath.poisson_disk_points(separation_disk_diameter, || rng.gen::<f64>()) { for point in subpath.poisson_disk_points(separation_disk_diameter, || rng.gen::<f64>()) {
result.point_domain.push(PointId::generate(), vector_data.transform.inverse().transform_point2(point)); result.point_domain.push(PointId::generate(), point);
} }
} }