Move artwork with artboard

Author: 0HyperCube

demo-artwork/just-a-potted-cactus-v2.graphite

@@ -258,7 +258,7 @@ fn static_nodes() -> Vec<DocumentNodeBlueprint> {
 		DocumentNodeBlueprint {
 			name: "Artboard",
 			category: "General",
-			identifier: NodeImplementation::proto("graphene_core::ConstructArtboardNode<_, _, _, _>"),
+			identifier: NodeImplementation::proto("graphene_core::ConstructArtboardNode<_, _, _, _, _>"),
 			inputs: vec![
 				DocumentInputType::value("Graphic Group", TaggedValue::GraphicGroup(GraphicGroup::EMPTY), true),
 				DocumentInputType::value("Location", TaggedValue::IVec2(glam::IVec2::ZERO), false),
@@ -268,6 +268,7 @@ fn static_nodes() -> Vec<DocumentNodeBlueprint> {
 			],
 			outputs: vec![DocumentOutputType::new("Out", FrontendGraphDataType::Artboard)],
 			properties: node_properties::artboard_properties,
+			manual_composition: Some(concrete!(Footprint)),
 			..Default::default()
 		},
 		DocumentNodeBlueprint {

demo-artwork/valley-of-spires-v2.graphite

@@ -1,4 +1,5 @@
 use crate::raster::{BlendMode, ImageFrame};
+use crate::transform::Footprint;
 use crate::vector::VectorData;
 use crate::{Color, Node};
 
@@ -136,15 +137,25 @@ fn to_graphic_element_data<Data: Into<GraphicElementData>>(graphic_element_data:
 	graphic_element_data.into()
 }
 
-pub struct ConstructArtboardNode<Location, Dimensions, Background, Clip> {
+pub struct ConstructArtboardNode<Contents, Location, Dimensions, Background, Clip> {
+	contents: Contents,
 	location: Location,
 	dimensions: Dimensions,
 	background: Background,
 	clip: Clip,
 }
 
 #[node_fn(ConstructArtboardNode)]
-fn construct_artboard(graphic_group: GraphicGroup, location: IVec2, dimensions: IVec2, background: Color, clip: bool) -> Artboard {
+async fn construct_artboard<Fut: Future<Output = GraphicGroup>>(
+	mut footprint: Footprint,
+	contents: impl Node<Footprint, Output = Fut>,
+	location: IVec2,
+	dimensions: IVec2,
+	background: Color,
+	clip: bool,
+) -> Artboard {
+	footprint.transform = footprint.transform * DAffine2::from_translation(location.as_dvec2());
+	let graphic_group = self.contents.eval(footprint).await;
 	Artboard {
 		graphic_group,
 		location: location.min(location + dimensions),

editor/src/messages/portfolio/document/node_graph/node_graph_message_handler/document_node_types.rs

@@ -284,15 +284,20 @@ impl GraphicElementRendered for Artboard {
 			"g",
 			|attributes| {
 				attributes.push("class", "artboard");
-				attributes.push("transform", format_transform_matrix(self.graphic_group.transform));
+				attributes.push(
+					"transform",
+					format_transform_matrix(DAffine2::from_translation(self.location.as_dvec2()) * self.graphic_group.transform),
+				);
 				if self.clip {
 					let id = format!("artboard-{}", generate_uuid());
 					let selector = format!("url(#{id})");
 					use std::fmt::Write;
 					write!(
 						&mut attributes.0.svg_defs,
-						r##"<clipPath id="{id}"><rect x="{}" y="{}" width="{}" height="{}"/></clipPath>"##,
-						self.location.x, self.location.y, self.dimensions.x, self.dimensions.y
+						r##"<clipPath id="{id}"><rect x="0" y="0" width="{}" height="{}" transform="{}"/></clipPath>"##,
+						self.dimensions.x,
+						self.dimensions.y,
+						format_transform_matrix(self.graphic_group.transform.inverse())
 					)
 					.unwrap();
 					attributes.push("clip-path", selector);

node-graph/gcore/src/graphic_element.rs

@@ -844,7 +844,7 @@ fn node_registry() -> HashMap<NodeIdentifier, HashMap<NodeIOTypes, NodeConstruct
 		register_node!(graphene_core::ToGraphicElementData, input: ImageFrame<Color>, params: []),
 		register_node!(graphene_core::ToGraphicElementData, input: GraphicGroup, params: []),
 		register_node!(graphene_core::ToGraphicElementData, input: Artboard, params: []),
-		register_node!(graphene_core::ConstructArtboardNode<_, _, _, _>, input: GraphicGroup, params: [glam::IVec2, glam::IVec2, Color, bool]),
+		async_node!(graphene_core::ConstructArtboardNode<_, _, _, _, _>, input: Footprint, output: Artboard, fn_params: [Footprint => GraphicGroup, () => glam::IVec2, () => glam::IVec2, () => Color, () => bool]),
 	];
 	let mut map: HashMap<NodeIdentifier, HashMap<NodeIOTypes, NodeConstructor>> = HashMap::new();
 	for (id, c, types) in node_types.into_iter().flatten() {