Skip to content

Commit

Permalink
Updates to compile against bevy main
Browse files Browse the repository at this point in the history
  • Loading branch information
deontologician committed Jul 28, 2021
1 parent bb48873 commit d12b45c
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions src/physics/plugins.rs
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ pub enum PhysicsStages {
}

impl<UserData: 'static + WorldQuery + Send + Sync> Plugin for RapierPhysicsPlugin<UserData> {
fn build(&self, app: &mut AppBuilder) {
fn build(&self, app: &mut App) {
app.add_stage_before(
CoreStage::PreUpdate,
PhysicsStages::FinalizeCreations,
Expand Down Expand Up @@ -109,7 +109,7 @@ impl<UserData: 'static + WorldQuery + Send + Sync> Plugin for RapierPhysicsPlugi
.label(physics::PhysicsSystems::CollectRemovals),
);
if app
.world()
.world
.get_resource::<PhysicsHooksWithQueryObject<UserData>>()
.is_none()
{
Expand Down
2 changes: 1 addition & 1 deletion src/render/plugins.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ use bevy::prelude::*;
pub struct RapierRenderPlugin;

impl Plugin for RapierRenderPlugin {
fn build(&self, app: &mut AppBuilder) {
fn build(&self, app: &mut App) {
app.add_system_to_stage(
CoreStage::PreUpdate,
systems::create_collider_renders_system
Expand Down
2 changes: 1 addition & 1 deletion src/render/systems.rs
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ fn generate_collider_mesh(co_shape: &ColliderShape) -> Option<(Mesh, Vec3)> {
#[cfg(feature = "dim3")]
ShapeType::Cuboid => {
let c = co_shape.as_cuboid().unwrap();
Vec3::from_slice_unaligned(c.half_extents.as_slice())
Vec3::from_slice(c.half_extents.as_slice())
}
ShapeType::Ball => {
let b = co_shape.as_ball().unwrap();
Expand Down
2 changes: 1 addition & 1 deletion src_debug_ui/plugins.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use bevy::prelude::*;
pub struct DebugUiPlugin;

impl Plugin for DebugUiPlugin {
fn build(&self, app: &mut AppBuilder) {
fn build(&self, app: &mut App) {
app.add_startup_system(systems::setup_ui.system())
.add_system_to_stage(CoreStage::Update, systems::text_update_system.system());
}
Expand Down

0 comments on commit d12b45c

Please sign in to comment.