Skip to content

Commit a859308

Browse files
authored
Merge branch 'master' into segment_editing_mode
2 parents faf4840 + 532e913 commit a859308

154 files changed

Lines changed: 5324 additions & 6361 deletions

File tree

Some content is hidden

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

.github/workflows/build-dev-and-ci.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ on:
55
branches:
66
- master
77
pull_request:
8-
branches:
9-
- master
108
env:
119
CARGO_TERM_COLOR: always
1210
INDEX_HTML_HEAD_REPLACEMENT: <script defer data-domain="dev.graphite.rs" data-api="https://graphite.rs/visit/event" src="https://graphite.rs/visit/script.hash.js"></script>

.github/workflows/comment-clippy-warnings.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ name: Clippy Check
22

33
on:
44
pull_request:
5-
branches: [master]
65
types: [opened, reopened, synchronize, ready_for_review]
76

87
jobs:

.github/workflows/comment-profiling-changes.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ name: Profiling Changes
22

33
on:
44
pull_request:
5-
branches: [master]
65

76
env:
87
CARGO_TERM_COLOR: always

.github/workflows/library-rawkit.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ on:
77
paths:
88
- "libraries/rawkit/**"
99
pull_request:
10-
branches:
11-
- master
1210
paths:
1311
- "libraries/rawkit/**"
1412

.github/workflows/website.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ on:
77
paths:
88
- website/**
99
pull_request:
10-
branches:
11-
- master
1210
paths:
1311
- website/**
1412
env:

Cargo.lock

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

Cargo.toml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,14 @@ members = [
77
"node-graph/gapplication-io",
88
"node-graph/gcore",
99
"node-graph/gstd",
10+
"node-graph/gmath-nodes",
11+
"node-graph/gpath-bool",
1012
"node-graph/graph-craft",
1113
"node-graph/graphene-cli",
14+
"node-graph/gsvg-renderer",
1215
"node-graph/interpreted-executor",
1316
"node-graph/node-macro",
14-
"node-graph/wgpu-executor",
17+
"node-graph/preprocessor",
1518
"libraries/dyn-any",
1619
"libraries/path-bool",
1720
"libraries/bezier-rs",
@@ -23,8 +26,11 @@ default-members = [
2326
"frontend/wasm",
2427
"node-graph/gcore",
2528
"node-graph/gstd",
29+
"node-graph/gmath-nodes",
30+
"node-graph/gpath-bool",
2631
"node-graph/graph-craft",
2732
"node-graph/graphene-cli",
33+
"node-graph/gsvg-renderer",
2834
"node-graph/interpreted-executor",
2935
"node-graph/node-macro",
3036
]
@@ -34,12 +40,16 @@ resolver = "2"
3440
# Local dependencies
3541
bezier-rs = { path = "libraries/bezier-rs", features = ["dyn-any", "serde"] }
3642
dyn-any = { path = "libraries/dyn-any", features = ["derive", "glam", "reqwest", "log-bad-types", "rc"] }
43+
preprocessor = { path = "node-graph/preprocessor"}
3744
math-parser = { path = "libraries/math-parser" }
3845
path-bool = { path = "libraries/path-bool" }
3946
graphene-application-io = { path = "node-graph/gapplication-io" }
4047
graphene-core = { path = "node-graph/gcore" }
48+
graphene-math-nodes = { path = "node-graph/gmath-nodes" }
49+
graphene-path-bool = { path = "node-graph/gpath-bool" }
4150
graph-craft = { path = "node-graph/graph-craft" }
4251
graphene-std = { path = "node-graph/gstd" }
52+
graphene-svg-renderer = { path = "node-graph/gsvg-renderer" }
4353
interpreted-executor = { path = "node-graph/interpreted-executor" }
4454
node-macro = { path = "node-graph/node-macro" }
4555
wgpu-executor = { path = "node-graph/wgpu-executor" }

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.

0 commit comments

Comments
 (0)