Skip to content

Commit

Permalink
WIP - Transition graphics backend from vulkano to winit
Browse files Browse the repository at this point in the history
This PR is an overhaul of the graphics backend used throughout nannou.

See nannou-org#446, nannou-org#374, nannou-org#408 for related issues and motivation.
  • Loading branch information
mitchmindtree committed Feb 16, 2020
1 parent 3969f8f commit 24f809d
Show file tree
Hide file tree
Showing 22 changed files with 1,475 additions and 4,575 deletions.
16 changes: 5 additions & 11 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ default = ["notosans"]

[dependencies]
cgmath = { version = "0.17", features = ["serde"] }
conrod_core = "0.68"
conrod_winit = "0.68"
conrod_vulkano = "0.68"
conrod_core = { git = "https://github.com/mitchmindtree/conrod", branch = "conrod_wgpu" }
conrod_wgpu = { git = "https://github.com/mitchmindtree/conrod", branch = "conrod_wgpu" }
conrod_winit = { git = "https://github.com/mitchmindtree/conrod", branch = "conrod_wgpu" }
daggy = "0.6"
find_folder = "0.3"
image = "0.22"
Expand All @@ -32,21 +32,15 @@ serde = "1"
serde_derive = "1"
serde_json = "1"
toml = "0.5"
vulkano = "0.16"
vulkano-win = "0.16"
vulkano-shaders = "0.16"
walkdir = "2"
winit = "0.19"
wgpu = "0.4"
winit = "0.21"

[dev-dependencies]
audrey = "0.2"
nannou_audio = "0.2"
nannou_laser = "0.3"
nannou_osc = "0.1"
shade_runner = "0.3"

[target.'cfg(target_os = "macos")'.dependencies]
moltenvk_deps = "0.1"

# --------------- Nannou Examples
[[example]]
Expand Down
2 changes: 1 addition & 1 deletion examples/simple_window.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ fn model(app: &App) -> Model {
// Create a new window! Store the ID so we can refer to it later.
let _window = app
.new_window()
.with_dimensions(512, 512)
.with_size(512, 512)
.with_title("nannou")
.view(view) // The function that will be called for presenting graphics to a frame.
.event(event) // The function that will be called when the window receives events.
Expand Down
Loading

0 comments on commit 24f809d

Please sign in to comment.