Add node for executing rhai scripts

Author: TrueDoctor

Cargo.lock

@@ -30,7 +30,7 @@ impl DialogLayoutHolder for CloseAllDocumentsDialog {
 
 impl LayoutHolder for CloseAllDocumentsDialog {
 	fn layout(&self) -> Layout {
-		let unsaved_list = "• ".to_string() + &self.unsaved_document_names.join("\n• ");
+		let unsaved_list = "• ".to_string() + self.unsaved_document_names.join("\n• ").as_str();
 
 		Layout::WidgetLayout(WidgetLayout::new(vec![
 			LayoutGroup::Row {

editor/src/messages/dialog/simple_dialogs/close_all_documents_dialog.rs

@@ -130,6 +130,25 @@ fn static_nodes() -> Vec<DocumentNodeDefinition> {
 			description: Cow::Borrowed("The identity node passes its data through. You can use this to organize your node graph."),
 			properties: Some("identity_properties"),
 		},
+		DocumentNodeDefinition {
+			identifier: "Script",
+			category: "General",
+			node_template: NodeTemplate {
+				document_node: DocumentNode {
+					implementation: DocumentNodeImplementation::proto("graphene_std::rhai::RhaiNode"),
+					manual_composition: Some(concrete!(Context)),
+					inputs: vec![NodeInput::value(TaggedValue::F64(0.), true), NodeInput::value(TaggedValue::String("input".into()), false)],
+					..Default::default()
+				},
+				persistent_node_metadata: DocumentNodePersistentMetadata {
+					input_properties: vec!["In".into(), "String".into()],
+					output_names: vec!["Out".to_string()],
+					..Default::default()
+				},
+			},
+			description: Cow::Borrowed(""),
+			properties: Some("script_properties"),
+		},
 		// TODO: Auto-generate this from its proto node macro
 		DocumentNodeDefinition {
 			identifier: "Monitor",
@@ -2897,6 +2916,7 @@ fn static_node_properties() -> NodeProperties {
 		"monitor_properties".to_string(),
 		Box::new(|_node_id, _context| node_properties::string_properties("The Monitor node is used by the editor to access the data flowing through it.")),
 	);
+	map.insert("script_properties".to_string(), Box::new(node_properties::script_properties));
 	map
 }
 

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

@@ -264,6 +264,7 @@ pub(crate) fn property_from_type(
 			}
 		}
 		Type::Generic(_) => vec![TextLabel::new("Generic type (not supported)").widget_holder()].into(),
+		Type::Dynamic => vec![TextLabel::new("Dynamic type (not supported)").widget_holder()].into(),
 		Type::Fn(_, out) => return property_from_type(node_id, index, out, number_options, context),
 		Type::Future(out) => return property_from_type(node_id, index, out, number_options, context),
 	};
@@ -2516,3 +2517,16 @@ pub fn math_properties(node_id: NodeId, context: &mut NodePropertiesContext) ->
 		LayoutGroup::Row { widgets: operand_a_hint }.with_tooltip(r#""A" is fed by the value from the previous node in the primary data flow, or it is 0 if disconnected"#),
 	]
 }
+
+pub(crate) fn script_properties(node_id: NodeId, context: &mut NodePropertiesContext) -> Vec<LayoutGroup> {
+	let document_node = match get_document_node(node_id, context) {
+		Ok(document_node) => document_node,
+		Err(err) => {
+			log::error!("Could not get document node in script_properties: {err}");
+			return Vec::new();
+		}
+	};
+	let source = text_area_widget(document_node, node_id, 1, "Code", false);
+
+	vec![LayoutGroup::Row { widgets: source }]
+}

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

@@ -39,7 +39,7 @@ fn grid_overlay_rectangular(document: &DocumentMessageHandler, overlay_context:
 			overlay_context.line(
 				document_to_viewport.transform_point2(start),
 				document_to_viewport.transform_point2(end),
-				Some(&("#".to_string() + &grid_color.rgba_hex())),
+				Some(&("#".to_string() + grid_color.rgba_hex().as_str())),
 			);
 		}
 	}
@@ -82,7 +82,7 @@ fn grid_overlay_rectangular_dot(document: &DocumentMessageHandler, overlay_conte
 			let exact_x = x_per_dot * dot_index as f64;
 			overlay_context.pixel(
 				document_to_viewport.transform_point2(DVec2::new(start.x + exact_x, start.y)).round(),
-				Some(&("#".to_string() + &grid_color.rgba_hex())),
+				Some(&("#".to_string() + grid_color.rgba_hex().as_str())),
 			)
 		}
 	}
@@ -115,7 +115,7 @@ fn grid_overlay_isometric(document: &DocumentMessageHandler, overlay_context: &m
 		overlay_context.line(
 			document_to_viewport.transform_point2(start),
 			document_to_viewport.transform_point2(end),
-			Some(&("#".to_string() + &grid_color.rgba_hex())),
+			Some(&("#".to_string() + grid_color.rgba_hex().as_str())),
 		);
 	}
 
@@ -133,7 +133,7 @@ fn grid_overlay_isometric(document: &DocumentMessageHandler, overlay_context: &m
 			overlay_context.line(
 				document_to_viewport.transform_point2(start),
 				document_to_viewport.transform_point2(end),
-				Some(&("#".to_string() + &grid_color.rgba_hex())),
+				Some(&("#".to_string() + grid_color.rgba_hex().as_str())),
 			);
 		}
 	}
@@ -180,7 +180,7 @@ fn grid_overlay_isometric_dot(document: &DocumentMessageHandler, overlay_context
 		overlay_context.dashed_line(
 			document_to_viewport.transform_point2(start),
 			document_to_viewport.transform_point2(end),
-			Some(&("#".to_string() + &grid_color.rgba_hex())),
+			Some(&("#".to_string() + grid_color.rgba_hex().as_str())),
 			Some(1.),
 			Some((spacing_x / cos_a) * document_to_viewport.matrix2.x_axis.length() - 1.),
 			None,

editor/src/messages/portfolio/document/overlays/grid_overlays.rs

@@ -464,7 +464,7 @@ impl Fsm for TextToolFsmState {
 					if far.x != 0. && far.y != 0. {
 						let quad = Quad::from_box([DVec2::ZERO, far]);
 						let transformed_quad = document.metadata().transform_to_viewport(tool_data.layer) * quad;
-						overlay_context.quad(transformed_quad, Some(&("#".to_string() + &fill_color)));
+						overlay_context.quad(transformed_quad, Some(&("#".to_string() + fill_color.as_str())));
 					}
 				}
 
@@ -479,11 +479,11 @@ impl Fsm for TextToolFsmState {
 					for layer in document.intersect_quad_no_artboards(quad, input) {
 						overlay_context.quad(
 							Quad::from_box(document.metadata().bounding_box_viewport(layer).unwrap_or([DVec2::ZERO; 2])),
-							Some(&("#".to_string() + &fill_color)),
+							Some(&("#".to_string() + fill_color.as_str())),
 						);
 					}
 
-					overlay_context.quad(quad, Some(&("#".to_string() + &fill_color)));
+					overlay_context.quad(quad, Some(&("#".to_string() + fill_color.as_str())));
 				}
 
 				// TODO: implement bounding box for multiple layers

editor/src/messages/tool/tool_messages/text_tool.rs

@@ -562,10 +562,10 @@ impl NodeGraphExecutor {
 			..
 		} = export_config;
 
-		let file_suffix = &format!(".{file_type:?}").to_lowercase();
+		let file_suffix = format!(".{file_type:?}").to_lowercase();
 		let name = match file_name.ends_with(FILE_SAVE_SUFFIX) {
-			true => file_name.replace(FILE_SAVE_SUFFIX, file_suffix),
-			false => file_name + file_suffix,
+			true => file_name.replace(FILE_SAVE_SUFFIX, &file_suffix),
+			false => file_name + file_suffix.as_str(),
 		};
 
 		if file_type == FileType::Svg {

editor/src/node_graph_executor.rs

@@ -197,6 +197,31 @@ impl<I, O> DowncastBothNode<I, O> {
 		}
 	}
 }
+/// Boxes the input and downcasts the output.
+/// Wraps around a node taking Box<dyn DynAny> and returning Box<dyn DynAny>
+#[derive(Clone)]
+pub struct DowncastNoneNode {
+	node: SharedNodeContainer,
+}
+impl<'input> Node<'input, Any<'input>> for DowncastNoneNode {
+	type Output = FutureAny<'input>;
+	#[inline]
+	fn eval(&'input self, input: Any<'input>) -> Self::Output {
+		self.node.eval(input)
+	}
+	fn reset(&self) {
+		self.node.reset();
+	}
+
+	fn serialize(&self) -> Option<std::sync::Arc<dyn core::any::Any + Send + Sync>> {
+		self.node.serialize()
+	}
+}
+impl DowncastNoneNode {
+	pub const fn new(node: SharedNodeContainer) -> Self {
+		Self { node }
+	}
+}
 pub struct FutureWrapperNode<Node> {
 	node: Node,
 }

node-graph/gcore/src/registry.rs

@@ -207,6 +207,7 @@ pub enum Type {
 	Fn(Box<Type>, Box<Type>),
 	/// Represents a future which promises to return the inner type.
 	Future(Box<Type>),
+	Dynamic,
 }
 
 impl Default for Type {
@@ -258,6 +259,15 @@ impl Type {
 			_ => None,
 		}
 	}
+	pub fn fn_fut_output(&self) -> Option<&Type> {
+		match self {
+			Type::Fn(_, second) => match second.as_ref() {
+				Type::Future(fut) => Some(fut),
+				_ => None,
+			},
+			_ => None,
+		}
+	}
 
 	pub fn function(input: &Type, output: &Type) -> Type {
 		Type::Fn(Box::new(input.clone()), Box::new(output.clone()))
@@ -281,6 +291,7 @@ impl Type {
 			Self::Concrete(ty) => Some(ty.size),
 			Self::Fn(_, _) => None,
 			Self::Future(_) => None,
+			Self::Dynamic => None,
 		}
 	}
 
@@ -290,6 +301,7 @@ impl Type {
 			Self::Concrete(ty) => Some(ty.align),
 			Self::Fn(_, _) => None,
 			Self::Future(_) => None,
+			Self::Dynamic => None,
 		}
 	}
 
@@ -299,6 +311,7 @@ impl Type {
 			Self::Concrete(_) => self,
 			Self::Fn(_, output) => output.nested_type(),
 			Self::Future(output) => output.nested_type(),
+			Self::Dynamic => self,
 		}
 	}
 }
@@ -320,6 +333,7 @@ impl core::fmt::Debug for Type {
 			Self::Concrete(arg0) => write!(f, "Concrete<{}>", format_type(&arg0.name)),
 			Self::Fn(arg0, arg1) => write!(f, "{arg0:?} → {arg1:?}"),
 			Self::Future(arg0) => write!(f, "Future<{arg0:?}>"),
+			Self::Dynamic => write!(f, "Dynamic"),
 		}
 	}
 }
@@ -331,6 +345,7 @@ impl std::fmt::Display for Type {
 			Type::Concrete(ty) => write!(f, "{}", format_type(&ty.name)),
 			Type::Fn(input, output) => write!(f, "{input} → {output}"),
 			Type::Future(ty) => write!(f, "Future<{ty}>"),
+			Self::Dynamic => write!(f, "Dynamic"),
 		}
 	}
 }