diff --git a/editor/src/messages/portfolio/document/graph_operation/utility_types.rs b/editor/src/messages/portfolio/document/graph_operation/utility_types.rs index 4aa46c190d..a3bc818e9c 100644 --- a/editor/src/messages/portfolio/document/graph_operation/utility_types.rs +++ b/editor/src/messages/portfolio/document/graph_operation/utility_types.rs @@ -211,8 +211,8 @@ impl<'a> ModifyInputsContext<'a> { pub fn insert_image_data(&mut self, image_frame: RasterDataTable, layer: LayerNodeIdentifier) { let transform = resolve_document_node_type("Transform").expect("Transform node does not exist").default_node_template(); - let image = resolve_document_node_type("Image") - .expect("Image node does not exist") + let image = resolve_document_node_type("Image Value") + .expect("ImageValue node does not exist") .node_template_input_override([Some(NodeInput::value(TaggedValue::None, false)), Some(NodeInput::value(TaggedValue::RasterData(image_frame), false))]); let image_id = NodeId::new(); diff --git a/node-graph/gstd/Cargo.toml b/node-graph/gstd/Cargo.toml index 8763138134..74b222faff 100644 --- a/node-graph/gstd/Cargo.toml +++ b/node-graph/gstd/Cargo.toml @@ -13,7 +13,7 @@ wgpu = ["gpu", "graph-craft/wgpu"] wasm = ["wasm-bindgen", "web-sys"] imaginate = ["image/png", "base64", "web-sys", "wasm-bindgen-futures"] image-compare = [] -vello = ["dep:vello", "gpu"] +vello = ["dep:vello", "gpu", "graphene-core/vello"] resvg = [] wayland = ["graph-craft/wayland"] diff --git a/node-graph/gstd/src/lib.rs b/node-graph/gstd/src/lib.rs index c469d9d375..ef07c3080c 100644 --- a/node-graph/gstd/src/lib.rs +++ b/node-graph/gstd/src/lib.rs @@ -1,12 +1,13 @@ pub mod any; -pub mod http; -pub mod raster; -pub mod text; -pub mod vector; -pub use graphene_core::*; pub mod brush; pub mod dehaze; pub mod filter; +pub mod http; pub mod image_color_palette; +pub mod raster; +pub mod text; +pub mod vector; #[cfg(feature = "wasm")] pub mod wasm_application_io; + +pub use graphene_core::*; diff --git a/node-graph/gstd/src/raster.rs b/node-graph/gstd/src/raster.rs index 0f2befb2cb..5dd51c0e49 100644 --- a/node-graph/gstd/src/raster.rs +++ b/node-graph/gstd/src/raster.rs @@ -3,10 +3,10 @@ use fastnoise_lite; use glam::{DAffine2, DVec2, Vec2}; use graphene_core::instances::Instance; use graphene_core::raster::bbox::Bbox; -use graphene_core::raster::image::{Image, RasterDataTable}; -use graphene_core::raster::{Alpha, AlphaMut, Bitmap, BitmapMut, CellularDistanceFunction, CellularReturnType, Channel, DomainWarpType, FractalType, LinearChannel, Luminance, NoiseType, RGBMut}; +use graphene_core::raster::image::RasterDataTable; +pub use graphene_core::raster::*; use graphene_core::transform::Transform; -use graphene_core::{AlphaBlending, Color, Ctx, ExtractFootprint}; +use graphene_core::{AlphaBlending, Ctx, ExtractFootprint}; use rand::prelude::*; use rand_chacha::ChaCha8Rng; use std::fmt::Debug; @@ -301,7 +301,7 @@ fn empty_image(_: impl Ctx, transform: DAffine2, color: Color) -> RasterDataTabl /// Constructs a raster image. #[node_macro::node(category(""))] -fn image(_: impl Ctx, _primary: (), image: RasterDataTable) -> RasterDataTable { +fn image_value(_: impl Ctx, _primary: (), image: RasterDataTable) -> RasterDataTable { image } diff --git a/node-graph/gstd/src/text.rs b/node-graph/gstd/src/text.rs index 999e6bb730..0f69ae1bfc 100644 --- a/node-graph/gstd/src/text.rs +++ b/node-graph/gstd/src/text.rs @@ -1,8 +1,7 @@ use crate::vector::{VectorData, VectorDataTable}; use graph_craft::wasm_application_io::WasmEditorApi; use graphene_core::Ctx; -use graphene_core::text::TypesettingConfig; -pub use graphene_core::text::{Font, FontCache, bounding_box, load_face, to_path}; +pub use graphene_core::text::*; #[node_macro::node(category(""))] fn text<'i: 'n>(