Extract gmath_nodes from gcore::ops, create mods debug and extract_xy

Author: Firestar99

Cargo.lock

@@ -7,6 +7,7 @@ members = [
 	"node-graph/gapplication-io",
 	"node-graph/gcore",
 	"node-graph/gstd",
+	"node-graph/gmath-nodes",
 	"node-graph/gpath-bool",
 	"node-graph/graph-craft",
 	"node-graph/graphene-cli",
@@ -25,6 +26,7 @@ default-members = [
 	"frontend/wasm",
 	"node-graph/gcore",
 	"node-graph/gstd",
+	"node-graph/gmath-nodes",
 	"node-graph/gpath-bool",
 	"node-graph/graph-craft",
 	"node-graph/graphene-cli",
@@ -43,6 +45,7 @@ math-parser = { path = "libraries/math-parser" }
 path-bool = { path = "libraries/path-bool" }
 graphene-application-io = { path = "node-graph/gapplication-io" }
 graphene-core = { path = "node-graph/gcore" }
+graphene-math-nodes = { path = "node-graph/gmath-nodes" }
 graphene-path-bool = { path = "node-graph/gpath-bool" }
 graph-craft = { path = "node-graph/graph-craft" }
 graphene-std = { path = "node-graph/gstd" }

Cargo.toml

@@ -16,7 +16,7 @@ use graph_craft::ProtoNodeIdentifier;
 use graph_craft::concrete;
 use graph_craft::document::value::*;
 use graph_craft::document::*;
-use graphene_std::ops::XY;
+use graphene_std::extract_xy::XY;
 use graphene_std::raster::brush_cache::BrushCache;
 use graphene_std::raster::{CellularDistanceFunction, CellularReturnType, Color, DomainWarpType, FractalType, NoiseType, RedGreenBlueAlpha};
 use graphene_std::raster_types::{CPU, RasterDataTable};

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

@@ -12,7 +12,7 @@ use graph_craft::Type;
 use graph_craft::document::value::TaggedValue;
 use graph_craft::document::{DocumentNode, DocumentNodeImplementation, NodeId, NodeInput};
 use graphene_std::animation::RealTimeMode;
-use graphene_std::ops::XY;
+use graphene_std::extract_xy::XY;
 use graphene_std::path_bool::BooleanOperation;
 use graphene_std::raster::curve::Curve;
 use graphene_std::raster::{
@@ -1840,7 +1840,7 @@ pub fn offset_path_properties(node_id: NodeId, context: &mut NodePropertiesConte
 }
 
 pub fn math_properties(node_id: NodeId, context: &mut NodePropertiesContext) -> Vec<LayoutGroup> {
-	use graphene_std::ops::math::*;
+	use graphene_std::math_nodes::math::*;
 
 	let document_node = match get_document_node(node_id, context) {
 		Ok(document_node) => document_node,

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

@@ -24,6 +24,51 @@ const REPLACEMENTS: &[(&str, &str)] = &[
 	("graphene_core::ConstructArtboardNode", "graphene_core::graphic_element::ToArtboardNode"),
 	("graphene_core::ToGraphicElementNode", "graphene_core::graphic_element::ToElementNode"),
 	("graphene_core::ToGraphicGroupNode", "graphene_core::graphic_element::ToGroupNode"),
+	("graphene_core::ops::MathNode", "graphene_math_nodes::MathNode"),
+	("graphene_core::ops::AddNode", "graphene_math_nodes::AddNode"),
+	("graphene_core::ops::SubtractNode", "graphene_math_nodes::SubtractNode"),
+	("graphene_core::ops::MultiplyNode", "graphene_math_nodes::MultiplyNode"),
+	("graphene_core::ops::DivideNode", "graphene_math_nodes::DivideNode"),
+	("graphene_core::ops::ModuloNode", "graphene_math_nodes::ModuloNode"),
+	("graphene_core::ops::ExponentNode", "graphene_math_nodes::ExponentNode"),
+	("graphene_core::ops::RootNode", "graphene_math_nodes::RootNode"),
+	("graphene_core::ops::LogarithmNode", "graphene_math_nodes::LogarithmNode"),
+	("graphene_core::ops::SineNode", "graphene_math_nodes::SineNode"),
+	("graphene_core::ops::CosineNode", "graphene_math_nodes::CosineNode"),
+	("graphene_core::ops::TangentNode", "graphene_math_nodes::TangentNode"),
+	("graphene_core::ops::SineInverseNode", "graphene_math_nodes::SineInverseNode"),
+	("graphene_core::ops::CosineInverseNode", "graphene_math_nodes::CosineInverseNode"),
+	("graphene_core::ops::TangentInverseNode", "graphene_math_nodes::TangentInverseNode"),
+	("graphene_core::ops::RandomNode", "graphene_math_nodes::RandomNode"),
+	("graphene_core::ops::ToU32Node", "graphene_math_nodes::ToU32Node"),
+	("graphene_core::ops::ToU64Node", "graphene_math_nodes::ToU64Node"),
+	("graphene_core::ops::ToF64Node", "graphene_math_nodes::ToF64Node"),
+	("graphene_core::ops::RoundNode", "graphene_math_nodes::RoundNode"),
+	("graphene_core::ops::FloorNode", "graphene_math_nodes::FloorNode"),
+	("graphene_core::ops::CeilingNode", "graphene_math_nodes::CeilingNode"),
+	("graphene_core::ops::MinNode", "graphene_math_nodes::MinNode"),
+	("graphene_core::ops::MaxNode", "graphene_math_nodes::MaxNode"),
+	("graphene_core::ops::ClampNode", "graphene_math_nodes::ClampNode"),
+	("graphene_core::ops::EqualsNode", "graphene_math_nodes::EqualsNode"),
+	("graphene_core::ops::NotEqualsNode", "graphene_math_nodes::NotEqualsNode"),
+	("graphene_core::ops::LessThanNode", "graphene_math_nodes::LessThanNode"),
+	("graphene_core::ops::GreaterThanNode", "graphene_math_nodes::GreaterThanNode"),
+	("graphene_core::ops::LogicalOrNode", "graphene_math_nodes::LogicalOrNode"),
+	("graphene_core::ops::LogicalAndNode", "graphene_math_nodes::LogicalAndNode"),
+	("graphene_core::ops::LogicalNotNode", "graphene_math_nodes::LogicalNotNode"),
+	("graphene_core::ops::BoolValueNode", "graphene_math_nodes::BoolValueNode"),
+	("graphene_core::ops::NumberValueNode", "graphene_math_nodes::NumberValueNode"),
+	("graphene_core::ops::PercentageValueNode", "graphene_math_nodes::PercentageValueNode"),
+	("graphene_core::ops::CoordinateValueNode", "graphene_math_nodes::CoordinateValueNode"),
+	("graphene_core::ops::ColorValueNode", "graphene_math_nodes::ColorValueNode"),
+	("graphene_core::ops::GradientValueNode", "graphene_math_nodes::GradientValueNode"),
+	("graphene_core::ops::StringValueNode", "graphene_math_nodes::StringValueNode"),
+	("graphene_core::ops::DotProductNode", "graphene_math_nodes::DotProductNode"),
+	("graphene_core::ops::SizeOfNode", "graphene_core::debug::SizeOfNode"),
+	("graphene_core::ops::SomeNode", "graphene_core::debug::SomeNode"),
+	("graphene_core::ops::UnwrapNode", "graphene_core::debug::UnwrapNode"),
+	("graphene_core::ops::CloneNode", "graphene_core::debug::CloneNode"),
+	("graphene_core::ops::ExtractXyNode", "graphene_core::extract_xy::ExtractXyNode"),
 	("graphene_core::logic::LogicAndNode", "graphene_core::ops::LogicAndNode"),
 	("graphene_core::logic::LogicNotNode", "graphene_core::ops::LogicNotNode"),
 	("graphene_core::logic::LogicOrNode", "graphene_core::ops::LogicOrNode"),

editor/src/messages/portfolio/document_migration.rs

@@ -14,9 +14,6 @@ wgpu = ["dep:wgpu"]
 dealloc_nodes = []
 
 [dependencies]
-# Local dependencies
-math-parser = { workspace = true }
-
 # Workspace dependencies
 bytemuck = { workspace = true }
 node-macro = { workspace = true }

node-graph/gcore/Cargo.toml

@@ -0,0 +1,26 @@
+use crate::raster_types::{CPU, RasterDataTable};
+use crate::{Color, Ctx};
+
+/// Meant for debugging purposes, not general use. Returns the size of the input type in bytes.
+#[node_macro::node(category("Debug"))]
+fn size_of(_: impl Ctx, ty: crate::Type) -> Option<usize> {
+	ty.size()
+}
+
+/// Meant for debugging purposes, not general use. Wraps the input value in the Some variant of an Option.
+#[node_macro::node(category("Debug"))]
+fn some<T>(_: impl Ctx, #[implementations(f64, f32, u32, u64, String, Color)] input: T) -> Option<T> {
+	Some(input)
+}
+
+/// Meant for debugging purposes, not general use. Unwraps the input value from an Option, returning the default value if the input is None.
+#[node_macro::node(category("Debug"))]
+fn unwrap<T: Default>(_: impl Ctx, #[implementations(Option<f64>, Option<f32>, Option<u32>, Option<u64>, Option<String>, Option<Color>)] input: Option<T>) -> T {
+	input.unwrap_or_default()
+}
+
+/// Meant for debugging purposes, not general use. Clones the input value.
+#[node_macro::node(category("Debug"))]
+fn clone<'i, T: Clone + 'i>(_: impl Ctx, #[implementations(&RasterDataTable<CPU>)] value: &'i T) -> T {
+	value.clone()
+}

node-graph/gcore/src/debug.rs

@@ -0,0 +1,21 @@
+use crate::Ctx;
+use dyn_any::DynAny;
+use glam::{DVec2, IVec2, UVec2};
+
+/// Obtain the X or Y component of a coordinate.
+#[node_macro::node(name("Extract XY"), category("Math: Vector"))]
+fn extract_xy<T: Into<DVec2>>(_: impl Ctx, #[implementations(DVec2, IVec2, UVec2)] vector: T, axis: XY) -> f64 {
+	match axis {
+		XY::X => vector.into().x,
+		XY::Y => vector.into().y,
+	}
+}
+
+/// The X or Y component of a coordinate.
+#[derive(Debug, Clone, Copy, Default, PartialEq, Eq, Hash, DynAny, node_macro::ChoiceType, specta::Type, serde::Serialize, serde::Deserialize)]
+#[widget(Dropdown)]
+pub enum XY {
+	#[default]
+	X,
+	Y,
+}

node-graph/gcore/src/extract_xy.rs

@@ -8,6 +8,8 @@ pub mod bounds;
 pub mod color;
 pub mod consts;
 pub mod context;
+pub mod debug;
+pub mod extract_xy;
 pub mod generic;
 pub mod gradient;
 mod graphic_element;