From d8973ec8da5996fdb3d53bfd90145f4ea3735c9b Mon Sep 17 00:00:00 2001 From: adamgerhant <116332429+adamgerhant@users.noreply.github.com> Date: Sat, 15 Jun 2024 15:16:12 -0700 Subject: [PATCH] Fix Poisson-Disk Points node transform of input shape (#1784) Fix poisson-disk, node gap spacing --- .../document/graph_operation/utility_types.rs | 20 +++++++++---------- .../messages/tool/tool_messages/brush_tool.rs | 2 +- node-graph/gcore/src/vector/vector_nodes.rs | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/editor/src/messages/portfolio/document/graph_operation/utility_types.rs b/editor/src/messages/portfolio/document/graph_operation/utility_types.rs index 0c68ad92..9c4df664 100644 --- a/editor/src/messages/portfolio/document/graph_operation/utility_types.rs +++ b/editor/src/messages/portfolio/document/graph_operation/utility_types.rs @@ -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_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()); - 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()); - 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()); - 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); } @@ -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_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()); - 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()); - 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()); - 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); } @@ -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_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()); - 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); } diff --git a/editor/src/messages/tool/tool_messages/brush_tool.rs b/editor/src/messages/tool/tool_messages/brush_tool.rs index 19484d37..7b69b7a9 100644 --- a/editor/src/messages/tool/tool_messages/brush_tool.rs +++ b/editor/src/messages/tool/tool_messages/brush_tool.rs @@ -415,7 +415,7 @@ fn new_brush_layer(document: &DocumentMessageHandler, responses: &mut VecDeque()) { - result.point_domain.push(PointId::generate(), vector_data.transform.inverse().transform_point2(point)); + result.point_domain.push(PointId::generate(), point); } }