Skip to content

Commit 57b0b9c

Browse files
TrueDoctorKeavon
andauthored
Restructure node crates (#3384)
* Restructure node-graph folder * Fix wasm compilation * Move node definitions out of *-types crates * Cleanup * Fix warnings * Fix warnings * Start adding migrations * Add migrations and move memo nodes to gcore * Move nodes/gsvg-render -> rendering * Replace some hard coded identifiers and fix automatic conversion * Fix Vec2Value node migration * Fix formatting * Add more migrations * Cleanup features * Fix core_types::raster import * Update demo artwork (to make profile ci work) * Move *-types to node-graph/libraries folder * Add missing node migrations * Migrate more nodes * Remove impure memo node * More fixes and remove warning * Migrate context and add a few missing migrations --------- Co-authored-by: Keavon Chambers <keavon@keavon.com>
1 parent 12453d2 commit 57b0b9c

File tree

193 files changed

+3648
-2497
lines changed

Some content is hidden

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

193 files changed

+3648
-2497
lines changed

Cargo.lock

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

Cargo.toml

Lines changed: 60 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,28 @@ members = [
1212
"libraries/dyn-any",
1313
"libraries/path-bool",
1414
"libraries/math-parser",
15-
"node-graph/gapplication-io",
16-
"node-graph/gbrush",
17-
"node-graph/gcore",
18-
"node-graph/gcore-shaders",
19-
"node-graph/gmath-nodes",
20-
"node-graph/gpath-bool",
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",
22+
"node-graph/nodes/blending",
23+
"node-graph/nodes/brush",
24+
"node-graph/nodes/gcore",
25+
"node-graph/nodes/graphic",
26+
"node-graph/nodes/math",
27+
"node-graph/nodes/path-bool",
28+
"node-graph/nodes/raster",
29+
"node-graph/nodes/raster/shaders",
30+
"node-graph/nodes/raster/shaders/entrypoint",
31+
"node-graph/nodes/text",
32+
"node-graph/nodes/transform",
33+
"node-graph/nodes/vector",
2134
"node-graph/graph-craft",
2235
"node-graph/graphene-cli",
23-
"node-graph/graster-nodes",
24-
"node-graph/graster-nodes/shaders",
25-
"node-graph/graster-nodes/shaders/entrypoint",
26-
"node-graph/gstd",
27-
"node-graph/gsvg-renderer",
36+
"node-graph/nodes/gstd",
2837
"node-graph/interpreted-executor",
2938
"node-graph/node-macro",
3039
"node-graph/preprocessor",
@@ -37,18 +46,27 @@ default-members = [
3746
"libraries/dyn-any",
3847
"libraries/path-bool",
3948
"libraries/math-parser",
40-
"node-graph/gapplication-io",
41-
"node-graph/gbrush",
42-
"node-graph/gcore",
43-
"node-graph/gcore-shaders",
44-
"node-graph/graster-nodes/shaders",
45-
"node-graph/gmath-nodes",
46-
"node-graph/gpath-bool",
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",
56+
"node-graph/nodes/blending",
57+
"node-graph/nodes/brush",
58+
"node-graph/nodes/gcore",
59+
"node-graph/nodes/graphic",
60+
"node-graph/nodes/math",
61+
"node-graph/nodes/path-bool",
62+
"node-graph/nodes/raster",
63+
"node-graph/nodes/raster/shaders",
64+
"node-graph/nodes/text",
65+
"node-graph/nodes/transform",
66+
"node-graph/nodes/vector",
4767
"node-graph/graph-craft",
4868
"node-graph/graphene-cli",
49-
"node-graph/graster-nodes",
50-
"node-graph/gstd",
51-
"node-graph/gsvg-renderer",
69+
"node-graph/nodes/gstd",
5270
"node-graph/interpreted-executor",
5371
"node-graph/node-macro",
5472
"node-graph/preprocessor",
@@ -70,16 +88,25 @@ dyn-any = { path = "libraries/dyn-any", features = [
7088
preprocessor = { path = "node-graph/preprocessor" }
7189
math-parser = { path = "libraries/math-parser" }
7290
path-bool = { path = "libraries/path-bool" }
73-
graphene-application-io = { path = "node-graph/gapplication-io" }
74-
graphene-brush = { path = "node-graph/gbrush" }
75-
graphene-core = { path = "node-graph/gcore" }
76-
graphene-core-shaders = { path = "node-graph/gcore-shaders" }
77-
graphene-math-nodes = { path = "node-graph/gmath-nodes" }
78-
graphene-path-bool = { path = "node-graph/gpath-bool" }
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" }
98+
brush-nodes = { path = "node-graph/nodes/brush" }
99+
blending-nodes = { path = "node-graph/nodes/blending" }
100+
graphene-core = { path = "node-graph/nodes/gcore" }
101+
graphic-nodes = { path = "node-graph/nodes/graphic" }
102+
text-nodes = { path = "node-graph/nodes/text" }
103+
transform-nodes = { path = "node-graph/nodes/transform" }
104+
vector-nodes = { path = "node-graph/nodes/vector" }
105+
math-nodes = { path = "node-graph/nodes/math" }
106+
path-bool-nodes = { path = "node-graph/nodes/path-bool" }
79107
graph-craft = { path = "node-graph/graph-craft" }
80-
graphene-raster-nodes = { path = "node-graph/graster-nodes" }
81-
graphene-std = { path = "node-graph/gstd" }
82-
graphene-svg-renderer = { path = "node-graph/gsvg-renderer" }
108+
raster-nodes = { path = "node-graph/nodes/raster" }
109+
graphene-std = { path = "node-graph/nodes/gstd" }
83110
interpreted-executor = { path = "node-graph/interpreted-executor" }
84111
node-macro = { path = "node-graph/node-macro" }
85112
wgpu-executor = { path = "node-graph/wgpu-executor" }
@@ -209,16 +236,16 @@ unexpected_cfgs = { level = "allow", check-cfg = ['cfg(target_arch, values("spir
209236
opt-level = 1
210237

211238
[profile.dev.package]
212-
graphite-editor = { opt-level = 1 }
213-
graphene-core-shaders = { opt-level = 1 }
214-
graphene-std = { opt-level = 1 }
239+
no-std-types = { opt-level = 1 }
240+
core-types= { opt-level = 1 }
215241
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
216242
graphite-proc-macros = { opt-level = 1 }
217243
image = { opt-level = 2 }
218244
rustc-hash = { opt-level = 3 }
219245
serde_derive = { opt-level = 1 }
220246
specta-macros = { opt-level = 1 }
221247
syn = { opt-level = 1 }
248+
node-macro = { opt-level = 2 }
222249

223250
[profile.release]
224251
lto = "thin"

demo-artwork/changing-seasons.graphite

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

demo-artwork/isometric-fountain.graphite

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

demo-artwork/painted-dreams.graphite

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

demo-artwork/parametric-dunescape.graphite

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

demo-artwork/procedural-string-lights.graphite

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

demo-artwork/red-dress.graphite

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

demo-artwork/valley-of-spires.graphite

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

desktop/wrapper/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ gpu = ["graphite-editor/gpu", "graphene-std/shader-nodes"]
1515
# Local dependencies
1616
graphite-editor = { path = "../../editor", features = [
1717
"gpu",
18-
"vello",
1918
] }
2019
graphene-std = { workspace = true }
2120
graph-craft = { workspace = true }

0 commit comments

Comments
 (0)