Skip to content

Commit 365102d

Browse files
committed
Move *-types to node-graph/libraries folder
1 parent 11aa2f2 commit 365102d

94 files changed

Lines changed: 78 additions & 85 deletions

Some content is hidden

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

Cargo.lock

Lines changed: 22 additions & 25 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,13 @@ members = [
1212
"libraries/dyn-any",
1313
"libraries/path-bool",
1414
"libraries/math-parser",
15-
"node-graph/gapplication-io",
16-
"node-graph/core-types",
17-
"node-graph/not-std-types",
18-
"node-graph/raster-types",
19-
"node-graph/vector-types",
20-
"node-graph/graphic-types",
15+
"node-graph/libraries/application-io",
16+
"node-graph/libraries/core-types",
17+
"node-graph/libraries/no-std-types",
18+
"node-graph/libraries/raster-types",
19+
"node-graph/libraries/vector-types",
20+
"node-graph/libraries/graphic-types",
21+
"node-graph/libraries/rendering",
2122
"node-graph/nodes/blending",
2223
"node-graph/nodes/brush",
2324
"node-graph/nodes/gcore",
@@ -27,7 +28,6 @@ members = [
2728
"node-graph/nodes/raster",
2829
"node-graph/nodes/raster/shaders",
2930
"node-graph/nodes/raster/shaders/entrypoint",
30-
"node-graph/rendering",
3131
"node-graph/nodes/text",
3232
"node-graph/nodes/transform",
3333
"node-graph/nodes/vector",
@@ -46,12 +46,13 @@ default-members = [
4646
"libraries/dyn-any",
4747
"libraries/path-bool",
4848
"libraries/math-parser",
49-
"node-graph/gapplication-io",
50-
"node-graph/core-types",
51-
"node-graph/not-std-types",
52-
"node-graph/raster-types",
53-
"node-graph/vector-types",
54-
"node-graph/graphic-types",
49+
"node-graph/libraries/application-io",
50+
"node-graph/libraries/core-types",
51+
"node-graph/libraries/no-std-types",
52+
"node-graph/libraries/raster-types",
53+
"node-graph/libraries/vector-types",
54+
"node-graph/libraries/graphic-types",
55+
"node-graph/libraries/rendering",
5556
"node-graph/nodes/blending",
5657
"node-graph/nodes/brush",
5758
"node-graph/nodes/gcore",
@@ -60,7 +61,6 @@ default-members = [
6061
"node-graph/nodes/path-bool",
6162
"node-graph/nodes/raster",
6263
"node-graph/nodes/raster/shaders",
63-
"node-graph/rendering",
6464
"node-graph/nodes/text",
6565
"node-graph/nodes/transform",
6666
"node-graph/nodes/vector",
@@ -88,13 +88,14 @@ dyn-any = { path = "libraries/dyn-any", features = [
8888
preprocessor = { path = "node-graph/preprocessor" }
8989
math-parser = { path = "libraries/math-parser" }
9090
path-bool = { path = "libraries/path-bool" }
91-
graphene-application-io = { path = "node-graph/gapplication-io" }
91+
graphene-application-io = { path = "node-graph/libraries/application-io" }
92+
core-types = { path = "node-graph/libraries/core-types" }
93+
no-std-types = { path = "node-graph/libraries/no-std-types" }
94+
raster-types = { path = "node-graph/libraries/raster-types" }
95+
vector-types = { path = "node-graph/libraries/vector-types" }
96+
graphic-types = { path = "node-graph/libraries/graphic-types" }
97+
rendering = { path = "node-graph/libraries/rendering" }
9298
brush-nodes = { path = "node-graph/nodes/brush" }
93-
core-types = { path = "node-graph/core-types" }
94-
not-std-types = { path = "node-graph/not-std-types" }
95-
raster-types = { path = "node-graph/raster-types" }
96-
vector-types = { path = "node-graph/vector-types" }
97-
graphic-types = { path = "node-graph/graphic-types" }
9899
blending-nodes = { path = "node-graph/nodes/blending" }
99100
graphene-core = { path = "node-graph/nodes/gcore" }
100101
graphic-nodes = { path = "node-graph/nodes/graphic" }
@@ -106,7 +107,6 @@ path-bool-nodes = { path = "node-graph/nodes/path-bool" }
106107
graph-craft = { path = "node-graph/graph-craft" }
107108
raster-nodes = { path = "node-graph/nodes/raster" }
108109
graphene-std = { path = "node-graph/nodes/gstd" }
109-
rendering = { path = "node-graph/rendering" }
110110
interpreted-executor = { path = "node-graph/interpreted-executor" }
111111
node-macro = { path = "node-graph/node-macro" }
112112
wgpu-executor = { path = "node-graph/wgpu-executor" }
@@ -235,7 +235,7 @@ unexpected_cfgs = { level = "allow", check-cfg = ['cfg(target_arch, values("spir
235235
opt-level = 0
236236

237237
[profile.dev.package]
238-
not-std-types = { opt-level = 1 }
238+
no-std-types = { opt-level = 1 }
239239
core-types= { opt-level = 1 }
240240
interpreted-executor = { opt-level = 1 } # This is a mitigation for https://github.com/rustwasm/wasm-pack/issues/981 which is needed because the node_registry function is too large
241241
graphite-proc-macros = { opt-level = 1 }
File renamed without changes.
File renamed without changes.

node-graph/core-types/Cargo.toml renamed to node-graph/libraries/core-types/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ dealloc_nodes = []
1414

1515
[dependencies]
1616
# Local dependencies
17-
not-std-types = { workspace = true, features = ["std"] }
17+
no-std-types = { workspace = true, features = ["std"] }
1818

1919
# Workspace dependencies
2020
bitflags = { workspace = true }
File renamed without changes.
File renamed without changes.

node-graph/core-types/src/context.rs renamed to node-graph/libraries/core-types/src/context.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
use crate::transform::Footprint;
2-
pub use not_std_types::context::{ArcCtx, Ctx};
2+
pub use no_std_types::context::{ArcCtx, Ctx};
33
use std::any::Any;
44
use std::borrow::Borrow;
55
use std::hash::{Hash, Hasher};
File renamed without changes.

node-graph/core-types/src/lib.rs renamed to node-graph/libraries/core-types/src/lib.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@ pub use context::*;
2222
pub use ctor;
2323
pub use dyn_any::{StaticTypeSized, WasmNotSend, WasmNotSync};
2424
pub use memo::MemoHash;
25-
pub use not_std_types::AsU32;
26-
pub use not_std_types::blending;
27-
pub use not_std_types::choice_type;
28-
pub use not_std_types::color;
29-
pub use not_std_types::shaders;
25+
pub use no_std_types::AsU32;
26+
pub use no_std_types::blending;
27+
pub use no_std_types::choice_type;
28+
pub use no_std_types::color;
29+
pub use no_std_types::shaders;
3030
pub use num_traits;
3131
pub use specta;
3232
use std::any::TypeId;

0 commit comments

Comments
 (0)