Raster Spike

Cargo.toml

@@ -92,6 +92,7 @@ core-types = { path = "node-graph/libraries/core-types" }
 raster-types = { path = "node-graph/libraries/raster-types" }
 vector-types = { path = "node-graph/libraries/vector-types" }
 graphic-types = { path = "node-graph/libraries/graphic-types" }
+raster-kernels = { path = "node-graph/libraries/raster-kernels" }
 brush-types = { path = "node-graph/libraries/brush-types" }
 rendering = { path = "node-graph/libraries/rendering" }
 brush-nodes = { path = "node-graph/nodes/brush" }
@@ -297,6 +298,6 @@ debug = true
 [patch.crates-io]
 rfd = { git = "https://github.com/timon-schelling/rfd.git", branch = "graphite" } # TODO: Remove this once https://github.com/PolyMeilex/rfd/pull/317 is merged and released
 # TODO: Remove these once the fork's fixes are upstreamed and released
-vello_gpu = { git = "https://github.com/Keavon/vello.git", rev = "f20a8dde35de04c44d05e88b33864f27ad7d6f70" }
-vello_common = { git = "https://github.com/Keavon/vello.git", rev = "f20a8dde35de04c44d05e88b33864f27ad7d6f70" }
-vello_gpu_shaders = { git = "https://github.com/Keavon/vello.git", rev = "f20a8dde35de04c44d05e88b33864f27ad7d6f70" }
+vello_gpu = { git = "https://github.com/Keavon/vello.git", rev = "41dfe98e61b6322db38301025cc7eff51d6e9844" }
+vello_common = { git = "https://github.com/Keavon/vello.git", rev = "41dfe98e61b6322db38301025cc7eff51d6e9844" }
+vello_gpu_shaders = { git = "https://github.com/Keavon/vello.git", rev = "41dfe98e61b6322db38301025cc7eff51d6e9844" }

desktop/src/render/state.rs

@@ -21,7 +21,7 @@ pub(crate) struct RenderState {
 	ui_texture: Option<wgpu::Texture>,
 	bind_group: Option<wgpu::BindGroup>,
 	#[derivative(Debug = "ignore")]
-	overlays_scene: Option<VelloSceneBuilder>,
+	overlays_scene: Option<VelloSceneBuilder<'static>>,
 	#[derivative(Debug = "ignore")]
 	overlays_canvas: VelloCanvas,
 	surface_outdated: bool,
@@ -220,7 +220,7 @@ impl RenderState {
 		self.viewport_offset = offset;
 	}
 
-	pub(crate) fn set_overlays_scene(&mut self, scene: VelloSceneBuilder) {
+	pub(crate) fn set_overlays_scene(&mut self, scene: VelloSceneBuilder<'static>) {
 		self.surface_outdated = true;
 		self.overlays_scene = Some(scene);
 	}

desktop/wrapper/src/messages.rs

@@ -40,7 +40,7 @@ pub enum DesktopFrontendMessage {
 	WindowUpdateDirectInput {
 		enabled: bool,
 	},
-	UpdateOverlays(Box<wgpu_executor::VelloSceneBuilder>),
+	UpdateOverlays(Box<wgpu_executor::VelloSceneBuilder<'static>>),
 	PersistenceUpdatePreferences {
 		preferences: Preferences,
 	},

editor/src/messages/portfolio/document/data_panel/data_panel_message_handler.rs

@@ -11,6 +11,7 @@ use graphene_std::animation::RealTimeMode;
 use graphene_std::blending::BlendMode;
 use graphene_std::color::SRGBA8;
 use graphene_std::core_types::misc::format_f64;
+use graphene_std::generator::Generator;
 use graphene_std::gradient::Gradient;
 use graphene_std::list::{INTERNAL_ATTRIBUTE_PREFIX, Item, List, NodeIdPath};
 use graphene_std::math::float_noise::round_away_float_noise;
@@ -32,7 +33,7 @@ use graphene_std::vector::style::{
 	DashPattern, FillChoice, GradientForm, GradientHueDirection, GradientInterpolation, GradientRamp, GradientSettings, GradientSpace, GradientSpread, StrokeAlign, StrokeCap, StrokeJoin,
 };
 use graphene_std::vector::{CurveType, Path, PointId, QRCodeErrorCorrectionLevel, SegmentId, Vector};
-use graphene_std::{Appearance, Artboard, Color, ContextFeatures, ContextOverrides, Cover, Coverage, Graphic};
+use graphene_std::{Appearance, Artboard, BevelDirection, BevelStyle, Color, ContextFeatures, ContextOverrides, Cover, Coverage, Effect, EffectKind, Effects, GlowSource, Graphic};
 use kurbo::BezPath;
 use std::any::Any;
 use std::sync::Arc;
@@ -377,6 +378,7 @@ macro_rules! inspectable_types {
 			List<Raster<GPU>>,
 			List<Color>,
 			List<Gradient>,
+			List<Generator>,
 			List<String>,
 			List<f64>,
 			List<i64>,
@@ -433,6 +435,7 @@ macro_rules! inspectable_types {
 			Item<Raster<GPU>>,
 			Item<Color>,
 			Item<Gradient>,
+			Item<Generator>,
 			Item<String>,
 			Item<f64>,
 			Item<i64>,
@@ -776,6 +779,45 @@ impl TableItemLayout for Coverage {
 	}
 }
 
+impl TableItemLayout for Effects {
+	fn type_name() -> &'static str {
+		"Effects"
+	}
+	fn identifier(&self) -> String {
+		"Effects".to_string()
+	}
+	// The wrapping `Item` already contributes the breadcrumb; the inner list supplies the next level
+	fn layout_with_breadcrumb(&self, data: &mut LayoutData) -> Vec<LayoutGroup> {
+		self.value_page(data)
+	}
+	// Label the spreadsheet's element button with the inner list's identifier, like Appearance
+	fn value_widgets(&self, target: PathStep, data: &LayoutData) -> Vec<WidgetInstance> {
+		self.0.value_widgets(target, data)
+	}
+	fn value_page(&self, data: &mut LayoutData) -> Vec<LayoutGroup> {
+		self.0.layout_with_breadcrumb(data)
+	}
+}
+
+impl TableItemLayout for Effect {
+	fn type_name() -> &'static str {
+		"Effect"
+	}
+	fn identifier(&self) -> String {
+		"Effect".to_string()
+	}
+	// The wrapping row already contributes the breadcrumb; the inner item supplies the next level
+	fn layout_with_breadcrumb(&self, data: &mut LayoutData) -> Vec<LayoutGroup> {
+		self.value_page(data)
+	}
+	fn value_widgets(&self, target: PathStep, data: &LayoutData) -> Vec<WidgetInstance> {
+		self.0.value_widgets(target, data)
+	}
+	fn value_page(&self, data: &mut LayoutData) -> Vec<LayoutGroup> {
+		self.0.layout_with_breadcrumb(data)
+	}
+}
+
 impl TableItemLayout for TransferCurve {
 	fn type_name() -> &'static str {
 		"TransferCurve"
@@ -841,6 +883,7 @@ impl TableItemLayout for Graphic {
 			Self::RasterGPU(item) => item.identifier(),
 			Self::Color(item) => item.identifier(),
 			Self::Gradient(item) => item.identifier(),
+			Self::Generator(item) => item.identifier(),
 			Self::Text(item) => item.identifier(),
 			Self::NoneList(list) => list.identifier(),
 			Self::GraphicList(list) => list.identifier(),
@@ -849,6 +892,7 @@ impl TableItemLayout for Graphic {
 			Self::RasterGPUList(list) => list.identifier(),
 			Self::ColorList(list) => list.identifier(),
 			Self::GradientList(list) => list.identifier(),
+			Self::GeneratorList(list) => list.identifier(),
 			Self::TextList(list) => list.identifier(),
 			Self::StrokeList(list) => list.identifier(),
 		}
@@ -866,6 +910,7 @@ impl TableItemLayout for Graphic {
 			Self::RasterGPU(item) => item.layout_with_breadcrumb(data),
 			Self::Color(item) => item.layout_with_breadcrumb(data),
 			Self::Gradient(item) => item.layout_with_breadcrumb(data),
+			Self::Generator(item) => item.layout_with_breadcrumb(data),
 			Self::Text(item) => item.layout_with_breadcrumb(data),
 			Self::NoneList(list) => list.layout_with_breadcrumb(data),
 			Self::GraphicList(list) => list.layout_with_breadcrumb(data),
@@ -874,6 +919,7 @@ impl TableItemLayout for Graphic {
 			Self::RasterGPUList(list) => list.layout_with_breadcrumb(data),
 			Self::ColorList(list) => list.layout_with_breadcrumb(data),
 			Self::GradientList(list) => list.layout_with_breadcrumb(data),
+			Self::GeneratorList(list) => list.layout_with_breadcrumb(data),
 			Self::TextList(list) => list.layout_with_breadcrumb(data),
 			Self::StrokeList(list) => list.layout_with_breadcrumb(data),
 		}
@@ -1197,6 +1243,11 @@ macro_rules! impl_table_item_layout_for_choice_enum {
 impl_table_item_layout_for_choice_enum!(
 	BlendMode,
 	Cover,
+	BevelDirection,
+	BevelStyle,
+	EffectKind,
+	Generator,
+	GlowSource,
 	GradientForm,
 	GradientSpread,
 	GradientSpace,
@@ -1343,9 +1394,11 @@ macro_rules! known_item_types {
 			List<Raster<GPU>>,
 			List<Color>,
 			List<Gradient>,
+			List<Generator>,
 			List<String>,
 			List<f64>,
 			Gradient,
+			Generator,
 			Color,
 			NodeId,
 			DAffine2,
@@ -1367,6 +1420,12 @@ macro_rules! known_item_types {
 			Appearance,
 			Coverage,
 			Cover,
+			Effects,
+			Effect,
+			EffectKind,
+			GlowSource,
+			BevelStyle,
+			BevelDirection,
 			DashPattern,
 			BoxCorners,
 			TransferCurve,

editor/src/messages/portfolio/document/document_message.rs

@@ -318,6 +318,9 @@ pub enum DocumentMessage {
 	UpdateAppearanceAttributes {
 		appearance_attributes: HashMap<NodeId, Arc<Appearance>>,
 	},
+	UpdateEffectsReach {
+		effects_reach: HashMap<NodeId, f64>,
+	},
 	Undo,
 	UngroupSelectedLayers,
 	UngroupLayer {

editor/src/messages/portfolio/document/document_message_handler.rs

@@ -1888,6 +1888,14 @@ impl MessageHandler<DocumentMessage, DocumentMessageContext<'_>> for DocumentMes
 					.collect();
 				self.network_interface.update_appearance_attributes(layer_appearance_attributes);
 			}
+			DocumentMessage::UpdateEffectsReach { effects_reach } => {
+				let layer_effects_reach = effects_reach
+					.into_iter()
+					.filter(|(node_id, _)| self.network_interface.document_network().nodes.contains_key(node_id) && self.network_interface.is_layer(node_id, &[]))
+					.map(|(node_id, reach)| (LayerNodeIdentifier::new(node_id, &self.network_interface), reach))
+					.collect();
+				self.network_interface.update_effects_reach(layer_effects_reach);
+			}
 			DocumentMessage::Undo => {
 				if self.network_interface.transaction_status() != TransactionStatus::Finished {
 					return;

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

@@ -759,20 +759,26 @@ impl<'a> ModifyInputsContext<'a> {
 		self.responses.add(NodeGraphMessage::RunDocumentGraph);
 	}
 
-	/// Write the Gradient Form to the last 'Gradient Form' node in the chain, inserting one only when the value differs
+	/// Write the Gradient Form's curvatures to the last 'Gradient Curvature' node in the chain, inserting one only when the form differs
 	/// from the default (`Linear`).
 	pub fn gradient_form_set(&mut self, gradient_form: GradientForm) {
+		use graphene_std::math_nodes::gradient_curvature::{EndCurvatureInput, IDENTIFIER, StartCurvatureInput};
+		use graphene_std::renderer::dial_gradient::{LINEAR_DIALS, RADIAL_DIALS};
+
 		let Some(output_layer) = self.get_output_layer() else { return };
 
 		let target_input = gradient_chain_target_input(output_layer, self.network_interface);
-		let identifier = graphene_std::math_nodes::gradient_form::IDENTIFIER;
 		let create_if_nonexistent = gradient_form != GradientForm::default();
-		let Some(node_id) = self.existing_proto_node_id_at(&target_input, identifier, create_if_nonexistent) else {
+		let Some(node_id) = self.existing_proto_node_id_at(&target_input, IDENTIFIER, create_if_nonexistent) else {
 			return;
 		};
 
-		let input_connector = InputConnector::node(node_id, graphene_std::math_nodes::gradient_form::GradientFormInput);
-		self.set_input_with_refresh(input_connector, NodeInput::value(TaggedValue::GradientForm(gradient_form), false), false);
+		let [start, end] = match gradient_form {
+			GradientForm::Linear => LINEAR_DIALS,
+			GradientForm::Radial => RADIAL_DIALS,
+		};
+		self.set_input_with_refresh(InputConnector::node(node_id, StartCurvatureInput), NodeInput::value(TaggedValue::Number(start), false), false);
+		self.set_input_with_refresh(InputConnector::node(node_id, EndCurvatureInput), NodeInput::value(TaggedValue::Number(end), false), false);
 	}
 
 	/// Set the spread on the chain's gradient value, which is where the ramp carries it.