Skip to content

Commit 2ddae98

Browse files
Firestar99Firestar99
authored
Prep gcore splitup: move various symbols into their own modules (#2746)
* move `trait AsU32` from `gcore::vector::misc` to `gcore` * move blending and gradient to their own modules * fix unused warnings * move `Quad`, `Rect` and `BBox` to `gcore::math` * extract `ReferencePoint` and transform nodes from `transform` * move color-related code to `mod color` * fix unused warning in test code * move blending-related nodes and code to `mod blending_nodes` * move ClickTarget code to `mod vector::click_target`
1 parent c797877 commit 2ddae98

Some content is hidden

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

44 files changed

+1407
-1341
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ use graph_craft::document::NodeId;
1111
use graphene_std::Color;
1212
use graphene_std::raster::BlendMode;
1313
use graphene_std::raster::Image;
14-
use graphene_std::renderer::ClickTarget;
1514
use graphene_std::transform::Footprint;
15+
use graphene_std::vector::click_target::ClickTarget;
1616
use graphene_std::vector::style::ViewMode;
1717

1818
#[impl_message(Message, PortfolioMessage, Document)]

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,9 +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_std::math::quad::Quad;
3233
use graphene_std::raster::BlendMode;
3334
use graphene_std::raster_types::{Raster, RasterDataTable};
34-
use graphene_std::renderer::{ClickTarget, ClickTargetType, Quad};
35+
use graphene_std::vector::click_target::{ClickTarget, ClickTargetType};
3536
use graphene_std::vector::style::ViewMode;
3637
use graphene_std::vector::{PointId, path_bool_lib};
3738
use std::time::Duration;

‎editor/src/messages/portfolio/document/node_graph/document_node_definitions.rs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -166,13 +166,13 @@ fn static_nodes() -> Vec<DocumentNodeDefinition> {
166166
},
167167
DocumentNode {
168168
inputs: vec![NodeInput::node(NodeId(0), 0)],
169-
implementation: DocumentNodeImplementation::ProtoNode(ProtoNodeIdentifier::new("graphene_core::transform::FreezeRealTimeNode")),
169+
implementation: DocumentNodeImplementation::ProtoNode(ProtoNodeIdentifier::new("graphene_core::transform_nodes::FreezeRealTimeNode")),
170170
manual_composition: Some(generic!(T)),
171171
..Default::default()
172172
},
173173
DocumentNode {
174174
inputs: vec![NodeInput::node(NodeId(1), 0)],
175-
implementation: DocumentNodeImplementation::ProtoNode(ProtoNodeIdentifier::new("graphene_core::transform::BoundlessFootprintNode")),
175+
implementation: DocumentNodeImplementation::ProtoNode(ProtoNodeIdentifier::new("graphene_core::transform_nodes::BoundlessFootprintNode")),
176176
manual_composition: Some(generic!(T)),
177177
..Default::default()
178178
},
@@ -1650,7 +1650,7 @@ fn static_nodes() -> Vec<DocumentNodeDefinition> {
16501650
NodeInput::network(concrete!(DVec2), 5),
16511651
],
16521652
manual_composition: Some(concrete!(Context)),
1653-
implementation: DocumentNodeImplementation::ProtoNode(ProtoNodeIdentifier::new("graphene_core::transform::TransformNode")),
1653+
implementation: DocumentNodeImplementation::ProtoNode(ProtoNodeIdentifier::new("graphene_core::transform_nodes::TransformNode")),
16541654
..Default::default()
16551655
},
16561656
]
@@ -1746,13 +1746,13 @@ fn static_nodes() -> Vec<DocumentNodeDefinition> {
17461746
},
17471747
DocumentNode {
17481748
inputs: vec![NodeInput::node(NodeId(1), 0)],
1749-
implementation: DocumentNodeImplementation::ProtoNode(ProtoNodeIdentifier::new("graphene_core::transform::FreezeRealTimeNode")),
1749+
implementation: DocumentNodeImplementation::ProtoNode(ProtoNodeIdentifier::new("graphene_core::transform_nodes::FreezeRealTimeNode")),
17501750
manual_composition: Some(generic!(T)),
17511751
..Default::default()
17521752
},
17531753
DocumentNode {
17541754
inputs: vec![NodeInput::node(NodeId(2), 0)],
1755-
implementation: DocumentNodeImplementation::ProtoNode(ProtoNodeIdentifier::new("graphene_core::transform::BoundlessFootprintNode")),
1755+
implementation: DocumentNodeImplementation::ProtoNode(ProtoNodeIdentifier::new("graphene_core::transform_nodes::BoundlessFootprintNode")),
17561756
manual_composition: Some(generic!(T)),
17571757
..Default::default()
17581758
},
@@ -1859,13 +1859,13 @@ fn static_nodes() -> Vec<DocumentNodeDefinition> {
18591859
},
18601860
DocumentNode {
18611861
inputs: vec![NodeInput::node(NodeId(2), 0)],
1862-
implementation: DocumentNodeImplementation::ProtoNode(ProtoNodeIdentifier::new("graphene_core::transform::FreezeRealTimeNode")),
1862+
implementation: DocumentNodeImplementation::ProtoNode(ProtoNodeIdentifier::new("graphene_core::transform_nodes::FreezeRealTimeNode")),
18631863
manual_composition: Some(generic!(T)),
18641864
..Default::default()
18651865
},
18661866
DocumentNode {
18671867
inputs: vec![NodeInput::node(NodeId(3), 0)],
1868-
implementation: DocumentNodeImplementation::ProtoNode(ProtoNodeIdentifier::new("graphene_core::transform::BoundlessFootprintNode")),
1868+
implementation: DocumentNodeImplementation::ProtoNode(ProtoNodeIdentifier::new("graphene_core::transform_nodes::BoundlessFootprintNode")),
18691869
manual_composition: Some(generic!(T)),
18701870
..Default::default()
18711871
},
@@ -2014,13 +2014,13 @@ fn static_nodes() -> Vec<DocumentNodeDefinition> {
20142014
},
20152015
DocumentNode {
20162016
inputs: vec![NodeInput::node(NodeId(1), 0)],
2017-
implementation: DocumentNodeImplementation::ProtoNode(ProtoNodeIdentifier::new("graphene_core::transform::FreezeRealTimeNode")),
2017+
implementation: DocumentNodeImplementation::ProtoNode(ProtoNodeIdentifier::new("graphene_core::transform_nodes::FreezeRealTimeNode")),
20182018
manual_composition: Some(generic!(T)),
20192019
..Default::default()
20202020
},
20212021
DocumentNode {
20222022
inputs: vec![NodeInput::node(NodeId(2), 0)],
2023-
implementation: DocumentNodeImplementation::ProtoNode(ProtoNodeIdentifier::new("graphene_core::transform::BoundlessFootprintNode")),
2023+
implementation: DocumentNodeImplementation::ProtoNode(ProtoNodeIdentifier::new("graphene_core::transform_nodes::BoundlessFootprintNode")),
20242024
manual_composition: Some(generic!(T)),
20252025
..Default::default()
20262026
},

‎editor/src/messages/portfolio/document/node_graph/node_graph_message_handler.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ use crate::messages::tool::utility_types::{HintData, HintGroup, HintInfo};
2121
use glam::{DAffine2, DVec2, IVec2};
2222
use graph_craft::document::{DocumentNodeImplementation, NodeId, NodeInput};
2323
use graph_craft::proto::GraphErrors;
24+
use graphene_std::math::math_ext::QuadExt;
2425
use graphene_std::*;
2526
use renderer::Quad;
2627
use std::cmp::Ordering;

‎editor/src/messages/portfolio/document/overlays/utility_types.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ use core::borrow::Borrow;
99
use core::f64::consts::{FRAC_PI_2, TAU};
1010
use glam::{DAffine2, DVec2};
1111
use graphene_std::Color;
12-
use graphene_std::renderer::ClickTargetType;
13-
use graphene_std::renderer::Quad;
12+
use graphene_std::math::quad::Quad;
13+
use graphene_std::vector::click_target::ClickTargetType;
1414
use graphene_std::vector::{PointId, SegmentId, VectorData};
1515
use std::collections::HashMap;
1616
use wasm_bindgen::{JsCast, JsValue};

‎editor/src/messages/portfolio/document/utility_types/document_metadata.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@ use crate::messages::portfolio::document::graph_operation::transform_utils;
33
use crate::messages::portfolio::document::graph_operation::utility_types::ModifyInputsContext;
44
use glam::{DAffine2, DVec2};
55
use graph_craft::document::NodeId;
6-
use graphene_std::renderer::{ClickTarget, ClickTargetType, Quad};
6+
use graphene_std::math::quad::Quad;
77
use graphene_std::transform::Footprint;
8+
use graphene_std::vector::click_target::{ClickTarget, ClickTargetType};
89
use graphene_std::vector::{PointId, VectorData};
910
use std::collections::{HashMap, HashSet};
1011
use std::num::NonZeroU64;

‎editor/src/messages/portfolio/document/utility_types/network_interface.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,9 @@ use glam::{DAffine2, DVec2, IVec2};
1212
use graph_craft::document::value::TaggedValue;
1313
use graph_craft::document::{DocumentNode, DocumentNodeImplementation, NodeId, NodeInput, NodeNetwork, OldDocumentNodeImplementation, OldNodeNetwork};
1414
use graph_craft::{Type, concrete};
15-
use graphene_std::renderer::{ClickTarget, ClickTargetType, Quad};
15+
use graphene_std::math::quad::Quad;
1616
use graphene_std::transform::Footprint;
17+
use graphene_std::vector::click_target::{ClickTarget, ClickTargetType};
1718
use graphene_std::vector::{PointId, VectorData, VectorModificationType};
1819
use interpreted_executor::dynamic_executor::ResolvedDocumentNodeTypes;
1920
use interpreted_executor::node_registry::NODE_REGISTRY;

‎editor/src/messages/portfolio/document_migration.rs

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ use graphene_std::vector::style::{Fill, FillType, Gradient, PaintOrder, StrokeAl
1414
use graphene_std::vector::{VectorData, VectorDataTable};
1515
use std::collections::HashMap;
1616

17-
const TEXT_REPLACEMENTS: [(&str, &str); 2] = [
17+
const TEXT_REPLACEMENTS: &[(&str, &str)] = &[
1818
("graphene_core::vector::vector_nodes::SamplePointsNode", "graphene_core::vector::SamplePolylineNode"),
1919
("graphene_core::vector::vector_nodes::SubpathSegmentLengthsNode", "graphene_core::vector::SubpathSegmentLengthsNode"),
2020
];
2121

22-
const REPLACEMENTS: [(&str, &str); 40] = [
22+
const REPLACEMENTS: &[(&str, &str)] = &[
2323
("graphene_core::AddArtboardNode", "graphene_core::graphic_element::AppendArtboardNode"),
2424
("graphene_core::ConstructArtboardNode", "graphene_core::graphic_element::ToArtboardNode"),
2525
("graphene_core::ToGraphicElementNode", "graphene_core::graphic_element::ToElementNode"),
@@ -31,6 +31,9 @@ const REPLACEMENTS: [(&str, &str); 40] = [
3131
("graphene_core::ops::Vector2ValueNode", "graphene_core::ops::CoordinateValueNode"),
3232
("graphene_core::raster::BlackAndWhiteNode", "graphene_core::raster::adjustments::BlackAndWhiteNode"),
3333
("graphene_core::raster::BlendNode", "graphene_core::raster::adjustments::BlendNode"),
34+
("graphene_core::raster::BlendModeNode", "graphene_core::blending_nodes::BlendModeNode"),
35+
("graphene_core::raster::OpacityNode", "graphene_core::blending_nodes::OpacityNode"),
36+
("graphene_core::raster::BlendingNode", "graphene_core::blending_nodes::BlendingNode"),
3437
("graphene_core::raster::ChannelMixerNode", "graphene_core::raster::adjustments::ChannelMixerNode"),
3538
("graphene_core::raster::adjustments::ColorOverlayNode", "graphene_core::raster::adjustments::ColorOverlayNode"),
3639
("graphene_core::raster::ExposureNode", "graphene_core::raster::adjustments::ExposureNode"),
@@ -48,7 +51,11 @@ const REPLACEMENTS: [(&str, &str); 40] = [
4851
("graphene_core::raster::ThresholdNode", "graphene_core::raster::adjustments::ThresholdNode"),
4952
("graphene_core::raster::VibranceNode", "graphene_core::raster::adjustments::VibranceNode"),
5053
("graphene_core::text::TextGeneratorNode", "graphene_core::text::TextNode"),
51-
("graphene_core::transform::SetTransformNode", "graphene_core::transform::ReplaceTransformNode"),
54+
("graphene_core::transform::SetTransformNode", "graphene_core::transform_nodes::ReplaceTransformNode"),
55+
("graphene_core::transform::ReplaceTransformNode", "graphene_core::transform_nodes::ReplaceTransformNode"),
56+
("graphene_core::transform::TransformNode", "graphene_core::transform_nodes::TransformNode"),
57+
("graphene_core::transform::BoundlessFootprintNode", "graphene_core::transform_nodes::BoundlessFootprintNode"),
58+
("graphene_core::transform::FreezeRealTimeNode", "graphene_core::transform_nodes::FreezeRealTimeNode"),
5259
("graphene_core::vector::SplinesFromPointsNode", "graphene_core::vector::SplineNode"),
5360
("graphene_core::vector::generator_nodes::EllipseGenerator", "graphene_core::vector::generator_nodes::EllipseNode"),
5461
("graphene_core::vector::generator_nodes::LineGenerator", "graphene_core::vector::generator_nodes::LineNode"),

‎editor/src/messages/tool/common_functionality/shapes/shape_utility.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ use bezier_rs::Subpath;
1313
use glam::{DAffine2, DMat2, DVec2};
1414
use graph_craft::document::NodeInput;
1515
use graph_craft::document::value::TaggedValue;
16-
use graphene_std::renderer::ClickTargetType;
16+
use graphene_std::vector::click_target::ClickTargetType;
1717
use graphene_std::vector::misc::dvec2_to_point;
1818
use kurbo::{BezPath, PathEl, Shape};
1919
use std::collections::VecDeque;

‎editor/src/messages/tool/common_functionality/snapping/layer_snapper.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ use crate::messages::portfolio::document::utility_types::misc::*;
55
use crate::messages::prelude::*;
66
use bezier_rs::{Bezier, Identifier, Subpath, TValue};
77
use glam::{DAffine2, DVec2};
8+
use graphene_std::math::math_ext::QuadExt;
89
use graphene_std::renderer::Quad;
910
use graphene_std::vector::PointId;
1011

0 commit comments

Comments
 (0)