Skip to content

Commit

Permalink
Merge pull request #563 from dimforge/testbed-bevy-0.12
Browse files Browse the repository at this point in the history 
chore: update testbed to bevy 0.12
  • Loading branch information
@sebcrozet
sebcrozet authored Dec 10, 2023
2 parents 8c969d4 + 95a7d9e commit c33b4ee
Show file tree
Hide file tree
Showing 7 changed files with 94 additions and 106 deletions.
14 changes: 7 additions & 7 deletions crates/rapier_testbed2d-f64/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,20 +40,20 @@ bincode = "1"
Inflector = "0.11"
md5 = "0.7"

bevy_egui = "0.22"
bevy_ecs = "0.11"
bevy_core_pipeline = "0.11"
bevy_pbr = "0.11"
bevy_sprite = "0.11"
bevy_egui = "0.23"
bevy_ecs = "0.12"
bevy_core_pipeline = "0.12"
bevy_pbr = "0.12"
bevy_sprite = "0.12"
#bevy_prototype_debug_lines = "0.7"

# Dependencies for native only.
[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
bevy = {version = "0.11", default-features = false, features = ["bevy_asset", "bevy_winit", "x11", "tonemapping_luts", "ktx2", "zstd", "bevy_render", "bevy_pbr", "bevy_gizmos"]}
bevy = {version = "0.12", default-features = false, features = ["bevy_asset", "bevy_winit", "x11", "tonemapping_luts", "ktx2", "zstd", "bevy_render", "bevy_pbr", "bevy_gizmos"]}

# Dependencies for WASM only.
[target.'cfg(target_arch = "wasm32")'.dependencies]
bevy = {version = "0.11", default-features = false, features = ["bevy_asset", "bevy_winit", "tonemapping_luts", "ktx2", "zstd", "bevy_render", "bevy_pbr", "bevy_gizmos"]}
bevy = {version = "0.12", default-features = false, features = ["bevy_asset", "bevy_winit", "tonemapping_luts", "ktx2", "zstd", "bevy_render", "bevy_pbr", "bevy_gizmos"]}
#bevy_webgl2 = "0.5"

[dependencies.rapier]
Expand Down
14 changes: 7 additions & 7 deletions crates/rapier_testbed2d/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,20 +40,20 @@ bincode = "1"
Inflector = "0.11"
md5 = "0.7"

bevy_egui = "0.22"
bevy_ecs = "0.11"
bevy_core_pipeline = "0.11"
bevy_pbr = "0.11"
bevy_sprite = "0.11"
bevy_egui = "0.23"
bevy_ecs = "0.12"
bevy_core_pipeline = "0.12"
bevy_pbr = "0.12"
bevy_sprite = "0.12"
#bevy_prototype_debug_lines = "0.7"

# Dependencies for native only.
[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
bevy = {version = "0.11", default-features = false, features = ["bevy_sprite", "bevy_winit", "x11", "tonemapping_luts", "ktx2", "zstd", "bevy_render", "bevy_pbr", "bevy_gizmos"]}
bevy = {version = "0.12", default-features = false, features = ["bevy_sprite", "bevy_winit", "x11", "tonemapping_luts", "ktx2", "zstd", "bevy_render", "bevy_pbr", "bevy_gizmos"]}

# Dependencies for WASM only.
[target.'cfg(target_arch = "wasm32")'.dependencies]
bevy = {version = "0.11", default-features = false, features = ["bevy_sprite", "bevy_winit", "tonemapping_luts", "ktx2", "zstd", "bevy_render", "bevy_pbr", "bevy_gizmos"]}
bevy = {version = "0.12", default-features = false, features = ["bevy_sprite", "bevy_winit", "tonemapping_luts", "ktx2", "zstd", "bevy_render", "bevy_pbr", "bevy_gizmos"]}
#bevy_webgl2 = "0.5"

[dependencies.rapier]
Expand Down
14 changes: 7 additions & 7 deletions crates/rapier_testbed3d-f64/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,20 +39,20 @@ md5 = "0.7"
Inflector = "0.11"
serde = { version = "1", features = [ "derive" ] }

bevy_egui = "0.22"
bevy_ecs = "0.11"
bevy_core_pipeline = "0.11"
bevy_pbr = "0.11"
bevy_sprite = "0.11"
bevy_egui = "0.23"
bevy_ecs = "0.12"
bevy_core_pipeline = "0.12"
bevy_pbr = "0.12"
bevy_sprite = "0.12"
#bevy_prototype_debug_lines = { version = "0.7", features = [ "3d" ] }

# Dependencies for native only.
[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
bevy = {version = "0.11", default-features = false, features = ["bevy_winit", "x11", "tonemapping_luts", "ktx2", "zstd", "bevy_render", "bevy_pbr", "bevy_gizmos"]}
bevy = {version = "0.12", default-features = false, features = ["bevy_winit", "x11", "tonemapping_luts", "ktx2", "zstd", "bevy_render", "bevy_pbr", "bevy_gizmos"]}

# Dependencies for WASM only.
[target.'cfg(target_arch = "wasm32")'.dependencies]
bevy = {version = "0.11", default-features = false, features = ["bevy_winit", "tonemapping_luts", "ktx2", "zstd", "bevy_render", "bevy_pbr", "bevy_gizmos"]}
bevy = {version = "0.12", default-features = false, features = ["bevy_winit", "tonemapping_luts", "ktx2", "zstd", "bevy_render", "bevy_pbr", "bevy_gizmos"]}
#bevy_webgl2 = "0.5"

[dependencies.rapier]
Expand Down
14 changes: 7 additions & 7 deletions crates/rapier_testbed3d/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,20 +43,20 @@ md5 = "0.7"
Inflector = "0.11"
serde = { version = "1", features = [ "derive" ] }

bevy_egui = "0.22"
bevy_ecs = "0.11"
bevy_core_pipeline = "0.11"
bevy_pbr = "0.11"
bevy_sprite = "0.11"
bevy_egui = "0.23"
bevy_ecs = "0.12"
bevy_core_pipeline = "0.12"
bevy_pbr = "0.12"
bevy_sprite = "0.12"
#bevy_prototype_debug_lines = { version = "0.7", features = [ "3d" ] }

# Dependencies for native only.
[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
bevy = {version = "0.11", default-features = false, features = ["bevy_winit", "x11", "tonemapping_luts", "ktx2", "zstd", "bevy_render", "bevy_pbr", "bevy_gizmos"]}
bevy = {version = "0.12", default-features = false, features = ["bevy_winit", "x11", "tonemapping_luts", "ktx2", "zstd", "bevy_render", "bevy_pbr", "bevy_gizmos"]}

# Dependencies for WASM only.
[target.'cfg(target_arch = "wasm32")'.dependencies]
bevy = {version = "0.11", default-features = false, features = ["bevy_winit", "tonemapping_luts", "ktx2", "zstd", "bevy_render", "bevy_pbr", "bevy_gizmos"]}
bevy = {version = "0.12", default-features = false, features = ["bevy_winit", "tonemapping_luts", "ktx2", "zstd", "bevy_render", "bevy_pbr", "bevy_gizmos"]}
#bevy_webgl2 = "0.5"

[dependencies.rapier]
Expand Down
4 changes: 2 additions & 2 deletions src_testbed/camera2d.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ impl OrbitCameraPlugin {
mut query: Query<(&mut OrbitCamera, &mut Transform, &mut Camera)>,
) {
let mut delta = Vec2::ZERO;
for event in mouse_motion_events.iter() {
for event in mouse_motion_events.read() {
delta += event.delta;
}
for (mut camera, _, _) in query.iter_mut() {
Expand All @@ -71,7 +71,7 @@ impl OrbitCameraPlugin {
mut query: Query<&mut OrbitCamera, With<Camera>>,
) {
let mut total = 0.0;
for event in mouse_wheel_events.iter() {
for event in mouse_wheel_events.read() {
total -= event.y
* match event.unit {
Line => 1.0,
Expand Down
4 changes: 2 additions & 2 deletions src_testbed/camera3d.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ impl OrbitCameraPlugin {
mut query: Query<(&mut OrbitCamera, &mut Transform, &mut Camera)>,
) {
let mut delta = Vec2::ZERO;
for event in mouse_motion_events.iter() {
for event in mouse_motion_events.read() {
delta += event.delta;
}
for (mut camera, transform, _) in query.iter_mut() {
Expand Down Expand Up @@ -97,7 +97,7 @@ impl OrbitCameraPlugin {
mut query: Query<&mut OrbitCamera, With<Camera>>,
) {
let mut total = 0.0;
for event in mouse_wheel_events.iter() {
for event in mouse_wheel_events.read() {
total += event.y
* match event.unit {
Line => 1.0,
Expand Down
Loading

0 comments on commit c33b4ee

Please sign in to comment.