Refactor vector data type from document-legacy into node graph

document-legacy/src/consts.rs

@@ -1,9 +1,3 @@
-use graphene_core::raster::color::Color;
-
-// RENDERING
-pub const LAYER_OUTLINE_STROKE_COLOR: Color = Color::BLACK;
-pub const LAYER_OUTLINE_STROKE_WEIGHT: f64 = 1.;
-
 // BOOLEAN OPERATIONS
 
 // Bezier curve intersection algorithm

document-legacy/src/layers/mod.rs

@@ -25,6 +25,13 @@ pub mod layer_info;
 pub mod nodegraph_layer;
 /// Contains the [ShapeLayer](shape_layer::ShapeLayer) type, a generic SVG element defined using Bezier paths.
 pub mod shape_layer;
-pub mod style;
 /// Contains the [TextLayer](text_layer::TextLayer) type.
 pub mod text_layer;
+
+mod render_data;
+pub use render_data::RenderData;
+
+pub mod style {
+	pub use super::RenderData;
+	pub use graphene_core::vector::style::*;
+}

document-legacy/src/layers/render_data.rs

@@ -0,0 +1,22 @@
+use super::style::ViewMode;
+use super::text_layer::FontCache;
+
+use glam::DVec2;
+
+/// Contains metadata for rendering the document as an svg
+#[derive(Debug, Clone, Copy)]
+pub struct RenderData<'a> {
+	pub font_cache: &'a FontCache,
+	pub view_mode: ViewMode,
+	pub culling_bounds: Option<[DVec2; 2]>,
+}
+
+impl<'a> RenderData<'a> {
+	pub fn new(font_cache: &'a FontCache, view_mode: ViewMode, culling_bounds: Option<[DVec2; 2]>) -> Self {
+		Self {
+			font_cache,
+			view_mode,
+			culling_bounds,
+		}
+	}
+}

editor/Cargo.toml

@@ -23,8 +23,6 @@ serde_json = { version = "1.0" }
 graphite-proc-macros = { path = "../proc-macros" }
 bezier-rs = { path = "../libraries/bezier-rs" }
 glam = { version="0.22", features = ["serde"] }
-rand_chacha = "0.3.1"
-spin = "0.9.2"
 kurbo = { git = "https://github.com/linebender/kurbo.git", features = [
 	"serde",
 ] }

editor/src/application.rs

@@ -1,15 +1,7 @@
 use crate::dispatcher::Dispatcher;
 use crate::messages::prelude::*;
 
-use rand_chacha::rand_core::{RngCore, SeedableRng};
-use rand_chacha::ChaCha20Rng;
-use spin::Mutex;
-use std::cell::Cell;
-
-static RNG: Mutex<Option<ChaCha20Rng>> = Mutex::new(None);
-thread_local! {
-	pub static UUID_SEED: Cell<Option<u64>> = Cell::new(None);
-}
+pub use graphene_core::uuid::*;
 
 // TODO: serialize with serde to save the current editor state
 pub struct Editor {
@@ -39,21 +31,6 @@ impl Default for Editor {
 	}
 }
 
-pub fn set_uuid_seed(random_seed: u64) {
-	UUID_SEED.with(|seed| seed.set(Some(random_seed)))
-}
-
-pub fn generate_uuid() -> u64 {
-	let mut lock = RNG.lock();
-	if lock.is_none() {
-		UUID_SEED.with(|seed| {
-			let random_seed = seed.get().expect("Random seed not set before editor was initialized");
-			*lock = Some(ChaCha20Rng::seed_from_u64(random_seed));
-		})
-	}
-	lock.as_mut().map(ChaCha20Rng::next_u64).unwrap()
-}
-
 pub fn release_series() -> String {
 	format!("Release Series: {}", env!("GRAPHITE_RELEASE_SERIES"))
 }

node-graph/gcore/Cargo.toml

@@ -33,6 +33,8 @@ kurbo = { git = "https://github.com/linebender/kurbo.git", features = [
 	"serde",
 ], optional = true }
 glam = { version = "^0.22", default-features = false, features = ["scalar-math", "libm"]}
+rand_chacha = "0.3.1"
+spin = "0.9.2"
 node-macro = {path = "../node-macro"}
 specta.workspace = true
 once_cell = { version = "1.17.0", default-features = false }

node-graph/gcore/src/consts.rs

@@ -0,0 +1,5 @@
+use crate::raster::Color;
+
+// RENDERING
+pub const LAYER_OUTLINE_STROKE_COLOR: Color = Color::BLACK;
+pub const LAYER_OUTLINE_STROKE_WEIGHT: f64 = 1.;

node-graph/gcore/src/lib.rs

@@ -7,6 +7,7 @@ extern crate alloc;
 #[cfg(feature = "log")]
 extern crate log;
 
+pub mod consts;
 pub mod generic;
 pub mod ops;
 pub mod structural;
@@ -22,6 +23,7 @@ pub mod raster;
 pub mod vector;
 
 use core::any::TypeId;
+pub use raster::Color;
 
 // pub trait Node: for<'n> NodeIO<'n> {
 pub trait Node<'i, Input: 'i>: 'i {

node-graph/gcore/src/raster/color.rs

@@ -28,7 +28,7 @@ pub struct Color {
 	alpha: f32,
 }
 
-#[allow(clippy::derive_hash_xor_eq)]
+#[allow(clippy::derived_hash_with_manual_eq)]
 impl Hash for Color {
 	fn hash<H: std::hash::Hasher>(&self, state: &mut H) {
 		self.red.to_bits().hash(state);

node-graph/gcore/src/uuid.rs

@@ -40,3 +40,41 @@ mod u64_string {
 		u64::from_str(&s).map_err(serde::de::Error::custom)
 	}
 }
+
+mod uuid_generation {
+	use core::cell::Cell;
+	use rand_chacha::rand_core::{RngCore, SeedableRng};
+	use rand_chacha::ChaCha20Rng;
+	use spin::Mutex;
+
+	static RNG: Mutex<Option<ChaCha20Rng>> = Mutex::new(None);
+	thread_local! {
+		pub static UUID_SEED: Cell<Option<u64>> = Cell::new(None);
+	}
+
+	pub fn set_uuid_seed(random_seed: u64) {
+		UUID_SEED.with(|seed| seed.set(Some(random_seed)))
+	}
+
+	pub fn generate_uuid() -> u64 {
+		let mut lock = RNG.lock();
+		if lock.is_none() {
+			UUID_SEED.with(|seed| {
+				let random_seed = seed.get().unwrap_or(42);
+				*lock = Some(ChaCha20Rng::seed_from_u64(random_seed));
+			})
+		}
+		lock.as_mut().map(ChaCha20Rng::next_u64).expect("uuid mutex poisoned")
+	}
+}
+
+pub use uuid_generation::*;
+
+#[derive(Clone, Copy, PartialEq, Eq)]
+pub struct ManipulatorGroupId(u64);
+
+impl bezier_rs::Identifier for ManipulatorGroupId {
+	fn new() -> Self {
+		Self(generate_uuid())
+	}
+}

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

@@ -1,6 +1,16 @@
 pub mod consts;
 pub mod generator_nodes;
-pub mod id_vec;
 pub mod manipulator_group;
 pub mod manipulator_point;
+
+pub mod style;
+pub use style::PathStyle;
+
 pub mod subpath;
+pub use subpath::Subpath;
+
+mod vector_data;
+pub use vector_data::VectorData;
+
+mod id_vec;
+pub use id_vec::IdBackedVec;