Skip to content

Commit 8c7b22e

Browse files
committed
editor: bulk rename gcore -> gstd, cargo fmt
1 parent 727f2d2 commit 8c7b22e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+197
-197
lines changed

editor/src/application.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use crate::dispatcher::Dispatcher;
22
use crate::messages::prelude::*;
3-
pub use graphene_core::uuid::*;
3+
pub use graphene_std::uuid::*;
44

55
// TODO: serialize with serde to save the current editor state
66
pub struct Editor {

editor/src/messages/animation/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ pub use animation_message::{AnimationMessage, AnimationMessageDiscriminant};
66
#[doc(inline)]
77
pub use animation_message_handler::AnimationMessageHandler;
88

9-
pub use graphene_core::application_io::TimingInformation;
9+
pub use graphene_std::application_io::TimingInformation;

editor/src/messages/dialog/new_document_dialog/new_document_dialog_message_handler.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ impl MessageHandler<NewDocumentDialogMessage, ()> for NewDocumentDialogMessageHa
2626
responses.add(Message::StartBuffer);
2727
responses.add(GraphOperationMessage::NewArtboard {
2828
id: NodeId::new(),
29-
artboard: graphene_core::Artboard::new(IVec2::ZERO, self.dimensions.as_ivec2()),
29+
artboard: graphene_std::Artboard::new(IVec2::ZERO, self.dimensions.as_ivec2()),
3030
});
3131
}
3232

editor/src/messages/frontend/frontend_message.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ use crate::messages::portfolio::document::utility_types::nodes::{JsRawBuffer, La
77
use crate::messages::prelude::*;
88
use crate::messages::tool::utility_types::HintData;
99
use graph_craft::document::NodeId;
10-
use graphene_core::raster::color::Color;
11-
use graphene_core::text::Font;
10+
use graphene_std::raster::color::Color;
11+
use graphene_std::text::Font;
1212

1313
#[impl_message(Message, Frontend)]
1414
#[derive(PartialEq, Clone, Debug, serde::Serialize, serde::Deserialize, specta::Type)]

editor/src/messages/layout/layout_message_handler.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
use crate::messages::input_mapper::utility_types::input_keyboard::KeysGroup;
22
use crate::messages::layout::utility_types::widget_prelude::*;
33
use crate::messages::prelude::*;
4-
use graphene_core::raster::color::Color;
5-
use graphene_core::text::Font;
4+
use graphene_std::raster::color::Color;
5+
use graphene_std::text::Font;
66
use graphene_std::vector::style::{FillChoice, GradientStops};
77
use serde_json::Value;
88

editor/src/messages/layout/utility_types/widgets/input_widgets.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
use crate::messages::input_mapper::utility_types::misc::ActionKeys;
22
use crate::messages::layout::utility_types::widget_prelude::*;
33
use derivative::*;
4-
use graphene_core::Color;
5-
use graphene_core::raster::curve::Curve;
4+
use graphene_std::Color;
5+
use graphene_std::raster::curve::Curve;
66
use graphene_std::transform::ReferencePoint;
77
use graphite_proc_macros::WidgetBuilder;
88
use once_cell::sync::OnceCell;
@@ -56,7 +56,7 @@ pub struct CheckboxId(Arc<OnceCell<u64>>);
5656

5757
impl CheckboxId {
5858
pub fn fill(&mut self) {
59-
let _ = self.0.set(graphene_core::uuid::generate_uuid());
59+
let _ = self.0.set(graphene_std::uuid::generate_uuid());
6060
}
6161
}
6262
impl specta::Type for CheckboxId {

editor/src/messages/portfolio/document/document_message.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ use crate::messages::portfolio::utility_types::PanelType;
88
use crate::messages::prelude::*;
99
use glam::DAffine2;
1010
use graph_craft::document::NodeId;
11-
use graphene_core::Color;
12-
use graphene_core::raster::BlendMode;
13-
use graphene_core::raster::Image;
14-
use graphene_core::vector::style::ViewMode;
11+
use graphene_std::Color;
12+
use graphene_std::raster::BlendMode;
13+
use graphene_std::raster::Image;
1514
use graphene_std::renderer::ClickTarget;
1615
use graphene_std::transform::Footprint;
16+
use graphene_std::vector::style::ViewMode;
1717

1818
#[impl_message(Message, PortfolioMessage, Document)]
1919
#[derive(PartialEq, Clone, Debug, serde::Serialize, serde::Deserialize)]

editor/src/messages/portfolio/document/document_message_handler.rs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@ use bezier_rs::Subpath;
2929
use glam::{DAffine2, DVec2, IVec2};
3030
use graph_craft::document::value::TaggedValue;
3131
use graph_craft::document::{NodeId, NodeInput, NodeNetwork, OldNodeNetwork};
32-
use graphene_core::raster::BlendMode;
33-
use graphene_core::raster::image::RasterDataTable;
34-
use graphene_core::vector::style::ViewMode;
32+
use graphene_std::raster::BlendMode;
33+
use graphene_std::raster::image::RasterDataTable;
3534
use graphene_std::renderer::{ClickTarget, ClickTargetType, Quad};
35+
use graphene_std::vector::style::ViewMode;
3636
use graphene_std::vector::{PointId, path_bool_lib};
3737
use std::time::Duration;
3838

@@ -1592,15 +1592,15 @@ impl MessageHandler<DocumentMessage, DocumentMessageData<'_>> for DocumentMessag
15921592

15931593
impl DocumentMessageHandler {
15941594
/// Runs an intersection test with all layers and a viewport space quad
1595-
pub fn intersect_quad<'a>(&'a self, viewport_quad: graphene_core::renderer::Quad, ipp: &InputPreprocessorMessageHandler) -> impl Iterator<Item = LayerNodeIdentifier> + use<'a> {
1595+
pub fn intersect_quad<'a>(&'a self, viewport_quad: graphene_std::renderer::Quad, ipp: &InputPreprocessorMessageHandler) -> impl Iterator<Item = LayerNodeIdentifier> + use<'a> {
15961596
let document_to_viewport = self.navigation_handler.calculate_offset_transform(ipp.viewport_bounds.center(), &self.document_ptz);
15971597
let document_quad = document_to_viewport.inverse() * viewport_quad;
15981598

15991599
ClickXRayIter::new(&self.network_interface, XRayTarget::Quad(document_quad))
16001600
}
16011601

16021602
/// Runs an intersection test with all layers and a viewport space quad; ignoring artboards
1603-
pub fn intersect_quad_no_artboards<'a>(&'a self, viewport_quad: graphene_core::renderer::Quad, ipp: &InputPreprocessorMessageHandler) -> impl Iterator<Item = LayerNodeIdentifier> + use<'a> {
1603+
pub fn intersect_quad_no_artboards<'a>(&'a self, viewport_quad: graphene_std::renderer::Quad, ipp: &InputPreprocessorMessageHandler) -> impl Iterator<Item = LayerNodeIdentifier> + use<'a> {
16041604
self.intersect_quad(viewport_quad, ipp).filter(|layer| !self.network_interface.is_artboard(&layer.to_node(), &[]))
16051605
}
16061606

@@ -1617,7 +1617,7 @@ impl DocumentMessageHandler {
16171617
self.intersect_polygon(viewport_polygon, ipp).filter(|layer| !self.network_interface.is_artboard(&layer.to_node(), &[]))
16181618
}
16191619

1620-
pub fn is_layer_fully_inside(&self, layer: &LayerNodeIdentifier, quad: graphene_core::renderer::Quad) -> bool {
1620+
pub fn is_layer_fully_inside(&self, layer: &LayerNodeIdentifier, quad: graphene_std::renderer::Quad) -> bool {
16211621
// Get the bounding box of the layer in document space
16221622
let Some(bounding_box) = self.metadata().bounding_box_viewport(*layer) else { return false };
16231623

@@ -1711,15 +1711,15 @@ impl DocumentMessageHandler {
17111711
.selected_nodes()
17121712
.selected_visible_layers(&self.network_interface)
17131713
.filter_map(|layer| self.metadata().bounding_box_viewport(layer))
1714-
.reduce(graphene_core::renderer::Quad::combine_bounds)
1714+
.reduce(graphene_std::renderer::Quad::combine_bounds)
17151715
}
17161716

17171717
pub fn selected_visible_and_unlock_layers_bounding_box_viewport(&self) -> Option<[DVec2; 2]> {
17181718
self.network_interface
17191719
.selected_nodes()
17201720
.selected_visible_and_unlocked_layers(&self.network_interface)
17211721
.filter_map(|layer| self.metadata().bounding_box_viewport(layer))
1722-
.reduce(graphene_core::renderer::Quad::combine_bounds)
1722+
.reduce(graphene_std::renderer::Quad::combine_bounds)
17231723
}
17241724

17251725
pub fn document_network(&self) -> &NodeNetwork {
@@ -2891,7 +2891,7 @@ impl DocumentMessageHandler {
28912891
/// Create a network interface with a single export
28922892
fn default_document_network_interface() -> NodeNetworkInterface {
28932893
let mut network_interface = NodeNetworkInterface::default();
2894-
network_interface.add_export(TaggedValue::ArtboardGroup(graphene_core::ArtboardGroupTable::default()), -1, "", &[]);
2894+
network_interface.add_export(TaggedValue::ArtboardGroup(graphene_std::ArtboardGroupTable::default()), -1, "", &[]);
28952895
network_interface
28962896
}
28972897

editor/src/messages/portfolio/document/graph_operation/graph_operation_message.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ use crate::messages::prelude::*;
55
use bezier_rs::Subpath;
66
use glam::{DAffine2, DVec2, IVec2};
77
use graph_craft::document::NodeId;
8-
use graphene_core::raster::BlendMode;
9-
use graphene_core::raster::image::RasterDataTable;
10-
use graphene_core::text::{Font, TypesettingConfig};
11-
use graphene_core::vector::PointId;
12-
use graphene_core::vector::VectorModificationType;
13-
use graphene_core::vector::brush_stroke::BrushStroke;
14-
use graphene_core::vector::style::{Fill, Stroke};
15-
use graphene_core::{Artboard, Color};
8+
use graphene_std::raster::BlendMode;
9+
use graphene_std::raster::image::RasterDataTable;
10+
use graphene_std::text::{Font, TypesettingConfig};
11+
use graphene_std::vector::PointId;
12+
use graphene_std::vector::VectorModificationType;
13+
use graphene_std::vector::brush_stroke::BrushStroke;
14+
use graphene_std::vector::style::{Fill, Stroke};
15+
use graphene_std::{Artboard, Color};
1616

1717
#[impl_message(Message, DocumentMessage, GraphOperation)]
1818
#[derive(PartialEq, Clone, Debug, serde::Serialize, serde::Deserialize)]

editor/src/messages/portfolio/document/graph_operation/graph_operation_message_handler.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ use crate::messages::prelude::*;
88
use crate::messages::tool::common_functionality::graph_modification_utils::get_clip_mode;
99
use glam::{DAffine2, DVec2, IVec2};
1010
use graph_craft::document::{NodeId, NodeInput};
11-
use graphene_core::Color;
12-
use graphene_core::renderer::Quad;
13-
use graphene_core::text::{Font, TypesettingConfig};
14-
use graphene_core::vector::style::{Fill, Gradient, GradientStops, GradientType, PaintOrder, Stroke, StrokeAlign, StrokeCap, StrokeJoin};
11+
use graphene_std::Color;
12+
use graphene_std::renderer::Quad;
13+
use graphene_std::text::{Font, TypesettingConfig};
1514
use graphene_std::vector::convert_usvg_path;
15+
use graphene_std::vector::style::{Fill, Gradient, GradientStops, GradientType, PaintOrder, Stroke, StrokeAlign, StrokeCap, StrokeJoin};
1616

1717
#[derive(Debug, Clone)]
1818
struct ArtboardInfo {
@@ -374,7 +374,7 @@ fn import_usvg_node(modify_inputs: &mut ModifyInputsContext, node: &usvg::Node,
374374
warn!("Skip image")
375375
}
376376
usvg::Node::Text(text) => {
377-
let font = Font::new(graphene_core::consts::DEFAULT_FONT_FAMILY.to_string(), graphene_core::consts::DEFAULT_FONT_STYLE.to_string());
377+
let font = Font::new(graphene_std::consts::DEFAULT_FONT_FAMILY.to_string(), graphene_std::consts::DEFAULT_FONT_STYLE.to_string());
378378
modify_inputs.insert_text(text.chunks().iter().map(|chunk| chunk.text()).collect(), font, TypesettingConfig::default(), layer);
379379
modify_inputs.fill_set(Fill::Solid(Color::BLACK));
380380
}

0 commit comments

Comments
 (0)