Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
3a7af1c
Implement experimental Context struct and traits
TrueDoctor Jan 12, 2025
b1be69b
Add Ctx super trait
TrueDoctor Jan 12, 2025
247174f
Checkpoint
TrueDoctor Jan 13, 2025
597e729
Return Any instead of DynAny
TrueDoctor Jan 27, 2025
aac084a
Fix send implementation for inputs with lifetimes
TrueDoctor Jan 27, 2025
183eaa5
Port more nodes
TrueDoctor Jan 28, 2025
950873b
Uncomment nodes
TrueDoctor Jan 28, 2025
551624f
Port more nodes
TrueDoctor Jan 28, 2025
7a67e20
Port vector nodes
TrueDoctor Jan 28, 2025
5da6fc9
Merge branch 'master' into context
Keavon Jan 29, 2025
2d3b177
Merge branch 'master' into context-deconflicted
Keavon Jan 29, 2025
b8838f6
Partial progress (the stuff I'm more sure about)
Keavon Jan 29, 2025
9dee8cb
Partial progress (the stuff that's not compiling and I'm not sure about)
Keavon Jan 29, 2025
2a16b81
Fix more errors
TrueDoctor Jan 29, 2025
83a15e2
First pass of fixing errors introduced by rebase
TrueDoctor Jan 29, 2025
5a3aaa1
Port wasm application io
TrueDoctor Jan 29, 2025
7ff8c64
Fix brush node types
TrueDoctor Jan 29, 2025
1c07e77
Add type annotation
TrueDoctor Jan 29, 2025
837fef8
Fix warnings and wasm compilation
TrueDoctor Jan 29, 2025
6efacea
Merge remote-tracking branch 'origin/master' into context
TrueDoctor Jan 29, 2025
e780b05
Change types for Document Node definitions
TrueDoctor Jan 29, 2025
2217740
Improve debugging for footprint not found errors
TrueDoctor Jan 29, 2025
0212f5a
Forward context in append artboard node
TrueDoctor Jan 29, 2025
252de1b
Merge branch 'master' into temp
Keavon Jan 31, 2025
8da6c0e
Fix thumbnails
0HyperCube Feb 2, 2025
2aad15a
Fix loading most demo artwork
Keavon Feb 3, 2025
de52885
Wrap output type of all nodes in future
TrueDoctor Jan 30, 2025
459cbf7
Encode futures as part of the type
TrueDoctor Feb 4, 2025
19db709
Fix document node definitions for future types
TrueDoctor Feb 12, 2025
be04782
Merge branch 'master' into context
Keavon Feb 13, 2025
798c5e1
Remove Clippy warnings
Keavon Feb 13, 2025
31e0035
Fix more things
TrueDoctor Feb 14, 2025
1bd345d
Fix opening demo art with manual composition upgrading
Keavon Feb 15, 2025
20ce7b3
Set correct type for manual composition
TrueDoctor Feb 28, 2025
4a5c16b
Fix brush
TrueDoctor Feb 28, 2025
2f139bc
Merge remote-tracking branch 'origin/master' into context
TrueDoctor Feb 28, 2025
f255ed9
Fix tests
TrueDoctor Mar 1, 2025
bcd3145
Merge remote-tracking branch 'origin/master' into context
TrueDoctor Mar 1, 2025
f5e6350
Merge branch 'master' into context
Keavon Mar 1, 2025
5266358
Update docs for deps
Keavon Mar 1, 2025
4769f21
Merge branch 'master' into context
Keavon Mar 1, 2025
a9395ce
Fix up some node signature issues
Keavon Mar 1, 2025
fdf1d85
Merge branch 'master' into context
Keavon Mar 1, 2025
25d4abc
Code review
Keavon Mar 1, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
},
"ghcr.io/devcontainers/features/node:1": {}
},
"onCreateCommand": "cargo install cargo-watch wasm-pack cargo-about && cargo install -f [email protected].99",
"onCreateCommand": "cargo install cargo-watch wasm-pack cargo-about && cargo install -f [email protected].100",
"customizations": {
"vscode": {
// NOTE: Keep this in sync with `.vscode/extensions.json`
Expand Down
59 changes: 43 additions & 16 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 4 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -63,10 +63,10 @@ spirv-std = { git = "https://github.com/Rust-GPU/rust-gpu.git" }
wgpu-types = "23"
wgpu = "23"
once_cell = "1.13" # Remove when `core::cell::LazyCell` (<https://doc.rust-lang.org/core/cell/struct.LazyCell.html>) is stabilized in Rust 1.80 and we bump our MSRV
wasm-bindgen = "=0.2.99" # NOTICE: ensure this stays in sync with the `wasm-bindgen-cli` version in `website/content/volunteer/guide/project-setup/_index.md`. We pin this version because wasm-bindgen upgrades may break various things.
wasm-bindgen = "=0.2.100" # NOTICE: ensure this stays in sync with the `wasm-bindgen-cli` version in `website/content/volunteer/guide/project-setup/_index.md`. We pin this version because wasm-bindgen upgrades may break various things.
wasm-bindgen-futures = "0.4"
js-sys = "=0.3.76"
web-sys = "=0.3.76"
js-sys = "=0.3.77"
web-sys = "=0.3.77"
winit = "0.29"
url = "2.5"
tokio = { version = "1.29", features = ["fs", "io-std"] }
Expand All @@ -80,6 +80,7 @@ base64 = "0.22"
image = { version = "0.25", default-features = false, features = ["png"] }
rustybuzz = "0.20"
spirv = "0.3"
pretty_assertions = "1.4.1"
fern = { version = "0.7", features = ["colored"] }
num_enum = "0.7"
num-derive = "0.4"
Expand Down
Loading