Remove the UVec2 and IVec2 graph data types and have Artboard use DVec2 (#2894)

Author: Keavon

demo-artwork/changing-seasons.graphite

@@ -97,7 +97,7 @@ impl<'a> ModifyInputsContext<'a> {
 			};
 		}
 
-		let layer_input_connector = post_node_input_connector.clone();
+		let layer_input_connector = post_node_input_connector;
 
 		// Sink post_node down to the end of the non layer chain that feeds into post_node, such that pre_node is the layer node at insert_index + 1, or None if insert_index is the last layer
 		loop {
@@ -132,8 +132,8 @@ impl<'a> ModifyInputsContext<'a> {
 		let artboard_node_template = resolve_document_node_type("Artboard").expect("Node").node_template_input_override([
 			Some(NodeInput::value(TaggedValue::ArtboardGroup(graphene_std::ArtboardGroupTable::default()), true)),
 			Some(NodeInput::value(TaggedValue::GraphicGroup(graphene_std::GraphicGroupTable::default()), true)),
-			Some(NodeInput::value(TaggedValue::IVec2(artboard.location), false)),
-			Some(NodeInput::value(TaggedValue::IVec2(artboard.dimensions), false)),
+			Some(NodeInput::value(TaggedValue::DVec2(artboard.location.into()), false)),
+			Some(NodeInput::value(TaggedValue::DVec2(artboard.dimensions.into()), false)),
 			Some(NodeInput::value(TaggedValue::Color(artboard.background), false)),
 			Some(NodeInput::value(TaggedValue::Bool(artboard.clip), false)),
 		]);
@@ -486,8 +486,8 @@ impl<'a> ModifyInputsContext<'a> {
 			dimensions.y *= -1;
 			location.y -= dimensions.y;
 		}
-		self.set_input_with_refresh(InputConnector::node(artboard_node_id, 2), NodeInput::value(TaggedValue::IVec2(location), false), false);
-		self.set_input_with_refresh(InputConnector::node(artboard_node_id, 3), NodeInput::value(TaggedValue::IVec2(dimensions), false), false);
+		self.set_input_with_refresh(InputConnector::node(artboard_node_id, 2), NodeInput::value(TaggedValue::DVec2(location.into()), false), false);
+		self.set_input_with_refresh(InputConnector::node(artboard_node_id, 3), NodeInput::value(TaggedValue::DVec2(dimensions.into()), false), false);
 	}
 
 	/// Set the input, refresh the properties panel, and run the document graph if skip_rerender is false

demo-artwork/isometric-fountain.graphite

@@ -378,8 +378,8 @@ fn static_nodes() -> Vec<DocumentNodeDefinition> {
 					inputs: vec![
 						NodeInput::value(TaggedValue::ArtboardGroup(ArtboardGroupTable::default()), true),
 						NodeInput::value(TaggedValue::GraphicGroup(GraphicGroupTable::default()), true),
-						NodeInput::value(TaggedValue::IVec2(glam::IVec2::ZERO), false),
-						NodeInput::value(TaggedValue::IVec2(glam::IVec2::new(1920, 1080)), false),
+						NodeInput::value(TaggedValue::DVec2(DVec2::ZERO), false),
+						NodeInput::value(TaggedValue::DVec2(DVec2::new(1920., 1080.)), false),
 						NodeInput::value(TaggedValue::Color(Color::WHITE), false),
 						NodeInput::value(TaggedValue::Bool(false), false),
 					],
@@ -396,6 +396,7 @@ fn static_nodes() -> Vec<DocumentNodeDefinition> {
 								x: "X".to_string(),
 								y: "Y".to_string(),
 								unit: " px".to_string(),
+								is_integer: true,
 								..Default::default()
 							}),
 						),
@@ -406,6 +407,7 @@ fn static_nodes() -> Vec<DocumentNodeDefinition> {
 								x: "W".to_string(),
 								y: "H".to_string(),
 								unit: " px".to_string(),
+								is_integer: true,
 								..Default::default()
 							}),
 						),
@@ -1953,8 +1955,20 @@ fn static_input_properties() -> InputProperties {
 				.network_interface
 				.input_data(&node_id, index, "min", context.selection_network_path)
 				.and_then(|value| value.as_f64());
+			let is_integer = context
+				.network_interface
+				.input_data(&node_id, index, "is_integer", context.selection_network_path)
+				.and_then(|value| value.as_bool())
+				.unwrap_or_default();
 
-			Ok(vec![node_properties::coordinate_widget(ParameterWidgetsInfo::new(node_id, index, true, context), &x, &y, &unit, min)])
+			Ok(vec![node_properties::coordinate_widget(
+				ParameterWidgetsInfo::new(node_id, index, true, context),
+				&x,
+				&y,
+				&unit,
+				min,
+				is_integer,
+			)])
 		}),
 	);
 	map.insert(