Skip to content

Fixes for Bevy 0.6 #91

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

Closed
deontologician wants to merge 6 commits into from
Closed

Fixes for Bevy 0.6 #91

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8ff602d
Bump nalgebra glam to 015
deontologician Jul 28, 2021
efa805e
Switch bevy_rapier3d to glam-0.15 as well
deontologician Jul 28, 2021
e1d685f
Updates to compile against bevy main
deontologician Jul 28, 2021
8111354
Hardcode local bevy into Cargo
deontologician Oct 14, 2021
3214c68
Update to Bevy 0.6 main branch.
pcwalton Aug 29, 2021
20b824c
Add bevy-components feature
deontologician Oct 18, 2021
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
12 changes: 7 additions & 5 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,12 @@ codegen-units = 1

[patch.crates-io]
#nalgebra = { path = "../nalgebra" }
#parry2d = { path = "../parry/build/parry2d" }
#parry3d = { path = "../parry/build/parry3d" }
#rapier2d = { path = "../rapier/build/rapier2d" }
#rapier3d = { path = "../rapier/build/rapier3d" }
parry2d = { path = "../parry/build/parry2d" }
parry3d = { path = "../parry/build/parry3d" }
rapier2d = { path = "../rapier/build/rapier2d" }
rapier3d = { path = "../rapier/build/rapier3d" }

#rapier2d = { git = "https://github.com/dimforge/rapier" }
#rapier3d = { git = "https://github.com/dimforge/rapier" }
#rapier3d = { git = "https://github.com/dimforge/rapier" }

bevy = {path="../bevy" }
6 changes: 3 additions & 3 deletions bevy_rapier2d/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,11 @@ enhanced-determinism = [ "rapier2d/enhanced-determinism" ]

[dependencies]
bevy = { version = "0.5", default-features = false }
nalgebra = { version = "0.29", features = [ "convert-glam013" ] }
nalgebra = { version = "0.29", features = [ "convert-glam015" ] }
# Don't enable the default features because we don't need the ColliderSet/RigidBodySet
rapier2d = { version = "0.11", default-features = false, features = [ "dim2", "f32" ] }
rapier2d = { version = "0.11", default-features = false, features = [ "dim2", "f32", "bevy-components"] }

[dev-dependencies]
bevy_wgpu = "0.5"
bevy_winit = { version = "0.5", features = [ "x11" ] }
oorandom = "11"
oorandom = "11"
6 changes: 3 additions & 3 deletions bevy_rapier2d/examples/boxes2.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ use ui::DebugUiPlugin;
mod ui;

fn main() {
App::build()
App::new()
.insert_resource(ClearColor(Color::rgb(
0xF9 as f32 / 255.0,
0xF9 as f32 / 255.0,
Expand Down Expand Up @@ -40,9 +40,9 @@ fn setup_graphics(mut commands: Commands, mut configuration: ResMut<RapierConfig

let mut camera = OrthographicCameraBundle::new_2d();
camera.transform = Transform::from_translation(Vec3::new(0.0, 200.0, 0.0));
commands.spawn_bundle(LightBundle {
commands.spawn_bundle(PointLightBundle {
transform: Transform::from_translation(Vec3::new(1000.0, 10.0, 2000.0)),
light: Light {
point_light: PointLight {
intensity: 100_000_000_.0,
range: 6000.0,
..Default::default()
Expand Down
6 changes: 3 additions & 3 deletions bevy_rapier2d/examples/contact_filter2.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ impl<'a> PhysicsHooksWithQuery<&'a CustomFilterTag> for SameUserDataFilter {
}

fn main() {
App::build()
App::new()
.insert_resource(ClearColor(Color::rgb(
0xF9 as f32 / 255.0,
0xF9 as f32 / 255.0,
Expand Down Expand Up @@ -77,9 +77,9 @@ fn setup_graphics(mut commands: Commands, mut configuration: ResMut<RapierConfig

let mut camera = OrthographicCameraBundle::new_2d();
camera.transform = Transform::from_translation(Vec3::new(0.0, 200.0, 0.0));
commands.spawn_bundle(LightBundle {
commands.spawn_bundle(PointLightBundle {
transform: Transform::from_translation(Vec3::new(1000.0, 10.0, 2000.0)),
light: Light {
point_light: PointLight {
intensity: 100_000_000_.0,
range: 6000.0,
..Default::default()
Expand Down
7 changes: 4 additions & 3 deletions bevy_rapier2d/examples/debug_despawn2.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,10 @@
use bevy::prelude::*;
use bevy::render::pass::ClearColor;
use bevy_rapier2d::prelude::*;
use nalgebra::Point2;

fn main() {
App::build()
App::new()
.init_resource::<Game>()
.insert_resource(ClearColor(Color::rgb(0.0, 0.0, 0.0)))
.insert_resource(Msaa::default())
Expand Down Expand Up @@ -187,8 +188,8 @@ fn spawn_cube(commands: &mut Commands, game: &mut Game) {
let x_dir = coords[*j].0 as f32 - coords[*i].0 as f32;
let y_dir = coords[*j].1 as f32 - coords[*i].1 as f32;

let anchor_1 = Vec2::new(x_dir * 0.5, y_dir * 0.5).into();
let anchor_2 = Vec2::new(x_dir * -0.5, y_dir * -0.5).into();
let anchor_1 = Point2::new(x_dir * 0.5, y_dir * 0.5);
let anchor_2 = Point2::new(x_dir * -0.5, y_dir * -0.5);

commands
.spawn()
Expand Down
6 changes: 3 additions & 3 deletions bevy_rapier2d/examples/despawn2.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ pub struct ResizeResource {
}

fn main() {
App::build()
App::new()
.insert_resource(ClearColor(Color::rgb(
0xF9 as f32 / 255.0,
0xF9 as f32 / 255.0,
Expand Down Expand Up @@ -54,9 +54,9 @@ fn setup_graphics(mut commands: Commands, mut configuration: ResMut<RapierConfig

let mut camera = OrthographicCameraBundle::new_2d();
camera.transform = Transform::from_translation(Vec3::new(0.0, 200.0, 0.0));
commands.spawn_bundle(LightBundle {
commands.spawn_bundle(PointLightBundle {
transform: Transform::from_translation(Vec3::new(1000.0, 10.0, 2000.0)),
light: Light {
point_light: PointLight {
intensity: 100_000_000_.0,
range: 6000.0,
..Default::default()
Expand Down
6 changes: 3 additions & 3 deletions bevy_rapier2d/examples/events2.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ use ui::DebugUiPlugin;
mod ui;

fn main() {
App::build()
App::new()
.insert_resource(ClearColor(Color::rgb(
0xF9 as f32 / 255.0,
0xF9 as f32 / 255.0,
Expand All @@ -38,9 +38,9 @@ fn enable_physics_profiling(mut pipeline: ResMut<PhysicsPipeline>) {
fn setup_graphics(mut commands: Commands, mut configuration: ResMut<RapierConfiguration>) {
configuration.scale = 15.0;

commands.spawn_bundle(LightBundle {
commands.spawn_bundle(PointLightBundle {
transform: Transform::from_translation(Vec3::new(1000.0, 10.0, 2000.0)),
light: Light {
point_light: PointLight {
intensity: 100_000_000_.0,
range: 6000.0,
..Default::default()
Expand Down
6 changes: 3 additions & 3 deletions bevy_rapier2d/examples/joints2.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ use ui::DebugUiPlugin;
mod ui;

fn main() {
App::build()
App::new()
.insert_resource(ClearColor(Color::rgb(
0xF9 as f32 / 255.0,
0xF9 as f32 / 255.0,
Expand Down Expand Up @@ -41,9 +41,9 @@ fn setup_graphics(mut commands: Commands, mut configuration: ResMut<RapierConfig

let mut camera = OrthographicCameraBundle::new_2d();
camera.transform = Transform::from_translation(Vec3::new(200.0, -200.0, 0.0));
commands.spawn_bundle(LightBundle {
commands.spawn_bundle(PointLightBundle {
transform: Transform::from_translation(Vec3::new(1000.0, 10.0, 2000.0)),
light: Light {
point_light: PointLight {
intensity: 100_000_000_.0,
range: 6000.0,
..Default::default()
Expand Down
6 changes: 3 additions & 3 deletions bevy_rapier2d/examples/joints_despawn2.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ pub struct DespawnResource {
}

fn main() {
App::build()
App::new()
.insert_resource(ClearColor(Color::rgb(
0xF9 as f32 / 255.0,
0xF9 as f32 / 255.0,
Expand Down Expand Up @@ -48,9 +48,9 @@ fn setup_graphics(mut commands: Commands, mut configuration: ResMut<RapierConfig

let mut camera = OrthographicCameraBundle::new_2d();
camera.transform = Transform::from_translation(Vec3::new(200.0, -200.0, 0.0));
commands.spawn_bundle(LightBundle {
commands.spawn_bundle(PointLightBundle {
transform: Transform::from_translation(Vec3::new(1000.0, 10.0, 2000.0)),
light: Light {
point_light: PointLight {
intensity: 100_000_000_.0,
range: 6000.0,
..Default::default()
Expand Down
6 changes: 3 additions & 3 deletions bevy_rapier2d/examples/locked_rotations2.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ use ui::DebugUiPlugin;
mod ui;

fn main() {
App::build()
App::new()
.insert_resource(ClearColor(Color::rgb(
0xF9 as f32 / 255.0,
0xF9 as f32 / 255.0,
Expand Down Expand Up @@ -40,9 +40,9 @@ fn setup_graphics(mut commands: Commands, mut configuration: ResMut<RapierConfig

let mut camera = OrthographicCameraBundle::new_2d();
camera.transform = Transform::from_translation(Vec3::new(0.0, 30.0, 0.0));
commands.spawn_bundle(LightBundle {
commands.spawn_bundle(PointLightBundle {
transform: Transform::from_translation(Vec3::new(1000.0, 10.0, 2000.0)),
light: Light {
point_light: PointLight {
intensity: 100_000_000_.0,
range: 6000.0,
..Default::default()
Expand Down
6 changes: 3 additions & 3 deletions bevy_rapier2d/examples/multiple_colliders2.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ use ui::DebugUiPlugin;
mod ui;

fn main() {
App::build()
App::new()
.insert_resource(ClearColor(Color::rgb(
0xF9 as f32 / 255.0,
0xF9 as f32 / 255.0,
Expand All @@ -33,9 +33,9 @@ fn setup_graphics(mut commands: Commands, mut configuration: ResMut<RapierConfig

let mut camera = OrthographicCameraBundle::new_2d();
camera.transform = Transform::from_translation(Vec3::new(0.0, 200.0, 0.0));
commands.spawn_bundle(LightBundle {
commands.spawn_bundle(PointLightBundle {
transform: Transform::from_translation(Vec3::new(1000.0, 10.0, 2000.0)),
light: Light {
point_light: PointLight {
intensity: 100_000_000_.0,
range: 6000.0,
..Default::default()
Expand Down
2 changes: 1 addition & 1 deletion bevy_rapier2d/examples/player_movement2.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ use bevy_rapier2d::prelude::*;
use bevy_rapier2d::rapier::na::Vector2;

fn main() {
App::build()
App::new()
.insert_resource(WindowDescriptor {
title: "Player Movement Example".to_string(),
width: 1000.0,
Expand Down
4 changes: 2 additions & 2 deletions bevy_rapier3d/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ enhanced-determinism = [ "rapier3d/enhanced-determinism" ]

[dependencies]
bevy = { version = "0.5", default-features = false }
nalgebra = { version = "0.29", features = [ "convert-glam013" ] }
nalgebra = { version = "0.29", features = [ "convert-glam015" ] }
# Don't enable the default features because we don't need the ColliderSet/RigidBodySet
rapier3d = { version = "^0.11", default-features = false, features = [ "dim3", "f32" ] }
rapier3d = { version = "^0.11", default-features = false, features = [ "dim3", "f32", "bevy-components"] }

[dev-dependencies]
bevy_wgpu = "0.5"
Expand Down
6 changes: 3 additions & 3 deletions bevy_rapier3d/examples/boxes3.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ use ui::DebugUiPlugin;
mod ui;

fn main() {
App::build()
App::new()
.insert_resource(ClearColor(Color::rgb(
0xF9 as f32 / 255.0,
0xF9 as f32 / 255.0,
Expand All @@ -36,9 +36,9 @@ fn enable_physics_profiling(mut pipeline: ResMut<PhysicsPipeline>) {
}

fn setup_graphics(mut commands: Commands) {
commands.spawn_bundle(LightBundle {
commands.spawn_bundle(PointLightBundle {
transform: Transform::from_translation(Vec3::new(100.0, 10.0, 200.0)),
light: Light {
point_light: PointLight {
intensity: 100_000.0,
range: 3000.0,
..Default::default()
Expand Down
6 changes: 3 additions & 3 deletions bevy_rapier3d/examples/contact_filter3.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ impl<'a> PhysicsHooksWithQuery<&'a CustomFilterTag> for SameUserDataFilter {
}

fn main() {
App::build()
App::new()
.insert_resource(ClearColor(Color::rgb(
0xF9 as f32 / 255.0,
0xF9 as f32 / 255.0,
Expand All @@ -73,9 +73,9 @@ fn enable_physics_profiling(mut pipeline: ResMut<PhysicsPipeline>) {
}

fn setup_graphics(mut commands: Commands) {
commands.spawn_bundle(LightBundle {
commands.spawn_bundle(PointLightBundle {
transform: Transform::from_translation(Vec3::new(100.0, 10.0, 200.0)),
light: Light {
point_light: PointLight {
intensity: 100_000.0,
range: 3000.0,
..Default::default()
Expand Down
6 changes: 3 additions & 3 deletions bevy_rapier3d/examples/despawn3.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ pub struct DespawnResource {
}

fn main() {
App::build()
App::new()
.insert_resource(ClearColor(Color::rgb(
0xF9 as f32 / 255.0,
0xF9 as f32 / 255.0,
Expand All @@ -42,9 +42,9 @@ fn enable_physics_profiling(mut pipeline: ResMut<PhysicsPipeline>) {
}

fn setup_graphics(mut commands: Commands) {
commands.spawn_bundle(LightBundle {
commands.spawn_bundle(PointLightBundle {
transform: Transform::from_translation(Vec3::new(100.0, 10.0, 200.0)),
light: Light {
point_light: PointLight {
intensity: 100_000.0,
range: 3000.0,
..Default::default()
Expand Down
6 changes: 3 additions & 3 deletions bevy_rapier3d/examples/events3.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ use ui::DebugUiPlugin;
mod ui;

fn main() {
App::build()
App::new()
.insert_resource(ClearColor(Color::rgb(
0xF9 as f32 / 255.0,
0xF9 as f32 / 255.0,
Expand All @@ -36,9 +36,9 @@ fn enable_physics_profiling(mut pipeline: ResMut<PhysicsPipeline>) {
}

fn setup_graphics(mut commands: Commands) {
commands.spawn_bundle(LightBundle {
commands.spawn_bundle(PointLightBundle {
transform: Transform::from_translation(Vec3::new(100.0, 10.0, 200.0)),
light: Light {
point_light: PointLight {
intensity: 100_000.0,
range: 3000.0,
..Default::default()
Expand Down
6 changes: 3 additions & 3 deletions bevy_rapier3d/examples/joints3.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ use ui::DebugUiPlugin;
mod ui;

fn main() {
App::build()
App::new()
.insert_resource(ClearColor(Color::rgb(
0xF9 as f32 / 255.0,
0xF9 as f32 / 255.0,
Expand All @@ -38,9 +38,9 @@ fn enable_physics_profiling(mut pipeline: ResMut<PhysicsPipeline>) {
}

fn setup_graphics(mut commands: Commands) {
commands.spawn_bundle(LightBundle {
commands.spawn_bundle(PointLightBundle {
transform: Transform::from_translation(Vec3::new(100.0, 10.0, 200.0)),
light: Light {
point_light: PointLight {
intensity: 100_000.0,
range: 3000.0,
..Default::default()
Expand Down
6 changes: 3 additions & 3 deletions bevy_rapier3d/examples/joints_despawn3.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ pub struct DespawnResource {
}

fn main() {
App::build()
App::new()
.insert_resource(ClearColor(Color::rgb(
0xF9 as f32 / 255.0,
0xF9 as f32 / 255.0,
Expand All @@ -45,9 +45,9 @@ fn enable_physics_profiling(mut pipeline: ResMut<PhysicsPipeline>) {
}

fn setup_graphics(mut commands: Commands) {
commands.spawn_bundle(LightBundle {
commands.spawn_bundle(PointLightBundle {
transform: Transform::from_translation(Vec3::new(100.0, 10.0, 200.0)),
light: Light {
point_light: PointLight {
intensity: 100_000.0,
range: 3000.0,
..Default::default()
Expand Down
6 changes: 3 additions & 3 deletions bevy_rapier3d/examples/locked_rotations3.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ use ui::DebugUiPlugin;
mod ui;

fn main() {
App::build()
App::new()
.insert_resource(ClearColor(Color::rgb(
0xF9 as f32 / 255.0,
0xF9 as f32 / 255.0,
Expand All @@ -37,9 +37,9 @@ fn enable_physics_profiling(mut pipeline: ResMut<PhysicsPipeline>) {
}

fn setup_graphics(mut commands: Commands) {
commands.spawn_bundle(LightBundle {
commands.spawn_bundle(PointLightBundle {
transform: Transform::from_translation(Vec3::new(100.0, 10.0, 200.0)),
light: Light {
point_light: PointLight {
intensity: 100_000.0,
range: 3000.0,
..Default::default()
Expand Down
Loading