From 261ed1ebed04fb594f612b66811350f63b73f104 Mon Sep 17 00:00:00 2001 From: Crozet Sébastien Date: Wed, 6 Jan 2021 12:53:26 +0100 Subject: Fix 2D compilation. --- src_testbed/objects/ball.rs | 7 ++++--- src_testbed/objects/box_node.rs | 8 ++++---- src_testbed/objects/capsule.rs | 7 ++++--- src_testbed/objects/cone.rs | 7 ++++--- src_testbed/objects/convex.rs | 6 +++--- src_testbed/objects/cylinder.rs | 7 ++++--- src_testbed/objects/heightfield.rs | 11 ++++++----- 7 files changed, 29 insertions(+), 24 deletions(-) (limited to 'src_testbed/objects') diff --git a/src_testbed/objects/ball.rs b/src_testbed/objects/ball.rs index c352b3a..df43341 100644 --- a/src_testbed/objects/ball.rs +++ b/src_testbed/objects/ball.rs @@ -1,20 +1,21 @@ use crate::objects::node::{self, GraphicsNode}; use kiss3d::window::Window; -use na::{Isometry3, Point3}; +use na::Point3; use rapier::geometry::{ColliderHandle, ColliderSet}; +use rapier::math::Isometry; pub struct Ball { color: Point3, base_color: Point3, gfx: GraphicsNode, collider: ColliderHandle, - delta: Isometry3, + delta: Isometry, } impl Ball { pub fn new( collider: ColliderHandle, - delta: Isometry3, + delta: Isometry, radius: f32, color: Point3, window: &mut Window, diff --git a/src_testbed/objects/box_node.rs b/src_testbed/objects/box_node.rs index 1a72247..0586d77 100644 --- a/src_testbed/objects/box_node.rs +++ b/src_testbed/objects/box_node.rs @@ -1,21 +1,21 @@ use crate::objects::node::{self, GraphicsNode}; use kiss3d::window; -use na::{Isometry3, Point3}; +use na::Point3; use rapier::geometry::{ColliderHandle, ColliderSet}; -use rapier::math::Vector; +use rapier::math::{Isometry, Vector}; pub struct Box { color: Point3, base_color: Point3, gfx: GraphicsNode, collider: ColliderHandle, - delta: Isometry3, + delta: Isometry, } impl Box { pub fn new( collider: ColliderHandle, - delta: Isometry3, + delta: Isometry, half_extents: Vector, color: Point3, window: &mut window::Window, diff --git a/src_testbed/objects/capsule.rs b/src_testbed/objects/capsule.rs index d1bfd52..46a67ca 100644 --- a/src_testbed/objects/capsule.rs +++ b/src_testbed/objects/capsule.rs @@ -1,20 +1,21 @@ use crate::objects::node::{self, GraphicsNode}; use kiss3d::window; -use na::{Isometry3, Point3}; +use na::Point3; use rapier::geometry::{self, ColliderHandle, ColliderSet}; +use rapier::math::Isometry; pub struct Capsule { color: Point3, base_color: Point3, gfx: GraphicsNode, collider: ColliderHandle, - delta: Isometry3, + delta: Isometry, } impl Capsule { pub fn new( collider: ColliderHandle, - delta: Isometry3, + delta: Isometry, capsule: &geometry::Capsule, color: Point3, window: &mut window::Window, diff --git a/src_testbed/objects/cone.rs b/src_testbed/objects/cone.rs index 70a74a1..7aa2039 100644 --- a/src_testbed/objects/cone.rs +++ b/src_testbed/objects/cone.rs @@ -1,20 +1,21 @@ use crate::objects::node::{self, GraphicsNode}; use kiss3d::window::Window; -use na::{Isometry3, Point3}; +use na::Point3; use rapier::geometry::{ColliderHandle, ColliderSet}; +use rapier::math::Isometry; pub struct Cone { color: Point3, base_color: Point3, gfx: GraphicsNode, collider: ColliderHandle, - delta: Isometry3, + delta: Isometry, } impl Cone { pub fn new( collider: ColliderHandle, - delta: Isometry3, + delta: Isometry, half_height: f32, radius: f32, color: Point3, diff --git a/src_testbed/objects/convex.rs b/src_testbed/objects/convex.rs index b0e0bbb..3f68367 100644 --- a/src_testbed/objects/convex.rs +++ b/src_testbed/objects/convex.rs @@ -5,7 +5,7 @@ use crate::math::Vector; use crate::math::{Isometry, Point}; use crate::objects::node::{self, GraphicsNode}; use kiss3d::window::Window; -use na::{Isometry3, Point3}; +use na::Point3; use rapier::geometry::{ColliderHandle, ColliderSet}; pub struct Convex { @@ -13,13 +13,13 @@ pub struct Convex { base_color: Point3, gfx: GraphicsNode, body: ColliderHandle, - delta: Isometry3, + delta: Isometry, } impl Convex { pub fn new( body: ColliderHandle, - delta: Isometry3, + delta: Isometry, vertices: Vec>, #[cfg(feature = "dim3")] indices: Vec>, color: Point3, diff --git a/src_testbed/objects/cylinder.rs b/src_testbed/objects/cylinder.rs index e18eb06..ff4dc72 100644 --- a/src_testbed/objects/cylinder.rs +++ b/src_testbed/objects/cylinder.rs @@ -1,20 +1,21 @@ use crate::objects::node::{self, GraphicsNode}; use kiss3d::window::Window; -use na::{Isometry3, Point3}; +use na::Point3; use rapier::geometry::{ColliderHandle, ColliderSet}; +use rapier::math::Isometry; pub struct Cylinder { color: Point3, base_color: Point3, gfx: GraphicsNode, collider: ColliderHandle, - delta: Isometry3, + delta: Isometry, } impl Cylinder { pub fn new( collider: ColliderHandle, - delta: Isometry3, + delta: Isometry, half_height: f32, radius: f32, color: Point3, diff --git a/src_testbed/objects/heightfield.rs b/src_testbed/objects/heightfield.rs index fed168d..a2999b7 100644 --- a/src_testbed/objects/heightfield.rs +++ b/src_testbed/objects/heightfield.rs @@ -1,15 +1,16 @@ -#[cfg(feature = "dim3")] -use crate::objects::node::{self, GraphicsNode}; use cdl::shape; -use kiss3d::resource::Mesh; use kiss3d::window::Window; use na::{self, Point3}; use rapier::geometry::{ColliderHandle, ColliderSet}; #[cfg(feature = "dim2")] use rapier::math::Point; #[cfg(feature = "dim3")] -use rapier::math::Vector; -use std::cell::RefCell; +use { + crate::objects::node::{self, GraphicsNode}, + kiss3d::resource::Mesh, + rapier::math::Vector, + std::cell::RefCell, +}; pub struct HeightField { color: Point3, -- cgit