Skip to content

Commit 16229ae

Browse files
committed
Merge branch 'master' into node-network-interface
2 parents faf6e55 + e66620d commit 16229ae

File tree

113 files changed

+4762
-3016
lines changed

Some content is hidden

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

113 files changed

+4762
-3016
lines changed

Cargo.lock

Lines changed: 18 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: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ members = [
1919
"libraries/dyn-any",
2020
"libraries/bezier-rs",
2121
"libraries/raw-rs",
22+
"libraries/raw-rs/tag-derive",
2223
"website/other/bezier-rs-demos/wasm",
2324
]
2425
resolver = "2"
@@ -48,7 +49,7 @@ tempfile = "3"
4849
thiserror = "1.0"
4950
anyhow = "1.0.66"
5051
proc-macro2 = "1"
51-
syn = { version = "2.0", default-features = false, features = ["full"] }
52+
syn = { version = "2.0", default-features = false, features = ["full", "derive"] }
5253
quote = "1.0"
5354
axum = "0.6"
5455
chrono = "^0.4.23"

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/just-a-potted-cactus.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.

editor/Cargo.toml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,3 +64,10 @@ web-sys = { workspace = true, features = [
6464
[dev-dependencies]
6565
env_logger = "0.10"
6666
futures = { workspace = true }
67+
tokio = { workspace = true, features = ["rt", "macros"] }
68+
69+
[lints.rust]
70+
# TODO: figure out why we check these features when they do not exist
71+
unexpected_cfgs = { level = "warn", check-cfg = [
72+
'cfg(feature, values("resvg", "vello"))',
73+
] }

editor/src/application.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ impl Editor {
2121
std::mem::take(&mut self.dispatcher.responses)
2222
}
2323

24-
pub fn poll_node_graph_evaluation(&mut self, responses: &mut VecDeque<Message>) {
25-
self.dispatcher.poll_node_graph_evaluation(responses);
24+
pub fn poll_node_graph_evaluation(&mut self, responses: &mut VecDeque<Message>) -> Result<(), String> {
25+
self.dispatcher.poll_node_graph_evaluation(responses)
2626
}
2727
}
2828

editor/src/consts.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ pub const MANIPULATOR_GROUP_MARKER_SIZE: f64 = 6.;
4949
pub const SELECTION_THRESHOLD: f64 = 10.;
5050
pub const HIDE_HANDLE_DISTANCE: f64 = 3.;
5151
pub const INSERT_POINT_ON_SEGMENT_TOO_FAR_DISTANCE: f64 = 50.;
52-
pub const INSERT_POINT_ON_SEGMENT_TOO_CLOSE_DISTANCE: f64 = 5.;
5352

5453
// Pen tool
5554
pub const CREATE_CURVE_THRESHOLD: f64 = 5.;

0 commit comments

Comments
 (0)