Skip to content

Update testbeds to bevy to 0.16 and egui to 0.31 #846

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.

Sign up for GitHub

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update testbeds to bevy to 0.16 and egui to 0.31 #846

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ needless_lifetimes = "allow"
#parry3d-f64 = { git = "https://github.com/dimforge/parry", branch = "master" }

# See https://github.com/EmbarkStudios/puffin/pull/234
puffin_egui = { git = "https://github.com/tedsteen/puffin.git", rev = "11771ebe00fd257aedbb545df3339ad597b1cc34" }
puffin_egui = { git = "https://github.com/tedsteen/puffin.git", rev = "993b78a05318d566687cab01036a2c3af5e54f6b" }


# # For feature unstable-puffin-pr-235
Expand Down
20 changes: 12 additions & 8 deletions crates/rapier_testbed2d-f64/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,11 @@ crossbeam = "0.8"
bincode = "1"
Inflector = "0.11"
md5 = "0.7"
bevy_egui = "0.31"
bevy_ecs = "0.15"
bevy_core_pipeline = "0.15"
bevy_pbr = "0.15"
bevy_sprite = "0.15"
bevy_egui = "0.34"
bevy_ecs = "0.16"
bevy_core_pipeline = "0.16"
bevy_pbr = "0.16"
bevy_sprite = "0.16"
profiling = "1.0"
puffin_egui = { version = "0.29", optional = true }
serde_json = "1"
Expand All @@ -67,31 +67,35 @@ indexmap = { version = "2", features = ["serde"] }

# Dependencies for native only.
[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
bevy = { version = "0.15", default-features = false, features = [
bevy = { version = "0.16", default-features = false, features = [
"bevy_asset",
"bevy_winit",
"bevy_window",
"x11",
"wayland",
Copy link
Contributor Author

@ThierryBerger ThierryBerger Jun 25, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This fixes experience for linux users but crashes ci, not worth having, or maybe only for dev-dependencies ? or upstream fix?

"tonemapping_luts",
"ktx2",
"zstd",
"bevy_log",
"bevy_render",
"bevy_pbr",
"bevy_gizmos",
"serialize"
"serialize",
] }

# Dependencies for WASM only.
[target.'cfg(target_arch = "wasm32")'.dependencies]
bevy = { version = "0.15", default-features = false, features = [
bevy = { version = "0.16", default-features = false, features = [
"bevy_asset",
"bevy_winit",
"bevy_window",
"tonemapping_luts",
"ktx2",
"zstd",
"bevy_log",
"bevy_render",
"bevy_pbr",
"bevy_picking",
"bevy_gizmos",
] }
#bevy_webgl2 = "0.5"
Expand Down
20 changes: 12 additions & 8 deletions crates/rapier_testbed2d/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,11 @@ crossbeam = "0.8"
bincode = "1"
Inflector = "0.11"
md5 = "0.7"
bevy_egui = "0.31"
bevy_ecs = "0.15"
bevy_core_pipeline = "0.15"
bevy_pbr = "0.15"
bevy_sprite = "0.15"
bevy_egui = "0.34"
bevy_ecs = "0.16"
bevy_core_pipeline = "0.16"
bevy_pbr = "0.16"
bevy_sprite = "0.16"
profiling = "1.0"
puffin_egui = { version = "0.29", optional = true }
serde = { version = "1.0.215", features = ["derive"] }
Expand All @@ -67,31 +67,35 @@ indexmap = { version = "2", features = ["serde"] }

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

# Dependencies for WASM only.
[target.'cfg(target_arch = "wasm32")'.dependencies]
bevy = { version = "0.15", default-features = false, features = [
bevy = { version = "0.16", default-features = false, features = [
"bevy_sprite",
"bevy_winit",
"bevy_window",
"tonemapping_luts",
"ktx2",
"zstd",
"bevy_log",
"bevy_render",
"bevy_pbr",
"bevy_picking",
"bevy_gizmos",
] }
#bevy_webgl2 = "0.5"
Expand Down
22 changes: 13 additions & 9 deletions crates/rapier_testbed3d-f64/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,43 +57,47 @@ md5 = "0.7"
Inflector = "0.11"
serde = { version = "1", features = ["derive"] }
serde_json = "1"
bevy_egui = "0.31"
bevy_ecs = "0.15"
bevy_core_pipeline = "0.15"
bevy_pbr = "0.15"
bevy_sprite = "0.15"
bevy_egui = "0.34"
bevy_ecs = "0.16"
bevy_core_pipeline = "0.16"
bevy_pbr = "0.16"
bevy_sprite = "0.16"
profiling = "1.0"
puffin_egui = { version = "0.29", optional = true, git = "https://github.com/Vrixyz/puffin.git", branch = "expose_ui_options" }
indexmap = { version = "2", features = ["serde"] }

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

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

Expand Down
20 changes: 12 additions & 8 deletions crates/rapier_testbed3d/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,39 +58,43 @@ md5 = "0.7"
Inflector = "0.11"
serde = { version = "1", features = ["derive"] }
serde_json = "1"
bevy_egui = "0.31"
bevy_ecs = "0.15"
bevy_core_pipeline = "0.15"
bevy_pbr = "0.15"
bevy_sprite = "0.15"
bevy_egui = "0.34"
bevy_ecs = "0.16"
bevy_core_pipeline = "0.16"
bevy_pbr = "0.16"
bevy_sprite = "0.16"
profiling = "1.0"
puffin_egui = { version = "0.29", optional = true }
indexmap = { version = "2", features = ["serde"] }

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

# Dependencies for WASM only.
[target.'cfg(target_arch = "wasm32")'.dependencies]
bevy = { version = "0.15", default-features = false, features = [
bevy = { version = "0.16", default-features = false, features = [
"bevy_winit",
"tonemapping_luts",
"ktx2",
"zstd",
"bevy_log",
"bevy_render",
"bevy_pbr",
"bevy_picking",
"bevy_gizmos",
] }
#bevy_webgl2 = "0.5"
Expand Down
2 changes: 1 addition & 1 deletion examples3d/utils/character.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ fn kinematic_control_ui(ui: &mut Ui, character_controller: &mut KinematicCharact
.on_hover_text("The minimum angle (radians) between the floor’s normal and the `up` vector before the character starts to slide down automatically.");
}
let mut is_snapped = character_controller.snap_to_ground.is_some();
if ui.checkbox(&mut is_snapped, "snap_to_ground").changed {
if ui.checkbox(&mut is_snapped, "snap_to_ground").changed() {
match is_snapped {
true => {
character_controller.snap_to_ground = Some(CharacterLength::Relative(0.1));
Expand Down
2 changes: 1 addition & 1 deletion examples3d/voxels3.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ pub fn init_world(testbed: &mut Testbed) {
/*
* Some dynamic primitives.
*/
let nik = 30;
let nik = 3;
let extents = floor_aabb.extents() * 0.75;
let margin = (floor_aabb.extents() - extents) / 2.0;
let ball_radius = 0.5;
Expand Down
2 changes: 1 addition & 1 deletion src_testbed/mouse.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ pub fn track_mouse_state(
windows: Query<&Window, With<PrimaryWindow>>,
camera: Query<(&GlobalTransform, &Camera), With<MainCamera>>,
) {
if let Ok(window) = windows.get_single() {
if let Ok(window) = windows.single() {
for (camera_transform, camera) in camera.iter() {
if let Some(cursor) = window.cursor_position() {
let ndc_cursor = ((cursor / Vec2::new(window.width(), window.height()) * 2.0)
Expand Down
29 changes: 16 additions & 13 deletions src_testbed/testbed.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
#![allow(clippy::unnecessary_cast)] // allowed for f32 -> f64 cast for the f64 testbed.

use bevy::prelude::*;
use bevy_egui::EguiContextPass;
use std::env;
use std::mem;
use std::num::NonZeroUsize;
Expand Down Expand Up @@ -483,9 +484,11 @@ impl TestbedApp {
.init_resource::<mouse::SceneMouse>()
.add_plugins(DefaultPlugins.set(window_plugin))
.add_plugins(OrbitCameraPlugin)
.add_plugins(WireframePlugin)
.add_plugins(WireframePlugin::default())
.add_plugins(RapierDebugRenderPlugin::default())
.add_plugins(bevy_egui::EguiPlugin);
.add_plugins(bevy_egui::EguiPlugin {
enable_multipass_for_primary_context: true,
});

#[cfg(target_arch = "wasm32")]
app.add_plugin(bevy_webgl2::WebGL2Plugin);
Expand All @@ -499,8 +502,8 @@ impl TestbedApp {
.insert_non_send_resource(self.harness)
.insert_resource(self.builders)
.insert_non_send_resource(self.plugins)
.add_systems(Update, update_testbed)
.add_systems(Update, egui_focus)
.add_systems(EguiContextPass, update_testbed)
.add_systems(EguiContextPass, egui_focus)
.add_systems(Update, track_mouse_state);

init(&mut app);
Expand Down Expand Up @@ -1135,8 +1138,8 @@ fn update_testbed(
materials: &mut *materials,
material_handles: &mut material_handles,
components: &mut gfx_components,
camera_transform: *cameras.single().1,
camera: &mut cameras.single_mut().2,
camera_transform: *cameras.single().unwrap().1,
camera: &mut cameras.single_mut().unwrap().2,
ui_context: &mut ui_context,
keys: &keys,
mouse: &mouse,
Expand Down Expand Up @@ -1216,7 +1219,7 @@ fn update_testbed(
.ok()
.and_then(|data| serde_json::from_slice::<SerializableTestbedState>(&data).ok())
{
state.apply_saved_data(saved_state, &mut cameras.single_mut().2);
state.apply_saved_data(saved_state, &mut cameras.single_mut().unwrap().2);
state.camera_locked = true;
}
}
Expand Down Expand Up @@ -1251,8 +1254,8 @@ fn update_testbed(
materials: &mut *materials,
material_handles: &mut material_handles,
components: &mut gfx_components,
camera_transform: *cameras.single().1,
camera: &mut cameras.single_mut().2,
camera_transform: *cameras.single().unwrap().1,
camera: &mut cameras.single_mut().unwrap().2,
ui_context: &mut ui_context,
keys: &keys,
mouse: &mouse,
Expand Down Expand Up @@ -1427,8 +1430,8 @@ fn update_testbed(
materials: &mut *materials,
material_handles: &mut material_handles,
components: &mut gfx_components,
camera_transform: *cameras.single().1,
camera: &mut cameras.single_mut().2,
camera_transform: *cameras.single().unwrap().1,
camera: &mut cameras.single_mut().unwrap().2,
ui_context: &mut ui_context,
keys: &keys,
mouse: &mouse,
Expand Down Expand Up @@ -1481,7 +1484,7 @@ fn update_testbed(
}
}

if let Ok(window) = windows.get_single() {
if let Ok(window) = windows.single() {
for (camera, camera_pos, _) in cameras.iter_mut() {
highlight_hovered_body(
&mut material_handles,
Expand Down Expand Up @@ -1527,7 +1530,7 @@ fn update_testbed(
// If any saveable settings changed, save them again.
#[cfg(not(target_arch = "wasm32"))]
{
let new_save_data = state.save_data(cameras.single().2.clone());
let new_save_data = state.save_data(cameras.single().unwrap().2.clone());
if state.prev_save_data != new_save_data {
// Save the data in a file.
let data = serde_json::to_string_pretty(&new_save_data).unwrap();
Expand Down
Loading