Spacing type radio button for repeat and circular repeat node

editor/src/messages/portfolio/document/node_graph/node_properties.rs

@@ -26,8 +26,7 @@ use graphene_std::vector::generator_nodes::grid;
 use graphene_std::vector::misc::ArcType;
 use graphene_std::vector::misc::CentroidType;
 use graphene_std::vector::misc::{BooleanOperation, GridType};
-use graphene_std::vector::style::{Fill, FillChoice, FillType, GradientStops};
-use graphene_std::vector::style::{GradientType, PaintOrder, StrokeAlign, StrokeCap, StrokeJoin};
+use graphene_std::vector::style::{CircularSpacing, Fill, FillChoice, FillType, GradientStops, GradientType, PaintOrder, Spacing, StrokeAlign, StrokeCap, StrokeJoin};
 use graphene_std::{GraphicGroupTable, NodeInputDecleration};
 
 pub(crate) fn string_properties(text: &str) -> Vec<LayoutGroup> {
@@ -140,6 +139,15 @@ pub(crate) fn property_from_type(
 
 	let (mut number_min, mut number_max, range) = number_options;
 	let mut number_input = NumberInput::default();
+	if let Some(unit) = unit {
+		number_input = number_input.unit(unit);
+	}
+	if let Some(display_decimal_places) = display_decimal_places {
+		number_input = number_input.display_decimal_places(display_decimal_places);
+	}
+	if let Some(step) = step {
+		number_input = number_input.step(step);
+	}
 	if let Some((range_start, range_end)) = range {
 		number_min = Some(range_start);
 		number_max = Some(range_end);
@@ -239,6 +247,8 @@ pub(crate) fn property_from_type(
 						Some(x) if x == TypeId::of::<PaintOrder>() => enum_choice::<PaintOrder>().for_socket(default_info).property_row(),
 						Some(x) if x == TypeId::of::<ArcType>() => enum_choice::<ArcType>().for_socket(default_info).property_row(),
 						Some(x) if x == TypeId::of::<BooleanOperation>() => enum_choice::<BooleanOperation>().for_socket(default_info).property_row(),
+						Some(x) if x == TypeId::of::<Spacing>() => enum_choice::<Spacing>().for_socket(default_info).property_row(),
+						Some(x) if x == TypeId::of::<CircularSpacing>() => enum_choice::<CircularSpacing>().for_socket(default_info).property_row(),
 						Some(x) if x == TypeId::of::<CentroidType>() => enum_choice::<CentroidType>().for_socket(default_info).property_row(),
 						Some(x) if x == TypeId::of::<LuminanceCalculation>() => enum_choice::<LuminanceCalculation>().for_socket(default_info).property_row(),
 						// =====

node-graph/gcore/src/vector/style.rs

@@ -1056,3 +1056,21 @@ pub enum ViewMode {
 	/// Render with normal coloration at the document resolution, showing the pixels when the current viewport resolution is higher
 	Pixels,
 }
+
+#[derive(Debug, Default, PartialEq, Eq, Clone, Copy, Hash, serde::Serialize, serde::Deserialize, DynAny, specta::Type, node_macro::ChoiceType)]
+#[widget(Radio)]
+pub enum Spacing {
+	Envelope,
+	#[default]
+	Span,
+	Pitch,
+	Gap,
+}
+
+#[derive(Debug, Default, PartialEq, Eq, Clone, Copy, Hash, serde::Serialize, serde::Deserialize, DynAny, specta::Type, node_macro::ChoiceType)]
+#[widget(Radio)]
+pub enum CircularSpacing {
+	#[default]
+	Span,
+	Pitch,
+}

node-graph/gcore/src/vector/vector_nodes.rs

@@ -10,7 +10,7 @@ use crate::registry::types::{Angle, Fraction, IntegerCount, Length, Multiplier,
 use crate::renderer::GraphicElementRendered;
 use crate::transform::{Footprint, ReferencePoint, Transform};
 use crate::vector::misc::dvec2_to_point;
-use crate::vector::style::{PaintOrder, StrokeAlign, StrokeCap, StrokeJoin};
+use crate::vector::style::{PaintOrder, Spacing, StrokeAlign, StrokeCap, StrokeJoin};
 use crate::vector::{FillId, PointDomain, RegionId};
 use crate::{CloneVarArgs, Color, Context, Ctx, ExtractAll, GraphicElement, GraphicGroupTable, OwnedContextImpl};
 use bezier_rs::{Join, ManipulatorGroup, Subpath};
@@ -218,8 +218,9 @@ async fn repeat<I: 'n + Send + Clone>(
 	#[default(100., 100.)]
 	// TODO: When using a custom Properties panel layout in document_node_definitions.rs and this default is set, the widget weirdly doesn't show up in the Properties panel. Investigation is needed.
 	direction: PixelSize,
-	angle: Angle,
+	#[unit("°")] angle: f64,
 	#[default(4)] instances: IntegerCount,
+	spacing: Spacing,
 ) -> Instances<I>
 where
 	Instances<I>: GraphicElementRendered,
@@ -230,10 +231,40 @@ where
 
 	let mut result_table = Instances::<I>::default();
 
+	let Some(bounding_box) = instance.bounding_box(DAffine2::IDENTITY, false) else {
+		return result_table;
+	};
+	let exact_size = (bounding_box[1] - bounding_box[0]).abs();
+
 	for index in 0..count {
 		let angle = index as f64 * angle / total;
-		let translation = index as f64 * direction / total;
-		let transform = DAffine2::from_angle(angle) * DAffine2::from_translation(translation);
+		let mut translation = index as f64 * direction / total;
+
+		let transform = match spacing {
+			Spacing::Span => DAffine2::from_angle(angle) * DAffine2::from_translation(translation),
+			Spacing::Envelope => {
+				let mut size = index as f64 * exact_size / total;
+				if direction.x < -exact_size.x {
+					size.x -= size.x * 2.;
+				} else if direction.x <= exact_size.x {
+					size.x = 0.;
+					translation.x = 0.;
+				}
+				if direction.y < -exact_size.y {
+					size.y -= size.y * 2.;
+				} else if direction.y <= exact_size.y {
+					size.y = 0.;
+					translation.y = 0.;
+				}
+				if size == DVec2::ZERO {
+					DAffine2::from_angle(angle)
+				} else {
+					DAffine2::from_angle(angle) * DAffine2::from_translation(size).inverse() * DAffine2::from_translation(translation)
+				}
+			}
+			Spacing::Pitch => DAffine2::from_angle(angle) * DAffine2::from_translation(index as f64 * direction),
+			Spacing::Gap => DAffine2::from_angle(angle) * DAffine2::from_translation(index as f64 * exact_size) * DAffine2::from_translation(index as f64 * direction),
+		};
 
 		for instance in instance.instance_ref_iter() {
 			let mut instance = instance.to_instance_cloned();
@@ -255,20 +286,35 @@ async fn circular_repeat<I: 'n + Send + Clone>(
 	// TODO: Implement other GraphicElementRendered types.
 	#[implementations(GraphicGroupTable, VectorDataTable, RasterDataTable<CPU>)] instance: Instances<I>,
 	angle_offset: Angle,
+	// #[default(180.)]
+	// #[unit("°")]
+	// angle_pitch: f64,
 	#[default(5)] radius: f64,
 	#[default(5)] instances: IntegerCount,
+	// spacing: CircularSpacing,
 ) -> Instances<I>
 where
 	Instances<I>: GraphicElementRendered,
 {
 	let count = instances.max(1);
+	// let circle = angle_pitch.to_radians();
 
 	let mut result_table = Instances::<I>::default();
 
 	for index in 0..count {
 		let angle = DAffine2::from_angle((TAU / count as f64) * index as f64 + angle_offset.to_radians());
 		let translation = DAffine2::from_translation(radius * DVec2::Y);
 		let transform = angle * translation;
+		// let transform = match spacing {
+		// 	CircularSpacing::Span => {
+		// 		let rotation = DAffine2::from_angle((circle / instances as f64) * index as f64 + angle_offset.to_radians());
+		// 		DAffine2::from_translation(center) * rotation * DAffine2::from_translation(base_transform)
+		// 	}
+		// 	CircularSpacing::Pitch => {
+		// 		let rotation = DAffine2::from_angle(circle * index as f64 + angle_offset.to_radians());
+		// 		DAffine2::from_translation(center) * rotation * DAffine2::from_translation(base_transform)
+		// 	}
+		// };
 
 		for instance in instance.instance_ref_iter() {
 			let mut instance = instance.to_instance_cloned();
@@ -1964,7 +2010,7 @@ mod test {
 	async fn repeat() {
 		let direction = DVec2::X * 1.5;
 		let instances = 3;
-		let repeated = super::repeat(Footprint::default(), vector_node(Subpath::new_rect(DVec2::ZERO, DVec2::ONE)), direction, 0., instances).await;
+		let repeated = super::repeat(Footprint::default(), vector_node(Subpath::new_rect(DVec2::ZERO, DVec2::ONE)), direction, 0., instances, Spacing::Span).await;
 		let vector_data = super::flatten_path(Footprint::default(), repeated).await;
 		let vector_data = vector_data.instance_ref_iter().next().unwrap().instance;
 		assert_eq!(vector_data.region_bezier_paths().count(), 3);
@@ -1976,7 +2022,7 @@ mod test {
 	async fn repeat_transform_position() {
 		let direction = DVec2::new(12., 10.);
 		let instances = 8;
-		let repeated = super::repeat(Footprint::default(), vector_node(Subpath::new_rect(DVec2::ZERO, DVec2::ONE)), direction, 0., instances).await;
+		let repeated = super::repeat(Footprint::default(), vector_node(Subpath::new_rect(DVec2::ZERO, DVec2::ONE)), direction, 0., instances, Spacing::Span).await;
 		let vector_data = super::flatten_path(Footprint::default(), repeated).await;
 		let vector_data = vector_data.instance_ref_iter().next().unwrap().instance;
 		assert_eq!(vector_data.region_bezier_paths().count(), 8);
@@ -1986,7 +2032,16 @@ mod test {
 	}
 	#[tokio::test]
 	async fn circular_repeat() {
-		let repeated = super::circular_repeat(Footprint::default(), vector_node(Subpath::new_rect(DVec2::NEG_ONE, DVec2::ONE)), 45., 4., 8).await;
+		let repeated = super::circular_repeat(
+			Footprint::default(),
+			vector_node(Subpath::new_rect(DVec2::NEG_ONE, DVec2::ONE)),
+			45.,
+			// 360.,
+			4.,
+			8,
+			// CircularSpacing::Span,
+		)
+		.await;
 		let vector_data = super::flatten_path(Footprint::default(), repeated).await;
 		let vector_data = vector_data.instance_ref_iter().next().unwrap().instance;
 		assert_eq!(vector_data.region_bezier_paths().count(), 8);

node-graph/graph-craft/src/document/value.rs

@@ -243,6 +243,8 @@ tagged_value! {
 	FillType(graphene_core::vector::style::FillType),
 	FillChoice(graphene_core::vector::style::FillChoice),
 	GradientType(graphene_core::vector::style::GradientType),
+	Spacing(graphene_core::vector::style::Spacing),
+	CircularSpacing(graphene_core::vector::style::CircularSpacing),
 	ReferencePoint(graphene_core::transform::ReferencePoint),
 	CentroidType(graphene_core::vector::misc::CentroidType),
 	BooleanOperation(graphene_core::vector::misc::BooleanOperation),