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

Rename 'Resample Points' to 'Sample Points'

This commit is contained in:
Keavon Chambers 2024-01-05 05:24:16 -08:00
parent 6bfb2bf344
commit b3e4caec1a
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
editor/src/messages/portfolio/document/node_graph/node_graph_message_handler/document_node_types.rs
View File

@ -2654,9 +2654,9 @@ fn static_nodes() -> Vec<DocumentNodeDefinition> {
..Default::default() ..Default::default()
}, },
DocumentNodeDefinition { DocumentNodeDefinition {
name: "Resample Points", name: "Sample Points",
category: "Vector", category: "Vector",
implementation: NodeImplementation::proto("graphene_core::vector::ResamplePoints<_, _, _, _>"), implementation: NodeImplementation::proto("graphene_core::vector::SamplePoints<_, _, _, _>"),
inputs: vec![ inputs: vec![
DocumentInputType::value("Vector Data", TaggedValue::VectorData(graphene_core::vector::VectorData::empty()), true), DocumentInputType::value("Vector Data", TaggedValue::VectorData(graphene_core::vector::VectorData::empty()), true),
DocumentInputType::value("Spacing", TaggedValue::F32(100.), false), DocumentInputType::value("Spacing", TaggedValue::F32(100.), false),
@ -2665,7 +2665,7 @@ fn static_nodes() -> Vec<DocumentNodeDefinition> {
DocumentInputType::value("Adaptive Spacing", TaggedValue::Bool(false), false), DocumentInputType::value("Adaptive Spacing", TaggedValue::Bool(false), false),
], ],
outputs: vec![DocumentOutputType::new("Vector", FrontendGraphDataType::Subpath)], outputs: vec![DocumentOutputType::new("Vector", FrontendGraphDataType::Subpath)],
properties: node_properties::resample_points_properties, properties: node_properties::sample_points_properties,
..Default::default() ..Default::default()
}, },
DocumentNodeDefinition { DocumentNodeDefinition {

2
editor/src/messages/portfolio/document/node_graph/node_graph_message_handler/node_properties.rs
View File

@ -2042,7 +2042,7 @@ pub fn copy_to_points_properties(document_node: &DocumentNode, node_id: NodeId,
vec![LayoutGroup::Row { widgets: instance }] vec![LayoutGroup::Row { widgets: instance }]
} }
pub fn resample_points_properties(document_node: &DocumentNode, node_id: NodeId, _context: &mut NodePropertiesContext) -> Vec<LayoutGroup> { pub fn sample_points_properties(document_node: &DocumentNode, node_id: NodeId, _context: &mut NodePropertiesContext) -> Vec<LayoutGroup> {
let spacing = number_widget(document_node, node_id, 1, "Spacing", NumberInput::default().min(1.), true); let spacing = number_widget(document_node, node_id, 1, "Spacing", NumberInput::default().min(1.), true);
let start_offset = number_widget(document_node, node_id, 2, "Start Offset", NumberInput::default().min(0.), true); let start_offset = number_widget(document_node, node_id, 2, "Start Offset", NumberInput::default().min(0.), true);
let stop_offset = number_widget(document_node, node_id, 3, "Stop Offset", NumberInput::default().min(0.), true); let stop_offset = number_widget(document_node, node_id, 3, "Stop Offset", NumberInput::default().min(0.), true);

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

@ -204,21 +204,21 @@ async fn copy_to_points<I: GraphicElementRendered + Default + ConcatElement + Tr
} }
#[derive(Debug, Clone, Copy)] #[derive(Debug, Clone, Copy)]
pub struct ResamplePoints<Spacing, StartOffset, StopOffset, AdaptiveSpacing> { pub struct SamplePoints<Spacing, StartOffset, StopOffset, AdaptiveSpacing> {
spacing: Spacing, spacing: Spacing,
start_offset: StartOffset, start_offset: StartOffset,
stop_offset: StopOffset, stop_offset: StopOffset,
adaptive_spacing: AdaptiveSpacing, adaptive_spacing: AdaptiveSpacing,
} }
#[node_macro::node_fn(ResamplePoints)] #[node_macro::node_fn(SamplePoints)]
fn resample_points(mut vector_data: VectorData, spacing: f32, start_offset: f32, stop_offset: f32, adaptive_spacing: bool) -> VectorData { fn sample_points(mut vector_data: VectorData, spacing: f32, start_offset: f32, stop_offset: f32, adaptive_spacing: bool) -> VectorData {
let spacing = spacing as f64; let spacing = spacing as f64;
let start_offset = start_offset as f64; let start_offset = start_offset as f64;
let stop_offset = stop_offset as f64; let stop_offset = stop_offset as f64;
for subpath in &mut vector_data.subpaths { for subpath in &mut vector_data.subpaths {
if subpath.is_empty() || spacing.is_zero() || !spacing.is_finite() { if subpath.is_empty() || !spacing.is_finite() || spacing <= 0. {
continue; continue;
} }

2
node-graph/interpreted-executor/src/node_registry.rs
View File

@ -734,7 +734,7 @@ fn node_registry() -> HashMap<ProtoNodeIdentifier, HashMap<NodeIOTypes, NodeCons
register_node!(graphene_std::raster::MandelbrotNode, input: Footprint, params: []), register_node!(graphene_std::raster::MandelbrotNode, input: Footprint, params: []),
async_node!(graphene_core::vector::CopyToPoints<_, _>, input: Footprint, output: VectorData, fn_params: [Footprint => VectorData, Footprint => VectorData]), async_node!(graphene_core::vector::CopyToPoints<_, _>, input: Footprint, output: VectorData, fn_params: [Footprint => VectorData, Footprint => VectorData]),
async_node!(graphene_core::vector::CopyToPoints<_, _>, input: Footprint, output: GraphicGroup, fn_params: [Footprint => VectorData, Footprint => GraphicGroup]), async_node!(graphene_core::vector::CopyToPoints<_, _>, input: Footprint, output: GraphicGroup, fn_params: [Footprint => VectorData, Footprint => GraphicGroup]),
register_node!(graphene_core::vector::ResamplePoints<_, _, _, _>, input: VectorData, params: [f32, f32, f32, bool]), register_node!(graphene_core::vector::SamplePoints<_, _, _, _>, input: VectorData, params: [f32, f32, f32, bool]),
register_node!(graphene_core::vector::SplinesFromPointsNode, input: VectorData, params: []), register_node!(graphene_core::vector::SplinesFromPointsNode, input: VectorData, params: []),
register_node!(graphene_core::vector::generator_nodes::CircleGenerator<_>, input: (), params: [f32]), register_node!(graphene_core::vector::generator_nodes::CircleGenerator<_>, input: (), params: [f32]),
register_node!(graphene_core::vector::generator_nodes::EllipseGenerator<_, _>, input: (), params: [f32, f32]), register_node!(graphene_core::vector::generator_nodes::EllipseGenerator<_, _>, input: (), params: [f32, f32]),