Skip to content

Reexport all of gcore in gstd, rename image node to image_value #2733

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -211,8 +211,8 @@ impl<'a> ModifyInputsContext<'a> {

pub fn insert_image_data(&mut self, image_frame: RasterDataTable<Color>, 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();
Expand Down
2 changes: 1 addition & 1 deletion node-graph/gstd/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"]

Expand Down
11 changes: 6 additions & 5 deletions node-graph/gstd/src/lib.rs
Original file line number Diff line number Diff line change
@@ -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::*;
8 changes: 4 additions & 4 deletions node-graph/gstd/src/raster.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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<Color>) -> RasterDataTable<Color> {
fn image_value(_: impl Ctx, _primary: (), image: RasterDataTable<Color>) -> RasterDataTable<Color> {
image
}

Expand Down
3 changes: 1 addition & 2 deletions node-graph/gstd/src/text.rs
Original file line number Diff line number Diff line change
@@ -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>(
Expand Down
Loading