Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update to bevy 0.6 #25

Merged
merged 25 commits into from
Jan 8, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
33b4d7c
track bevy main branch
jakobhellermann May 9, 2021
f4e9ad3
bump winit version to match bevy main
aevyrie May 19, 2021
9479fee
update bevy: wgpu 0.8
jakobhellermann May 9, 2021
27e61c7
update bevy: bytemuck
jakobhellermann May 18, 2021
6b5d0d8
remove AppBuilder
jakobhellermann Jul 29, 2021
8678aaf
fix lifetimes
jakobhellermann Sep 5, 2021
1c8cbe9
update to pipelined bevy rendering
jakobhellermann Jul 15, 2021
a227119
use raw wgpu render pipeline
jakobhellermann Oct 29, 2021
f3ace4a
remove bevy_wgpu from features
jakobhellermann Nov 26, 2021
350398c
remove glsl shaders
jakobhellermann Nov 26, 2021
80c78f4
small refactor
jakobhellermann Nov 26, 2021
6f4c565
queue bind groups in RenderStage::Queue
jakobhellermann Nov 26, 2021
6040034
Refactor WGSL vector casts (remove vec3_bool_to_f32)
mvlabat Dec 5, 2021
4c4413d
Avoid re-creating vertex and index buffers each frame
mvlabat Dec 5, 2021
90dcb56
update winit
jakobhellermann Dec 11, 2021
f894bbe
pipelined merged into main
jakobhellermann Dec 14, 2021
aaedddd
cargo fmt
jakobhellermann Dec 14, 2021
ba81dc3
remove 'tracing 0.2.0' workaround
jakobhellermann Dec 14, 2021
98eec15
disable two windows example
jakobhellermann Dec 14, 2021
ee41c8a
Update wgpu
TheRawMeatball Dec 19, 2021
c93c998
fix sub app mutability
jakobhellermann Dec 24, 2021
a4b5af4
fix rebase errors
jakobhellermann Jan 4, 2022
7c0b57b
fix doc links and remove unused `node` export
jakobhellermann Jan 7, 2022
37f51a2
reenable two_windows example, store EguiTransform's for every window …
jakobhellermann Jan 7, 2022
7790fc0
bevy 0.6
jakobhellermann Jan 8, 2022
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
4 changes: 0 additions & 4 deletions .github/workflows/check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -101,10 +101,6 @@ jobs:
restore-keys: |
cache-wasm32-cargo-${{ hashFiles('**/Cargo.toml') }}
cache-wasm32-cargo
- uses: actions-rs/cargo@v1
with:
command: update
args: -p tracing-wasm --precise 0.2.0
- uses: actions-rs/cargo@v1
with:
command: clippy
Expand Down
17 changes: 10 additions & 7 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,24 +19,27 @@ manage_clipboard = ["clipboard", "thread_local"]
open_url = ["webbrowser"]

[dependencies]
bevy = { version = "0.5", default-features = false, features = [
"render",
bevy = { version = "0.6", default-features = false, features = [
"bevy_render",
"bevy_winit",
"bevy_core_pipeline"
] }
egui = "0.16"
webbrowser = { version = "0.5.5", optional = true }
winit = { version = "0.24.0", features = ["x11"], default-features = false }
winit = { version = "0.26.0", features = ["x11"], default-features = false }
bytemuck = { version = "1.7.0", features = ["derive"] }
wgpu = "0.12.0"

[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
clipboard = { version = "0.5.0", optional = true }
thread_local = { version = "1.1.0", optional = true }

[dev-dependencies]
once_cell = "1.9.0"
version-sync = "0.9.2"

[target.'cfg(not(target_arch = "wasm32"))'.dev-dependencies]
bevy = { version = "0.5", default-features = false, features = [
"bevy_wgpu",
"x11",
"png",
bevy = { version = "0.6", default-features = false, features = [
"x11",
"png"
] }
2 changes: 1 addition & 1 deletion examples/simple.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ use bevy::prelude::*;
use bevy_egui::{egui, EguiContext, EguiPlugin};

fn main() {
App::build()
App::new()
.add_plugins(DefaultPlugins)
.add_plugin(EguiPlugin)
.add_system(ui_example.system())
Expand Down
Loading