Fix spacing modes.

Ripper53 · Keavon · commit 8aafcb6e3bd1 · 2025-06-20T01:19:21.000-07:00
diff --git a/editor/src/messages/portfolio/document/node_graph/node_properties.rs b/editor/src/messages/portfolio/document/node_graph/node_properties.rs
@@ -28,7 +28,7 @@ use graphene_std::vector::VectorDataTable;
 use graphene_std::vector::misc::ArcType;
 use graphene_std::vector::misc::{BooleanOperation, GridType};
 use graphene_std::vector::style::{CircularSpacing, Fill, FillChoice, FillType, GradientStops, Spacing};
-use graphene_std::{GraphicGroupTable, NodeInputDecleration, RasterFrame};
+use graphene_std::{GraphicGroupTable, NodeInputDecleration};
 
 pub(crate) fn string_properties(text: &str) -> Vec<LayoutGroup> {
 	let widget = TextLabel::new(text).widget_holder();
diff --git a/node-graph/gcore/src/vector/vector_nodes.rs b/node-graph/gcore/src/vector/vector_nodes.rs
@@ -210,7 +210,7 @@ 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>
@@ -231,12 +231,11 @@ where
 	for index in 0..count {
 		let angle = index as f64 * angle / total;
 		let mut translation = index as f64 * direction / total;
-		let mut size = index as f64 * exact_size / total;
 
-		// let transform = DAffine2::from_angle(angle) * DAffine2::from_translation(translation);
 		let transform = match spacing {
-			Spacing::Span => DAffine2::from_translation(translation) * DAffine2::from_angle(angle),
+			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 {
@@ -252,11 +251,11 @@ where
 				if size == DVec2::ZERO {
 					DAffine2::from_angle(angle)
 				} else {
-					DAffine2::from_translation(size).inverse() * DAffine2::from_translation(translation) * DAffine2::from_angle(angle)
+					DAffine2::from_angle(angle) * DAffine2::from_translation(size).inverse() * DAffine2::from_translation(translation)
 				}
 			}
-			Spacing::Pitch => DAffine2::from_translation(index as f64 * direction) * DAffine2::from_angle(angle),
-			Spacing::Gap => DAffine2::from_translation(index as f64 * exact_size) * DAffine2::from_translation(index as f64 * direction) * DAffine2::from_angle(angle),
+			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() {
