Skip to content

Commit

Permalink
Merge pull request #4 from ten3roberts/dev
Browse files Browse the repository at this point in the history
Dev
  • Loading branch information
ten3roberts authored Mar 11, 2024
2 parents 91dca1b + 36f1412 commit 726cf43
Show file tree
Hide file tree
Showing 38 changed files with 2,067 additions and 845 deletions.
88 changes: 63 additions & 25 deletions Cargo.lock

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

10 changes: 7 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[workspace]
members = [ "violet-wgpu", "violet-core", "violet-web-example" ]
members = [ "violet-wgpu", "violet-core", "violet-demo" ]

[workspace.package]
version = "0.0.1"
Expand Down Expand Up @@ -33,17 +33,20 @@ futures-signals = "0.3"
itertools = "0.12"
glam = { version = "0.24", features = ["bytemuck"] }
futures = "0.3"
futures-concurrency = "7.0"
flume = "0.11"
parking_lot = "0.12"
slotmap = "1.0"
anyhow = "1.0"
once_cell = "1.18"
slab = "0.4"
tynm ="0.1"
tokio = { version = "1.0", default-features = false, features = ["macros", "rt"] }
arrayvec = "0.7"

bytemuck = { version = "1.13", features = ["derive"] }
winit = "0.29"
wgpu = { version = "0.19", default-features = false, features = ["dx12", "fragile-send-sync-non-atomic-wasm", "webgl", "wgsl"] }
wgpu = { version = "0.19", default-features = false, features = ["fragile-send-sync-non-atomic-wasm", "webgl", "wgsl"] }
palette = { version = "0.7", features = ["serializing"] }
dashmap = "5.4"
image = { version = "0.24", default_features = false, features = ["png", "jpeg"] }
Expand All @@ -67,6 +70,7 @@ web-time = "1.0"
wasm-bindgen-futures = "0.4"
wasm-bindgen = "0.2"
web-sys = "0.3"
tracing-tree = "0.3"

[dependencies]
violet-wgpu = { path = "violet-wgpu" }
Expand All @@ -89,7 +93,7 @@ futures.workspace = true
tokio = { version = "1.0", default_features= false, features = ["macros"] }
serde_json = "1.0"

tracing-tree = "0.3"
tracing-tree.workspace = true
tracing-subscriber = { version = "0.3", features = [
"env-filter",
] }
Expand Down
Loading

0 comments on commit 726cf43

Please sign in to comment.