specs-physics

commit 9efe45094ba72ccb21e4e83b932f067ccf8ff14b
parent c81e506d19a40b370e4f44429588eb3aae9e67f5
Author: kel <distransient@protonmail.com>
Date:   Thu, 31 Jan 2019 02:52:52 -0500

Update for new Amethyst error

Diffstat:
M
src/systems/mod.rs
 | 
6
++++--
M
src/systems/sync_bodies_from_physics.rs
 | 
1
-

2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/systems/mod.rs b/src/systems/mod.rs
@@ -4,8 +4,10 @@ mod sync_bodies_to_physics;
 mod sync_colliders_to_physics;
 mod sync_gravity_to_physics;
 
-use amethyst::core::bundle::{Result, SystemBundle};
+use core::result::Result
+use amethyst::core::bundle::SystemBundle;
 use amethyst::core::specs::DispatcherBuilder;
+use amethyst::error::Error;
 
 use crate::time_step::TimeStep;
 
@@ -61,7 +63,7 @@ impl<'a> PhysicsBundle<'a> {
 }
 
 impl<'a, 'b, 'c> SystemBundle<'a, 'b> for PhysicsBundle<'c> {
-    fn build(self, builder: &mut DispatcherBuilder<'a, 'b>) -> Result<()> {
+    fn build(self, builder: &mut DispatcherBuilder<'a, 'b>) -> Result<(), Error> {
         builder.add(
             SyncBodiesToPhysicsSystem::new(),
             SYNC_BODIES_TO_PHYSICS_SYSTEM,
diff --git a/src/systems/sync_bodies_from_physics.rs b/src/systems/sync_bodies_from_physics.rs
@@ -7,7 +7,6 @@ use amethyst::ecs::{Entities, Entity, Join, ReadExpect, ReadStorage, System, Wri
 use amethyst::shrev::EventChannel;
 use nalgebra::Vector3;
 use ncollide3d::events::{ContactEvent, ProximityEvent};
-use nphysics3d::object::Body;
 use nphysics3d::object::ColliderHandle;
 
 // Might want to replace by better types.