Origin Offset

Author: jsjgdh

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

@@ -584,6 +584,7 @@ fn document_node_definitions() -> HashMap<DefinitionIdentifier, DocumentNodeDefi
 									NodeInput::value(TaggedValue::F64(0.), false),
 									NodeInput::value(TaggedValue::DVec2(DVec2::ONE), false),
 									NodeInput::value(TaggedValue::DVec2(DVec2::ZERO), false),
+									NodeInput::value(TaggedValue::DVec2(DVec2::ZERO), false),
 								],
 								..Default::default()
 							},
@@ -1698,6 +1699,8 @@ fn document_node_definitions() -> HashMap<DefinitionIdentifier, DocumentNodeDefi
 									NodeInput::import(concrete!(DVec2), 3),
 									// From the Skew import
 									NodeInput::import(concrete!(DVec2), 4),
+									// From the Origin Offset import
+									NodeInput::import(concrete!(DVec2), 5),
 								],
 								implementation: DocumentNodeImplementation::ProtoNode(transform_nodes::transform::IDENTIFIER),
 								..Default::default()

editor/src/messages/portfolio/document_migration.rs

@@ -1095,6 +1095,21 @@ fn migrate_node(node_id: &NodeId, node: &DocumentNode, network_path: &[NodeId],
 		document.network_interface.set_input(&InputConnector::node(*node_id, 9), old_inputs[4].clone(), network_path);
 	}
 
+	// Upgrade Transform node to add "Pivot" input
+	if reference == DefinitionIdentifier::ProtoNode(graphene_std::transform_nodes::transform::IDENTIFIER) && inputs_count == 5 {
+		let mut node_template = resolve_document_node_type(&reference)?.default_node_template();
+		let old_inputs = document.network_interface.replace_inputs(node_id, network_path, &mut node_template)?;
+
+		let pivot_input = NodeInput::value(TaggedValue::DVec2(DVec2::ZERO), false);
+
+		document.network_interface.set_input(&InputConnector::node(*node_id, 0), old_inputs[0].clone(), network_path);
+		document.network_interface.set_input(&InputConnector::node(*node_id, 1), old_inputs[1].clone(), network_path);
+		document.network_interface.set_input(&InputConnector::node(*node_id, 2), old_inputs[2].clone(), network_path);
+		document.network_interface.set_input(&InputConnector::node(*node_id, 3), old_inputs[3].clone(), network_path);
+		document.network_interface.set_input(&InputConnector::node(*node_id, 4), old_inputs[4].clone(), network_path);
+		document.network_interface.set_input(&InputConnector::node(*node_id, 5), pivot_input, network_path);
+	}
+
 	// Upgrade the old "Spline" node to the new "Spline" node
 	if reference == DefinitionIdentifier::ProtoNode(graphene_std::vector::spline::IDENTIFIER)
 		|| reference == DefinitionIdentifier::ProtoNode(ProtoNodeIdentifier::new("graphene_core::vector::generator_nodes::SplineNode"))

node-graph/nodes/transform/src/transform_nodes.rs

@@ -28,10 +28,11 @@ async fn transform<T: ApplyTransform + 'n + 'static>(
 	rotation: f64,
 	scale: DVec2,
 	skew: DVec2,
+	origin_offset: DVec2,
 ) -> T {
 	let trs = DAffine2::from_scale_angle_translation(scale, rotation.to_radians(), translation);
 	let skew = DAffine2::from_cols_array(&[1., skew.y.to_radians().tan(), skew.x.to_radians().tan(), 1., 0., 0.]);
-	let matrix = trs * skew;
+	let matrix = DAffine2::from_translation(origin_offset) * trs * skew * DAffine2::from_translation(-origin_offset);
 
 	let footprint = ctx.try_footprint().copied();