Add teardrop and heard shape to the predefined shapes #3998
There are no files selected for viewing
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,162 @@ | ||
| use super::shape_utility::{ShapeToolModifierKey, update_radius_sign}; | ||
| use super::*; | ||
| use crate::messages::portfolio::document::graph_operation::utility_types::TransformIn; | ||
| use crate::messages::portfolio::document::node_graph::document_node_definitions::{DefinitionIdentifier, resolve_document_node_type}; | ||
| use crate::messages::portfolio::document::overlays::utility_types::OverlayContext; | ||
| use crate::messages::portfolio::document::utility_types::document_metadata::LayerNodeIdentifier; | ||
| use crate::messages::portfolio::document::utility_types::network_interface::{InputConnector, NodeTemplate}; | ||
| use crate::messages::tool::common_functionality::gizmos::shape_gizmos::number_of_points_dial::{NumberOfPointsDial, NumberOfPointsDialState}; | ||
| use crate::messages::tool::common_functionality::gizmos::shape_gizmos::point_radius_handle::{PointRadiusHandle, PointRadiusHandleState}; | ||
| use crate::messages::tool::common_functionality::graph_modification_utils; | ||
| use crate::messages::tool::common_functionality::shape_editor::ShapeState; | ||
| use crate::messages::tool::common_functionality::shapes::shape_utility::ShapeGizmoHandler; | ||
| use crate::messages::tool::tool_messages::tool_prelude::*; | ||
| use glam::DAffine2; | ||
| use graph_craft::document::NodeInput; | ||
| use graph_craft::document::value::TaggedValue; | ||
| use std::collections::VecDeque; | ||
|
|
||
| #[derive(Clone, Debug, Default)] | ||
| pub struct HeartGizmoHandler { | ||
| number_of_points_dial: NumberOfPointsDial, | ||
| point_radius_handle: PointRadiusHandle, | ||
|
Comment on lines
+20
to
+22
Contributor
There was a problem hiding this comment. The |
||
| } | ||
|
|
||
| impl ShapeGizmoHandler for HeartGizmoHandler { | ||
| fn is_any_gizmo_hovered(&self) -> bool { | ||
| self.number_of_points_dial.is_hovering() || self.point_radius_handle.hovered() | ||
| } | ||
|
|
||
| fn handle_state(&mut self, selected_heart_layer: LayerNodeIdentifier, mouse_position: DVec2, document: &DocumentMessageHandler, responses: &mut VecDeque<Message>) { | ||
| self.number_of_points_dial.handle_actions(selected_heart_layer, mouse_position, document, responses); | ||
| self.point_radius_handle.handle_actions(selected_heart_layer, document, mouse_position, responses); | ||
| } | ||
|
|
||
| fn handle_click(&mut self) { | ||
| if self.number_of_points_dial.is_hovering() { | ||
| self.number_of_points_dial.update_state(NumberOfPointsDialState::Dragging); | ||
| return; | ||
| } | ||
|
|
||
| if self.point_radius_handle.hovered() { | ||
| self.point_radius_handle.update_state(PointRadiusHandleState::Dragging); | ||
| } | ||
| } | ||
|
|
||
| fn handle_update(&mut self, drag_start: DVec2, document: &DocumentMessageHandler, input: &InputPreprocessorMessageHandler, responses: &mut VecDeque<Message>) { | ||
| if self.number_of_points_dial.is_dragging() { | ||
| self.number_of_points_dial.update_number_of_sides(document, input, responses, drag_start); | ||
| } | ||
|
|
||
| if self.point_radius_handle.is_dragging_or_snapped() { | ||
| self.point_radius_handle.update_inner_radius(document, input, responses, drag_start); | ||
| } | ||
| } | ||
|
|
||
| fn overlays( | ||
| &self, | ||
| document: &DocumentMessageHandler, | ||
| selected_heart_layer: Option<LayerNodeIdentifier>, | ||
| _input: &InputPreprocessorMessageHandler, | ||
| shape_editor: &mut &mut ShapeState, | ||
| mouse_position: DVec2, | ||
| overlay_context: &mut OverlayContext, | ||
| ) { | ||
| self.number_of_points_dial.overlays(document, selected_heart_layer, shape_editor, mouse_position, overlay_context); | ||
| self.point_radius_handle.overlays(selected_heart_layer, document, overlay_context); | ||
| } | ||
|
|
||
| fn dragging_overlays( | ||
| &self, | ||
| document: &DocumentMessageHandler, | ||
| _input: &InputPreprocessorMessageHandler, | ||
| shape_editor: &mut &mut ShapeState, | ||
| mouse_position: DVec2, | ||
| overlay_context: &mut OverlayContext, | ||
| ) { | ||
| if self.number_of_points_dial.is_dragging() { | ||
| self.number_of_points_dial.overlays(document, None, shape_editor, mouse_position, overlay_context); | ||
| } | ||
|
|
||
| if self.point_radius_handle.is_dragging_or_snapped() { | ||
| self.point_radius_handle.overlays(None, document, overlay_context); | ||
| } | ||
| } | ||
|
|
||
| fn cleanup(&mut self) { | ||
| self.number_of_points_dial.cleanup(); | ||
| self.point_radius_handle.cleanup(); | ||
| } | ||
|
|
||
| fn mouse_cursor_icon(&self) -> Option<MouseCursorIcon> { | ||
| if self.number_of_points_dial.is_dragging() || self.number_of_points_dial.is_hovering() { | ||
| return Some(MouseCursorIcon::EWResize); | ||
| } | ||
|
|
||
| if self.point_radius_handle.is_dragging_or_snapped() || self.point_radius_handle.hovered() { | ||
| return Some(MouseCursorIcon::Default); | ||
| } | ||
|
|
||
| None | ||
| } | ||
| } | ||
|
|
||
| #[derive(Default)] | ||
| pub struct Heart; | ||
|
|
||
| impl Heart { | ||
| pub fn create_node(_vertices: u32) -> NodeTemplate { | ||
| let identifier = DefinitionIdentifier::ProtoNode(graphene_std::vector::generator_nodes::heart::IDENTIFIER); | ||
| let node_type = resolve_document_node_type(&identifier).expect("Heart node can't be found"); | ||
| node_type.node_template_input_override([ | ||
| None, | ||
| Some(NodeInput::value(TaggedValue::F64(100.), false)), | ||
| Some(NodeInput::value(TaggedValue::F64(100.), false)), | ||
| Some(NodeInput::value(TaggedValue::F64(50.), false)), | ||
| ]) | ||
| } | ||
|
|
||
| pub fn update_shape( | ||
| document: &DocumentMessageHandler, | ||
| ipp: &InputPreprocessorMessageHandler, | ||
| viewport: &ViewportMessageHandler, | ||
| layer: LayerNodeIdentifier, | ||
| shape_tool_data: &mut ShapeToolData, | ||
| modifier: ShapeToolModifierKey, | ||
| responses: &mut VecDeque<Message>, | ||
| ) { | ||
| let [center, lock_ratio, _] = modifier; | ||
|
|
||
| if let Some([start, end]) = shape_tool_data.data.calculate_points(document, ipp, viewport, center, lock_ratio) { | ||
| update_radius_sign(end, start, layer, document, responses); | ||
|
|
||
| let dimensions = (start - end).abs(); | ||
| let width = dimensions.x; | ||
| let height = dimensions.y; | ||
|
|
||
| let Some(node_id) = graph_modification_utils::get_heart_id(layer, &document.network_interface) else { | ||
| return; | ||
| }; | ||
|
|
||
| responses.add(NodeGraphMessage::SetInput { | ||
| input_connector: InputConnector::node(node_id, 1), | ||
| input: NodeInput::value(TaggedValue::F64(width), false), | ||
| }); | ||
|
|
||
| responses.add(NodeGraphMessage::SetInput { | ||
| input_connector: InputConnector::node(node_id, 2), | ||
| input: NodeInput::value(TaggedValue::F64(height), false), | ||
| }); | ||
|
|
||
| let center_x = (start.x + end.x) / 2.0; | ||
| let center_y = (start.y + end.y) / 2.0; | ||
|
|
||
| responses.add(GraphOperationMessage::TransformSet { | ||
| layer, | ||
| transform: DAffine2::from_translation(DVec2::new(center_x, center_y)), | ||
| transform_in: TransformIn::Viewport, | ||
| skip_rerender: false, | ||
| }); | ||
| } | ||
| } | ||
| } | ||
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
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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It looks like there's a copy-paste error in these new functions. Both
get_teardrop_idandget_heart_idare checking for the spiral identifier. They should be checking for their respective shape identifiers.