WIP

node-graph/graster-nodes/src/adjustments.rs

@@ -1,6 +1,5 @@
 #![allow(clippy::too_many_arguments)]
 
-use crate::curve::CubicSplines;
 use dyn_any::DynAny;
 use graphene_core::Node;
 use graphene_core::blending::BlendMode;
@@ -8,12 +7,12 @@ use graphene_core::color::Color;
 use graphene_core::color::Pixel;
 use graphene_core::context::Ctx;
 use graphene_core::gradient::GradientStops;
-use graphene_core::raster::image::Image;
-use graphene_core::raster_types::{CPU, Raster, RasterDataTable};
 use graphene_core::registry::types::{Angle, Percentage, SignedPercentage};
+use graphene_raster::curve::CubicSplines;
+use graphene_raster::image::Image;
+use graphene_raster::{CPU, Raster, RasterDataTable};
 use std::cmp::Ordering;
 use std::fmt::Debug;
-
 // TODO: Implement the following:
 // Color Balance
 // Aims for interoperable compatibility with:
@@ -1181,8 +1180,8 @@ fn color_overlay<T: Adjust<Color>>(
 mod test {
 	use graphene_core::blending::BlendMode;
 	use graphene_core::color::Color;
-	use graphene_core::raster::image::Image;
-	use graphene_core::raster_types::{Raster, RasterDataTable};
+	use graphene_raster::image::Image;
+	use graphene_raster::{Raster, RasterDataTable};
 
 	#[tokio::test]
 	async fn color_overlay_multiply() {

node-graph/graster-nodes/src/dehaze.rs

@@ -1,7 +1,7 @@
 use graphene_core::context::Ctx;
-use graphene_core::raster::image::Image;
-use graphene_core::raster_types::{CPU, Raster, RasterDataTable};
 use graphene_core::registry::types::Percentage;
+use graphene_raster::image::Image;
+use graphene_raster::{CPU, Raster, RasterDataTable};
 use image::{DynamicImage, GenericImage, GenericImageView, GrayImage, ImageBuffer, Luma, Rgba, RgbaImage};
 use ndarray::{Array2, ArrayBase, Dim, OwnedRepr};
 use std::cmp::{max, min};

node-graph/graster-nodes/src/filter.rs

@@ -1,9 +1,9 @@
 use graphene_core::color::Color;
 use graphene_core::context::Ctx;
-use graphene_core::raster::image::Image;
-use graphene_core::raster::{Bitmap, BitmapMut};
-use graphene_core::raster_types::{CPU, Raster, RasterDataTable};
 use graphene_core::registry::types::PixelLength;
+use graphene_raster::bitmap::{Bitmap, BitmapMut};
+use graphene_raster::image::Image;
+use graphene_raster::{CPU, Raster, RasterDataTable};
 
 /// Blurs the image with a Gaussian or blur kernel filter.
 #[node_macro::node(category("Raster: Filter"))]

node-graph/graster-nodes/src/image_color_palette.rs

@@ -1,6 +1,6 @@
 use graphene_core::color::Color;
 use graphene_core::context::Ctx;
-use graphene_core::raster_types::{CPU, RasterDataTable};
+use graphene_raster::{CPU, RasterDataTable};
 
 #[node_macro::node(category("Color"))]
 async fn image_color_palette(
@@ -65,8 +65,8 @@ async fn image_color_palette(
 #[cfg(test)]
 mod test {
 	use super::*;
-	use graphene_core::raster::image::Image;
-	use graphene_core::raster_types::{Raster, RasterDataTable};
+	use graphene_raster::image::Image;
+	use graphene_raster::{Raster, RasterDataTable};
 
 	#[test]
 	fn test_image_color_palette() {

node-graph/graster-nodes/src/std_nodes.rs

@@ -8,10 +8,11 @@ use graphene_core::color::{Alpha, AlphaMut, Channel, LinearChannel, Luminance, R
 use graphene_core::context::{Ctx, ExtractFootprint};
 use graphene_core::instances::Instance;
 use graphene_core::math::bbox::Bbox;
-use graphene_core::raster::image::Image;
-use graphene_core::raster::{Bitmap, BitmapMut};
-use graphene_core::raster_types::{CPU, Raster, RasterDataTable};
 use graphene_core::transform::Transform;
+use graphene_raster::bitmap::{Bitmap, BitmapMut};
+use graphene_raster::image::Image;
+use graphene_raster::transform::FootprintExt;
+use graphene_raster::{CPU, Raster, RasterDataTable};
 use rand::prelude::*;
 use rand_chacha::ChaCha8Rng;
 use std::fmt::Debug;