diff options
Diffstat (limited to 'src_testbed')
| -rw-r--r-- | src_testbed/debug_render.rs | 4 | ||||
| -rw-r--r-- | src_testbed/graphics.rs | 6 | ||||
| -rw-r--r-- | src_testbed/harness/mod.rs | 2 | ||||
| -rw-r--r-- | src_testbed/objects/node.rs | 8 | ||||
| -rw-r--r-- | src_testbed/physics/mod.rs | 2 | ||||
| -rw-r--r-- | src_testbed/testbed.rs | 4 |
6 files changed, 13 insertions, 13 deletions
diff --git a/src_testbed/debug_render.rs b/src_testbed/debug_render.rs index 0e0b8b8..c08ea8f 100644 --- a/src_testbed/debug_render.rs +++ b/src_testbed/debug_render.rs @@ -36,7 +36,7 @@ struct BevyLinesRenderBackend<'a> { impl<'a> DebugRenderBackend for BevyLinesRenderBackend<'a> { #[cfg(feature = "dim2")] - fn draw_line(&mut self, _: DebugRenderObject, a: Point<Real>, b: Point<Real>, color: [f32; 4]) { + fn draw_line(&mut self, _: DebugRenderObject, a: Point, b: Point, color: [f32; 4]) { self.gizmos.line( [a.x as f32, a.y as f32, 1.0e-8].into(), [b.x as f32, b.y as f32, 1.0e-8].into(), @@ -44,7 +44,7 @@ impl<'a> DebugRenderBackend for BevyLinesRenderBackend<'a> { ) } #[cfg(feature = "dim3")] - fn draw_line(&mut self, _: DebugRenderObject, a: Point<Real>, b: Point<Real>, color: [f32; 4]) { + fn draw_line(&mut self, _: DebugRenderObject, a: Point, b: Point, color: [f32; 4]) { self.gizmos.line( [a.x as f32, a.y as f32, a.z as f32].into(), [b.x as f32, b.y as f32, b.z as f32].into(), diff --git a/src_testbed/graphics.rs b/src_testbed/graphics.rs index 552d4c7..322abe9 100644 --- a/src_testbed/graphics.rs +++ b/src_testbed/graphics.rs @@ -30,7 +30,7 @@ pub struct GraphicsManager { b2wireframe: HashMap<RigidBodyHandle, bool>, ground_color: Point3<f32>, prefab_meshes: HashMap<ShapeType, Handle<Mesh>>, - pub gfx_shift: Vector<Real>, + pub gfx_shift: Vector, } impl GraphicsManager { @@ -300,8 +300,8 @@ impl GraphicsManager { handle: Option<ColliderHandle>, shape: &dyn Shape, sensor: bool, - pos: &Isometry<Real>, - delta: &Isometry<Real>, + pos: &Isometry, + delta: &Isometry, color: Point3<f32>, out: &mut Vec<EntityWithGraphics>, ) { diff --git a/src_testbed/harness/mod.rs b/src_testbed/harness/mod.rs index e27a03a..4c8a20f 100644 --- a/src_testbed/harness/mod.rs +++ b/src_testbed/harness/mod.rs @@ -166,7 +166,7 @@ impl Harness { colliders: ColliderSet, impulse_joints: ImpulseJointSet, multibody_joints: MultibodyJointSet, - gravity: Vector<Real>, + gravity: Vector, hooks: impl PhysicsHooks + 'static, ) { // println!("Num bodies: {}", bodies.len()); diff --git a/src_testbed/objects/node.rs b/src_testbed/objects/node.rs index cdc042b..c4777eb 100644 --- a/src_testbed/objects/node.rs +++ b/src_testbed/objects/node.rs @@ -28,7 +28,7 @@ pub struct EntityWithGraphics { pub color: Point3<f32>, pub base_color: Point3<f32>, pub collider: Option<ColliderHandle>, - pub delta: Isometry<Real>, + pub delta: Isometry, pub opacity: f32, material: Handle<BevyMaterial>, } @@ -41,8 +41,8 @@ impl EntityWithGraphics { prefab_meshs: &HashMap<ShapeType, Handle<Mesh>>, shape: &dyn Shape, collider: Option<ColliderHandle>, - collider_pos: Isometry<Real>, - delta: Isometry<Real>, + collider_pos: Isometry, + delta: Isometry, color: Point3<f32>, sensor: bool, ) -> Self { @@ -174,7 +174,7 @@ impl EntityWithGraphics { &mut self, colliders: &ColliderSet, components: &mut Query<(&mut Transform,)>, - gfx_shift: &Vector<Real>, + gfx_shift: &Vector, ) { if let Some(Some(co)) = self.collider.map(|c| colliders.get(c)) { if let Ok(mut pos) = components.get_component_mut::<Transform>(self.entity) { diff --git a/src_testbed/physics/mod.rs b/src_testbed/physics/mod.rs index 26a55c7..c8558ff 100644 --- a/src_testbed/physics/mod.rs +++ b/src_testbed/physics/mod.rs @@ -82,7 +82,7 @@ pub struct PhysicsState { pub pipeline: PhysicsPipeline, pub query_pipeline: QueryPipeline, pub integration_parameters: IntegrationParameters, - pub gravity: Vector<Real>, + pub gravity: Vector, pub hooks: Box<dyn PhysicsHooks>, } diff --git a/src_testbed/testbed.rs b/src_testbed/testbed.rs index e5a5f13..12d311e 100644 --- a/src_testbed/testbed.rs +++ b/src_testbed/testbed.rs @@ -526,7 +526,7 @@ impl<'a, 'b, 'c, 'd, 'e, 'f> Testbed<'a, 'b, 'c, 'd, 'e, 'f> { colliders: ColliderSet, impulse_joints: ImpulseJointSet, multibody_joints: MultibodyJointSet, - gravity: Vector<Real>, + gravity: Vector, hooks: impl PhysicsHooks + 'static, ) { self.harness.set_world_with_params( @@ -580,7 +580,7 @@ impl<'a, 'b, 'c, 'd, 'e, 'f> Testbed<'a, 'b, 'c, 'd, 'e, 'f> { } } - pub fn set_graphics_shift(&mut self, shift: Vector<Real>) { + pub fn set_graphics_shift(&mut self, shift: Vector) { if !self.state.camera_locked { if let Some(graphics) = &mut self.graphics { graphics.graphics.gfx_shift = shift; |
