Make Instances<T>::default() return an empty table for images, but still not yet vector

Author: Keavon

editor/src/messages/portfolio/document/graph_operation/utility_types.rs

@@ -413,13 +413,10 @@ impl<'a> ModifyInputsContext<'a> {
 	pub fn transform_set_direct(&mut self, transform: DAffine2, skip_rerender: bool, transform_node_id: Option<NodeId>) {
 		// If the Transform node didn't exist yet, create it now
 		let Some(transform_node_id) = transform_node_id.or_else(|| {
-			// Check if the transform is the identity transform and if so, don't create a new Transform node
-			if let Some((scale, angle, translation)) = (transform.matrix2.determinant() != 0.).then(|| transform.to_scale_angle_translation()) {
-				// Check if the transform is the identity transform within an epsilon
-				if scale.x.abs() < 1e-6 && scale.y.abs() < 1e-6 && angle.abs() < 1e-6 && translation.x.abs() < 1e-6 && translation.y.abs() < 1e-6 {
+			// Check if the transform is the identity transform (within an epsilon) and if so, don't create a new Transform node
+			if transform.abs_diff_eq(DAffine2::IDENTITY, 1e-6) {
 					// We don't want to pollute the graph with an unnecessary Transform node, so we avoid creating and setting it by returning None
 					return None;
-				}
 			}
 
 			// Create the Transform node

editor/src/messages/portfolio/document/utility_types/transformation.rs

@@ -635,17 +635,17 @@ impl<'a> Selected<'a> {
 	}
 
 	pub fn apply_transformation(&mut self, transformation: DAffine2, transform_operation: Option<TransformOperation>) {
-		if !self.selected.is_empty() {
-			// TODO: Cache the result of `shallowest_unique_layers` to avoid this heavy computation every frame of movement, see https://github.com/GraphiteEditor/Graphite/pull/481
-			for layer in self.network_interface.shallowest_unique_layers(&[]) {
-				match &mut self.original_transforms {
-					OriginalTransforms::Layer(layer_transforms) => {
-						Self::transform_layer(self.network_interface.document_metadata(), layer, layer_transforms.get(&layer), transformation, self.responses)
-					}
-					OriginalTransforms::Path(path_transforms) => {
-						if let Some(initial_points) = path_transforms.get_mut(&layer) {
-							Self::transform_path(self.network_interface.document_metadata(), layer, initial_points, transformation, self.responses, transform_operation)
-						}
+		if self.selected.is_empty() {
+			return;
+		}
+
+		// TODO: Cache the result of `shallowest_unique_layers` to avoid this heavy computation every frame of movement, see https://github.com/GraphiteEditor/Graphite/pull/481
+		for layer in self.network_interface.shallowest_unique_layers(&[]) {
+			match &mut self.original_transforms {
+				OriginalTransforms::Layer(layer_transforms) => Self::transform_layer(self.network_interface.document_metadata(), layer, layer_transforms.get(&layer), transformation, self.responses),
+				OriginalTransforms::Path(path_transforms) => {
+					if let Some(initial_points) = path_transforms.get_mut(&layer) {
+						Self::transform_path(self.network_interface.document_metadata(), layer, initial_points, transformation, self.responses, transform_operation)
 					}
 				}
 			}

editor/src/messages/tool/transform_layer/transform_layer_message_handler.rs

@@ -397,31 +397,28 @@ impl MessageHandler<TransformLayerMessage, TransformData<'_>> for TransformLayer
 					return;
 				}
 
-				let Some(vector_data) = selected_layers.first().and_then(|&layer| document.network_interface.compute_modified_vector(layer)) else {
-					selected.original_transforms.clear();
-					return;
-				};
-
-				if let [point] = selected_points.as_slice() {
-					if matches!(point, ManipulatorPointId::Anchor(_)) {
-						if let Some([handle1, handle2]) = point.get_handle_pair(&vector_data) {
-							let handle1_length = handle1.length(&vector_data);
-							let handle2_length = handle2.length(&vector_data);
-
-							if (handle1_length == 0. && handle2_length == 0. && !using_select_tool) || (handle1_length == f64::MAX && handle2_length == f64::MAX && !using_select_tool) {
-								// G should work for this point but not R and S
-								if matches!(transform_type, TransformType::Rotate | TransformType::Scale) {
-									selected.original_transforms.clear();
-									return;
+				if let Some(vector_data) = selected_layers.first().and_then(|&layer| document.network_interface.compute_modified_vector(layer)) {
+					if let [point] = selected_points.as_slice() {
+						if matches!(point, ManipulatorPointId::Anchor(_)) {
+							if let Some([handle1, handle2]) = point.get_handle_pair(&vector_data) {
+								let handle1_length = handle1.length(&vector_data);
+								let handle2_length = handle2.length(&vector_data);
+
+								if (handle1_length == 0. && handle2_length == 0. && !using_select_tool) || (handle1_length == f64::MAX && handle2_length == f64::MAX && !using_select_tool) {
+									// G should work for this point but not R and S
+									if matches!(transform_type, TransformType::Rotate | TransformType::Scale) {
+										selected.original_transforms.clear();
+										return;
+									}
 								}
 							}
-						}
-					} else {
-						let handle_length = point.as_handle().map(|handle| handle.length(&vector_data));
+						} else {
+							let handle_length = point.as_handle().map(|handle| handle.length(&vector_data));
 
-						if handle_length == Some(0.) {
-							selected.original_transforms.clear();
-							return;
+							if handle_length == Some(0.) {
+								selected.original_transforms.clear();
+								return;
+							}
 						}
 					}
 				}

node-graph/gcore/src/instances.rs

@@ -121,11 +121,8 @@ impl<T> Instances<T> {
 
 impl<T: Default + Hash + 'static> Default for Instances<T> {
 	fn default() -> Self {
-		// TODO: Remove once all types have been converted to tables
-		let converted_to_tables = [TypeId::of::<crate::Artboard>(), TypeId::of::<crate::GraphicElement>()];
-
 		use core::any::TypeId;
-		if converted_to_tables.contains(&TypeId::of::<T>()) {
+		if TypeId::of::<T>() != TypeId::of::<crate::vector::VectorData>() {
 			// TODO: Remove the 'static trait bound when this special casing is removed by making all types return empty
 			Self::empty()
 		} else {

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

@@ -1732,14 +1732,14 @@ fn bevel(_: impl Ctx, source: VectorDataTable, #[default(10.)] distance: Length)
 
 #[node_macro::node(category("Vector"), path(graphene_core::vector))]
 fn close_path(_: impl Ctx, source: VectorDataTable) -> VectorDataTable {
-	let mut new_table = VectorDataTable::empty();
+	let mut result_table = VectorDataTable::empty();
 
 	for mut source_instance in source.instance_iter() {
 		source_instance.instance.close_subpaths();
-		new_table.push(source_instance);
+		result_table.push(source_instance);
 	}
 
-	new_table
+	result_table
 }
 
 #[node_macro::node(category("Vector"), path(graphene_core::vector))]

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

@@ -109,9 +109,7 @@ macro_rules! tagged_value {
 			}
 			pub fn from_type(input: &Type) -> Option<Self> {
 				match input {
-					Type::Generic(_) => {
-						None
-					}
+					Type::Generic(_) => None,
 					Type::Concrete(concrete_type) => {
 						let internal_id = concrete_type.id?;
 						use std::any::TypeId;

node-graph/gstd/src/filter.rs

@@ -19,6 +19,7 @@ async fn blur(
 	gamma: bool,
 ) -> ImageFrameTable<Color> {
 	let mut result_table = ImageFrameTable::empty();
+
 	for mut image_instance in image_frame.instance_iter() {
 		let image = image_instance.instance.clone();
 
@@ -36,6 +37,7 @@ async fn blur(
 		image_instance.source_node_id = None;
 		result_table.push(image_instance);
 	}
+
 	result_table
 }
 

node-graph/gstd/src/gpu_nodes.rs

@@ -36,6 +36,7 @@ async fn compile_gpu<'a: 'n>(_: impl Ctx, node: &'a DocumentNode, typing_context
 #[node_macro::node(category("Debug: GPU"))]
 async fn blend_gpu_image(_: impl Ctx, foreground: ImageFrameTable<Color>, background: ImageFrameTable<Color>, blend_mode: BlendMode, opacity: f64) -> ImageFrameTable<Color> {
 	let mut result_table = ImageFrameTable::empty();
+
 	for (foreground_instance, mut background_instance) in foreground.instance_iter().zip(background.instance_iter()) {
 		let foreground_transform = foreground_instance.transform;
 		let background_transform = background_instance.transform;
@@ -215,6 +216,7 @@ async fn blend_gpu_image(_: impl Ctx, foreground: ImageFrameTable<Color>, backgr
 		background_instance.source_node_id = None;
 		result_table.push(background_instance);
 	}
+
 	result_table
 }