Skip to content

Commit fee4e5c

Browse files
authored
Merge branch 'master' into path_copy_paste
2 parents 9b6e0c6 + f57163c commit fee4e5c

File tree

83 files changed

+3003
-2394
lines changed

Some content is hidden

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

83 files changed

+3003
-2394
lines changed

Cargo.lock

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

Cargo.toml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,14 @@ members = [
55
"frontend/wasm",
66
"frontend/src-tauri",
77
"node-graph/gapplication-io",
8+
"node-graph/gbrush",
89
"node-graph/gcore",
910
"node-graph/gstd",
1011
"node-graph/gmath-nodes",
1112
"node-graph/gpath-bool",
1213
"node-graph/graph-craft",
1314
"node-graph/graphene-cli",
15+
"node-graph/graster-nodes",
1416
"node-graph/gsvg-renderer",
1517
"node-graph/interpreted-executor",
1618
"node-graph/node-macro",
@@ -24,12 +26,14 @@ members = [
2426
default-members = [
2527
"editor",
2628
"frontend/wasm",
29+
"node-graph/gbrush",
2730
"node-graph/gcore",
2831
"node-graph/gstd",
2932
"node-graph/gmath-nodes",
3033
"node-graph/gpath-bool",
3134
"node-graph/graph-craft",
3235
"node-graph/graphene-cli",
36+
"node-graph/graster-nodes",
3337
"node-graph/gsvg-renderer",
3438
"node-graph/interpreted-executor",
3539
"node-graph/node-macro",
@@ -44,10 +48,12 @@ preprocessor = { path = "node-graph/preprocessor"}
4448
math-parser = { path = "libraries/math-parser" }
4549
path-bool = { path = "libraries/path-bool" }
4650
graphene-application-io = { path = "node-graph/gapplication-io" }
51+
graphene-brush = { path = "node-graph/gbrush" }
4752
graphene-core = { path = "node-graph/gcore" }
4853
graphene-math-nodes = { path = "node-graph/gmath-nodes" }
4954
graphene-path-bool = { path = "node-graph/gpath-bool" }
5055
graph-craft = { path = "node-graph/graph-craft" }
56+
graphene-raster-nodes = { path = "node-graph/graster-nodes" }
5157
graphene-std = { path = "node-graph/gstd" }
5258
graphene-svg-renderer = { path = "node-graph/gsvg-renderer" }
5359
interpreted-executor = { path = "node-graph/interpreted-executor" }
@@ -144,9 +150,10 @@ petgraph = { version = "0.7.1", default-features = false, features = [
144150
"graphmap",
145151
] }
146152
half = { version = "2.4.1", default-features = false, features = ["bytemuck", "serde"] }
147-
tinyvec = { version = "1" }
153+
tinyvec = { version = "1", features = ["std"] }
148154
criterion = { version = "0.5", features = ["html_reports"] }
149155
iai-callgrind = { version = "0.12.3" }
156+
ndarray = "0.16.1"
150157

151158
[profile.dev]
152159
opt-level = 1

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/marbled-mandelbrot.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.

0 commit comments

Comments
 (0)