From 00da4aaa42cc921bbd8c469b45c5c1e304f46260 Mon Sep 17 00:00:00 2001
From: Crozet Sébastien <developer@crozet.re>
Date: Tue, 5 Jan 2021 15:34:48 +0100
Subject: Add compound shape support.

---
 src_testbed/objects/cone.rs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'src_testbed/objects/cone.rs')

diff --git a/src_testbed/objects/cone.rs b/src_testbed/objects/cone.rs
index 58b014f..89a6b47 100644
--- a/src_testbed/objects/cone.rs
+++ b/src_testbed/objects/cone.rs
@@ -1,6 +1,6 @@
 use crate::objects::node::{self, GraphicsNode};
 use kiss3d::window::Window;
-use na::Point3;
+use na::{Isometry3, Point3};
 use rapier::geometry::{ColliderHandle, ColliderSet};
 use rapier::math::Isometry;
 
@@ -9,11 +9,13 @@ pub struct Cone {
     base_color: Point3<f32>,
     gfx: GraphicsNode,
     collider: ColliderHandle,
+    delta: Isometry3<f32>,
 }
 
 impl Cone {
     pub fn new(
         collider: ColliderHandle,
+        delta: Isometry3<f32>,
         half_height: f32,
         radius: f32,
         color: Point3<f32>,
@@ -29,6 +31,7 @@ impl Cone {
             base_color: color,
             gfx: node,
             collider,
+            delta,
         };
 
         // res.gfx.set_texture_from_file(&Path::new("media/kitten.png"), "kitten");
@@ -56,7 +59,7 @@ impl Cone {
             colliders,
             self.collider,
             &self.color,
-            &Isometry::identity(),
+            &self.delta,
         );
     }
 
-- 
cgit 


From d1ed279c4e70c46928c84cf9b7f4a1db539fd7cb Mon Sep 17 00:00:00 2001
From: Crozet Sébastien <developer@crozet.re>
Date: Wed, 6 Jan 2021 12:22:46 +0100
Subject: Tesbted physx backend: add heightfield, trimesh, and convex mesh
 support.

---
 src_testbed/objects/cone.rs | 1 -
 1 file changed, 1 deletion(-)

(limited to 'src_testbed/objects/cone.rs')

diff --git a/src_testbed/objects/cone.rs b/src_testbed/objects/cone.rs
index 89a6b47..70a74a1 100644
--- a/src_testbed/objects/cone.rs
+++ b/src_testbed/objects/cone.rs
@@ -2,7 +2,6 @@ use crate::objects::node::{self, GraphicsNode};
 use kiss3d::window::Window;
 use na::{Isometry3, Point3};
 use rapier::geometry::{ColliderHandle, ColliderSet};
-use rapier::math::Isometry;
 
 pub struct Cone {
     color: Point3<f32>,
-- 
cgit 


From 261ed1ebed04fb594f612b66811350f63b73f104 Mon Sep 17 00:00:00 2001
From: Crozet Sébastien <developer@crozet.re>
Date: Wed, 6 Jan 2021 12:53:26 +0100
Subject: Fix 2D compilation.

---
 src_testbed/objects/cone.rs | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'src_testbed/objects/cone.rs')

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<f32>,
     base_color: Point3<f32>,
     gfx: GraphicsNode,
     collider: ColliderHandle,
-    delta: Isometry3<f32>,
+    delta: Isometry<f32>,
 }
 
 impl Cone {
     pub fn new(
         collider: ColliderHandle,
-        delta: Isometry3<f32>,
+        delta: Isometry<f32>,
         half_height: f32,
         radius: f32,
         color: Point3<f32>,
-- 
cgit