gcore-shaders: move ChoiceType, switch Cow for &str, adjust node macro

Author: Firestar99

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

@@ -1938,7 +1938,7 @@ pub mod choice {
 	use super::ParameterWidgetsInfo;
 	use crate::messages::tool::tool_messages::tool_prelude::*;
 	use graph_craft::document::value::TaggedValue;
-	use graphene_std::registry::{ChoiceTypeStatic, ChoiceWidgetHint};
+	use graphene_std::choice_type::{ChoiceTypeStatic, ChoiceWidgetHint};
 	use std::marker::PhantomData;
 
 	pub trait WidgetFactory {
@@ -1998,10 +1998,7 @@ pub mod choice {
 						.map(|(item, metadata)| {
 							let updater = updater_factory();
 							let committer = committer_factory();
-							MenuListEntry::new(metadata.name.as_ref())
-								.label(metadata.label.as_ref())
-								.on_update(move |_| updater(item))
-								.on_commit(committer)
+							MenuListEntry::new(metadata.name).label(metadata.label).on_update(move |_| updater(item)).on_commit(committer)
 						})
 						.collect()
 				})
@@ -2020,11 +2017,11 @@ pub mod choice {
 				.map(|(item, var_meta)| {
 					let updater = updater_factory();
 					let committer = committer_factory();
-					let entry = RadioEntryData::new(var_meta.name.as_ref()).on_update(move |_| updater(item)).on_commit(committer);
+					let entry = RadioEntryData::new(var_meta.name).on_update(move |_| updater(item)).on_commit(committer);
 					match (var_meta.icon.as_deref(), var_meta.docstring.as_deref()) {
-						(None, None) => entry.label(var_meta.label.as_ref()),
-						(None, Some(doc)) => entry.label(var_meta.label.as_ref()).tooltip(doc),
-						(Some(icon), None) => entry.icon(icon).tooltip(var_meta.label.as_ref()),
+						(None, None) => entry.label(var_meta.label),
+						(None, Some(doc)) => entry.label(var_meta.label).tooltip(doc),
+						(Some(icon), None) => entry.icon(icon).tooltip(var_meta.label),
 						(Some(icon), Some(doc)) => entry.icon(icon).tooltip(format!("{}\n\n{}", var_meta.label, doc)),
 					}
 				})

editor/src/messages/portfolio/menu_bar/menu_bar_message_handler.rs

@@ -419,7 +419,7 @@ impl LayoutHolder for MenuBarMessageHandler {
 							action: MenuBarEntry::no_action(),
 							disabled: no_active_document || !has_selected_layers,
 							children: MenuBarEntryChildren(vec![{
-								let list = <BooleanOperation as graphene_std::registry::ChoiceTypeStatic>::list();
+								let list = <BooleanOperation as graphene_std::choice_type::ChoiceTypeStatic>::list();
 								list.iter()
 									.flat_map(|i| i.iter())
 									.map(move |(operation, info)| MenuBarEntry {

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

@@ -187,7 +187,7 @@ impl SelectTool {
 	}
 
 	fn boolean_widgets(&self, selected_count: usize) -> impl Iterator<Item = WidgetHolder> + use<> {
-		let list = <BooleanOperation as graphene_std::registry::ChoiceTypeStatic>::list();
+		let list = <BooleanOperation as graphene_std::choice_type::ChoiceTypeStatic>::list();
 		list.iter().flat_map(|i| i.iter()).map(move |(operation, info)| {
 			let mut tooltip = info.label.to_string();
 			if let Some(doc) = info.docstring.as_deref() {

node-graph/gcore-shaders/src/choice_type.rs

@@ -0,0 +1,26 @@
+pub trait ChoiceTypeStatic: Sized + Copy + crate::AsU32 + Send + Sync {
+	const WIDGET_HINT: ChoiceWidgetHint;
+	const DESCRIPTION: Option<&'static str>;
+	fn list() -> &'static [&'static [(Self, VariantMetadata)]];
+}
+
+pub enum ChoiceWidgetHint {
+	Dropdown,
+	RadioButtons,
+}
+
+/// Translation struct between macro and definition.
+#[derive(Clone, Debug)]
+pub struct VariantMetadata {
+	/// Name as declared in source code.
+	pub name: &'static str,
+
+	/// Name to be displayed in UI.
+	pub label: &'static str,
+
+	/// User-facing documentation text.
+	pub docstring: Option<&'static str>,
+
+	/// Name of icon to display in radio buttons and such.
+	pub icon: Option<&'static str>,
+}

node-graph/gcore-shaders/src/lib.rs

@@ -1,6 +1,7 @@
 pub use glam;
 
 pub mod blending;
+pub mod choice_type;
 pub mod color;
 
 pub trait AsU32 {

node-graph/gcore/src/lib.rs

@@ -37,6 +37,7 @@ pub use ctor;
 pub use dyn_any::{StaticTypeSized, WasmNotSend, WasmNotSync};
 pub use graphene_core_shaders::AsU32;
 pub use graphene_core_shaders::blending;
+pub use graphene_core_shaders::choice_type;
 pub use graphene_core_shaders::color;
 pub use graphic_element::{Artboard, ArtboardGroupTable, GraphicElement, GraphicGroupTable};
 pub use memo::MemoHash;

node-graph/gcore/src/registry.rs

@@ -1,6 +1,5 @@
 use crate::{Node, NodeIO, NodeIOTypes, ProtoNodeIdentifier, Type, WasmNotSend};
 use dyn_any::{DynAny, StaticType};
-use std::borrow::Cow;
 use std::collections::HashMap;
 use std::marker::PhantomData;
 use std::ops::Deref;
@@ -59,33 +58,6 @@ pub struct FieldMetadata {
 	pub unit: Option<&'static str>,
 }
 
-pub trait ChoiceTypeStatic: Sized + Copy + crate::AsU32 + Send + Sync {
-	const WIDGET_HINT: ChoiceWidgetHint;
-	const DESCRIPTION: Option<&'static str>;
-	fn list() -> &'static [&'static [(Self, VariantMetadata)]];
-}
-
-pub enum ChoiceWidgetHint {
-	Dropdown,
-	RadioButtons,
-}
-
-/// Translation struct between macro and definition.
-#[derive(Clone, Debug)]
-pub struct VariantMetadata {
-	/// Name as declared in source code.
-	pub name: Cow<'static, str>,
-
-	/// Name to be displayed in UI.
-	pub label: Cow<'static, str>,
-
-	/// User-facing documentation text.
-	pub docstring: Option<Cow<'static, str>>,
-
-	/// Name of icon to display in radio buttons and such.
-	pub icon: Option<Cow<'static, str>>,
-}
-
 #[derive(Clone, Debug)]
 pub enum RegistryWidgetOverride {
 	None,

node-graph/node-macro/src/derive_choice_type.rs

@@ -111,13 +111,21 @@ fn derive_enum(enum_attributes: &[Attribute], name: Ident, input: syn::DataEnum)
 		})
 		.collect();
 
-	let crate_name = proc_macro_crate::crate_name("graphene-core")
-		.map_err(|e| syn::Error::new(Span::call_site(), format!("Failed to find location of graphene_core. Make sure it is imported as a dependency: {}", e)))?;
-	let crate_name = match crate_name {
-		proc_macro_crate::FoundCrate::Itself => quote!(crate),
-		proc_macro_crate::FoundCrate::Name(name) => {
-			let identifier = Ident::new(&name, Span::call_site());
-			quote! { #identifier }
+	let crate_name = {
+		let crate_name = proc_macro_crate::crate_name("graphene-core-shaders")
+			.or_else(|_e| proc_macro_crate::crate_name("graphene-core"))
+			.map_err(|e| {
+				syn::Error::new(
+					Span::call_site(),
+					format!("Failed to find location of 'graphene_core' or 'graphene-core-shaders'. Make sure it is imported as a dependency: {}", e),
+				)
+			})?;
+		match crate_name {
+			proc_macro_crate::FoundCrate::Itself => quote!(crate),
+			proc_macro_crate::FoundCrate::Name(name) => {
+				let identifier = Ident::new(&name, Span::call_site());
+				quote! { #identifier }
+			}
 		}
 	};
 
@@ -140,19 +148,19 @@ fn derive_enum(enum_attributes: &[Attribute], name: Ident, input: syn::DataEnum)
 					let docstring = match &variant.basic_item.description {
 						Some(s) => {
 							let s = s.trim();
-							quote! { Some(::std::borrow::Cow::Borrowed(#s)) }
+							quote! { Some(#s) }
 						}
 						None => quote! { None },
 					};
 					let icon = match &variant.basic_item.icon {
-						Some(s) => quote! { Some(::std::borrow::Cow::Borrowed(#s)) },
+						Some(s) => quote! { Some(#s) },
 						None => quote! { None },
 					};
 					quote! {
 						(
-							#name::#vname, #crate_name::registry::VariantMetadata {
-								name: ::std::borrow::Cow::Borrowed(#vname_str),
-								label: ::std::borrow::Cow::Borrowed(#label),
+							#name::#vname, #crate_name::choice_type::VariantMetadata {
+								name: #vname_str,
+								label: #label,
 								docstring: #docstring,
 								icon: #icon,
 							}
@@ -174,10 +182,10 @@ fn derive_enum(enum_attributes: &[Attribute], name: Ident, input: syn::DataEnum)
 			}
 		}
 
-		impl #crate_name::registry::ChoiceTypeStatic for #name {
-			const WIDGET_HINT: #crate_name::registry::ChoiceWidgetHint = #crate_name::registry::ChoiceWidgetHint::#widget_hint;
+		impl #crate_name::choice_type::ChoiceTypeStatic for #name {
+			const WIDGET_HINT: #crate_name::choice_type::ChoiceWidgetHint = #crate_name::choice_type::ChoiceWidgetHint::#widget_hint;
 			const DESCRIPTION: Option<&'static str> = #enum_description;
-			fn list() -> &'static [&'static [(Self, #crate_name::registry::VariantMetadata)]] {
+			fn list() -> &'static [&'static [(Self, #crate_name::choice_type::VariantMetadata)]] {
 				&[ #(#group)* ]
 			}
 		}