Skip to content

Commit

Permalink
Merged engine back into the main program, as it wasn't beneficial and…
Browse files Browse the repository at this point in the history
… was just getting in the way.
  • Loading branch information
villuna committed Feb 11, 2024
1 parent 5469613 commit 090159f
Show file tree
Hide file tree
Showing 26 changed files with 413 additions and 509 deletions.
166 changes: 59 additions & 107 deletions Cargo.lock

Large diffs are not rendered by default.

36 changes: 13 additions & 23 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,39 +6,29 @@ edition = "2021"

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[workspace]
members = [
"silkwood",
]

[workspace.dependencies]
[dependencies]
egui = "0.23.0"
kira = "0.8.5"
winit = { version = "0.28.3", features = ["serde"] }
anyhow = "1.0"
lyon = "1.0.1"
wgpu = "0.17.0"
# wgpu_text doesn't follow semver -_-
wgpu_text = "=0.8.3"

[dependencies]
silkwood = { path = "./silkwood" }
anyhow.workspace = true
egui.workspace = true
wgpu = "0.17.0"
bytemuck = { version = "1.13.1", features = ["derive"] }
env_logger = "0.10.0"
itertools = "0.11"
kira.workspace = true
lazy_static = "1.4.0"
log = "0.4.17"
lookahead = "0.1.0"
lyon.workspace = true
nom = "7.1.3"
num-derive = "0.4"
num-traits = "0.2"
serde = { version = "1.0.183", features = ["derive"] }
toml = "0.8"
wgpu.workspace = true
# I'll have to get rid of this dependency, it's unnecessary
wgpu_text.workspace = true
winit.workspace = true
ab_glyph = "0.2.23"
num-derive = "0.4.2"
num-traits = "0.2.18"
image = "0.24.8"
pollster = "0.3.0"
itertools = "0.12.1"
anyhow = "1.0.79"
toml = "0.8.10"
egui-wgpu = "0.23.0"
egui_winit_platform = "0.20.0"

1 change: 0 additions & 1 deletion silkwood/.gitignore

This file was deleted.

7 changes: 0 additions & 7 deletions silkwood/Cargo.lock

This file was deleted.

25 changes: 0 additions & 25 deletions silkwood/Cargo.toml

This file was deleted.

Loading

0 comments on commit 090159f

Please sign in to comment.