diff --git a/Cargo.lock b/Cargo.lock index 9a3c0711b..e98a3270c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2313,7 +2313,7 @@ version = "0.0.0" dependencies = [ "glam", "graph-craft", - "graphene-core", + "graphene-std", "graphite-editor", "js-sys", "log", diff --git a/frontend/wasm/Cargo.toml b/frontend/wasm/Cargo.toml index 44ac26c2d..b97b2f771 100644 --- a/frontend/wasm/Cargo.toml +++ b/frontend/wasm/Cargo.toml @@ -25,11 +25,11 @@ editor = { path = "../../editor", package = "graphite-editor", features = [ "resvg", "vello", ] } +graphene-std = { workspace = true } # Workspace dependencies graph-craft = { workspace = true } log = { workspace = true } -graphene-core = { workspace = true } serde = { workspace = true } wasm-bindgen = { workspace = true } serde-wasm-bindgen = { workspace = true } diff --git a/frontend/wasm/src/editor_api.rs b/frontend/wasm/src/editor_api.rs index 7284cc3fc..88bc85bc3 100644 --- a/frontend/wasm/src/editor_api.rs +++ b/frontend/wasm/src/editor_api.rs @@ -16,7 +16,7 @@ use editor::messages::portfolio::utility_types::Platform; use editor::messages::prelude::*; use editor::messages::tool::tool_messages::tool_prelude::WidgetId; use graph_craft::document::NodeId; -use graphene_core::raster::color::Color; +use graphene_std::raster::color::Color; use serde::Serialize; use serde_wasm_bindgen::{self, from_value}; use std::cell::RefCell; @@ -627,7 +627,7 @@ impl EditorHandle { insert_index: Option, ) { let mouse = mouse_x.and_then(|x| mouse_y.map(|y| (x, y))); - let image = graphene_core::raster::Image::from_image_data(&image_data, width, height); + let image = graphene_std::raster::Image::from_image_data(&image_data, width, height); let parent_and_insert_index = if let (Some(insert_parent_id), Some(insert_index)) = (insert_parent_id, insert_index) { let insert_parent_id = NodeId(insert_parent_id); @@ -758,7 +758,7 @@ impl EditorHandle { use graph_craft::document::DocumentNodeImplementation; use graph_craft::document::NodeInput; use graph_craft::document::value::TaggedValue; - use graphene_core::vector::*; + use graphene_std::vector::*; let (_, request_receiver) = std::sync::mpsc::channel(); let (response_sender, _) = std::sync::mpsc::channel();