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

Picking backend for bevy 0.15 #613

Merged
merged 22 commits into from
Feb 3, 2025
Merged
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
re-enable inspector
Vrixyz committed Nov 7, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
commit 8dc9d5f13b74e3f24a458b8c5f6ca92ad67b68cd
3 changes: 2 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
@@ -20,9 +20,10 @@ codegen-units = 1
#parry3d = { path = "../parry/crates/parry3d" }
#rapier2d = { path = "../rapier/crates/rapier2d" }
#rapier3d = { path = "../rapier/crates/rapier3d" }

#nalgebra = { git = "https://github.com/dimforge/nalgebra", branch = "dev" }
#parry2d = { git = "https://github.com/dimforge/parry", branch = "master" }
#parry3d = { git = "https://github.com/dimforge/parry", branch = "master" }
#rapier2d = { git = "https://github.com/dimforge/rapier", branch = "character-controller" }
#rapier3d = { git = "https://github.com/dimforge/rapier", branch = "character-controller" }
bevy_egui = { git = "https://github.com/Vrixyz/bevy_egui", branch = "bevy_main" }
bevy-inspector-egui = { git = "https://github.com/Vrixyz/bevy-inspector-egui", branch = "bevy_0.15" }
4 changes: 2 additions & 2 deletions bevy_rapier2d/Cargo.toml
Original file line number Diff line number Diff line change
@@ -65,8 +65,8 @@ bevy = { version = "0.15.0-rc.2", default-features = false, features = [
oorandom = "11"
approx = "0.5.1"
glam = { version = "0.29", features = ["approx"] }
# bevy-inspector-egui = "0.25.1"
# bevy_egui = "0.28.0"
bevy-inspector-egui = "0.28.0"
bevy_egui = "0.30.0"
# bevy_mod_debugdump = "0.11"
bevy_mod_debugdump = { git = "https://github.com/andriyDev/bevy_mod_debugdump.git", branch = "bevy-0.15" }

8 changes: 4 additions & 4 deletions bevy_rapier2d/examples/testbed2.rs
Original file line number Diff line number Diff line change
@@ -13,8 +13,8 @@ mod player_movement2;
mod rope_joint2;

use bevy::prelude::*;
// use bevy_egui::{egui, EguiContexts, EguiPlugin};
//use bevy_inspector_egui::quick::WorldInspectorPlugin;
use bevy_egui::{egui, EguiContexts, EguiPlugin};
use bevy_inspector_egui::quick::WorldInspectorPlugin;
use bevy_rapier2d::prelude::*;

#[derive(Debug, Reflect, Clone, Copy, Eq, PartialEq, Default, Hash, States)]
@@ -62,10 +62,10 @@ fn main() {
app.init_resource::<ExamplesRes>()
.add_plugins((
DefaultPlugins,
//EguiPlugin,
EguiPlugin,
RapierPhysicsPlugin::<NoUserData>::pixels_per_meter(10.0),
RapierDebugRenderPlugin::default(),
//WorldInspectorPlugin::new(),
WorldInspectorPlugin::new(),
))
.register_type::<Examples>()
.register_type::<ExamplesRes>()
6 changes: 3 additions & 3 deletions bevy_rapier3d/Cargo.toml
Original file line number Diff line number Diff line change
@@ -58,16 +58,16 @@ log = "0.4"
serde = { version = "1", features = ["derive"], optional = true }

[dev-dependencies]
bevy = { version = "0.15.0-rc.2", default-features = false, features = [
bevy = { version = "0.15.0-rc.3", default-features = false, features = [
"x11",
"tonemapping_luts",
"bevy_state",
"bevy_debug_stepping",
] }
approx = "0.5.1"
glam = { version = "0.29", features = ["approx"] }
# bevy-inspector-egui = "0.25.1"
# bevy_egui = "0.28.0"
bevy-inspector-egui = "0.28"
bevy_egui = "0.30.0"
divan = "0.1"
bevy_rapier_benches3d = { version = "0.1", path = "../bevy_rapier_benches3d" }

8 changes: 4 additions & 4 deletions bevy_rapier3d/examples/testbed3.rs
Original file line number Diff line number Diff line change
@@ -12,8 +12,8 @@ mod ray_casting3;
mod static_trimesh3;

use bevy::prelude::*;
// use bevy_egui::{egui, EguiContexts, EguiPlugin};
// use bevy_inspector_egui::quick::WorldInspectorPlugin;
use bevy_egui::{egui, EguiContexts, EguiPlugin};
use bevy_inspector_egui::quick::WorldInspectorPlugin;
use bevy_rapier3d::prelude::*;

#[derive(Debug, Reflect, Clone, Copy, Eq, PartialEq, Default, Hash, States)]
@@ -60,10 +60,10 @@ fn main() {
app.init_resource::<ExamplesRes>()
.add_plugins((
DefaultPlugins,
//EguiPlugin,
EguiPlugin,
RapierPhysicsPlugin::<NoUserData>::default(),
RapierDebugRenderPlugin::default(),
//WorldInspectorPlugin::new(),
WorldInspectorPlugin::new(),
))
.register_type::<Examples>()
.register_type::<ExamplesRes>()