From a733f97028f5cd532212572f9561ab64e09f002b Mon Sep 17 00:00:00 2001 From: Crozet Sébastien Date: Mon, 29 Mar 2021 17:21:49 +0200 Subject: Implement the ability to run multiple CCD substeps. --- src_testbed/engine.rs | 6 ------ 1 file changed, 6 deletions(-) (limited to 'src_testbed/engine.rs') diff --git a/src_testbed/engine.rs b/src_testbed/engine.rs index bcdbbca..29e57db 100644 --- a/src_testbed/engine.rs +++ b/src_testbed/engine.rs @@ -60,7 +60,6 @@ pub struct GraphicsManager { b2wireframe: HashMap, ground_color: Point3, camera: Camera, - ground_handle: Option, } impl GraphicsManager { @@ -87,14 +86,9 @@ impl GraphicsManager { c2color: HashMap::new(), ground_color: Point3::new(0.5, 0.5, 0.5), b2wireframe: HashMap::new(), - ground_handle: None, } } - pub fn set_ground_handle(&mut self, handle: Option) { - self.ground_handle = handle - } - pub fn clear(&mut self, window: &mut Window) { for sns in self.b2sn.values_mut() { for sn in sns.iter_mut() { -- cgit From 88933bd4317c6ae522a4af906919dffd2becc6f9 Mon Sep 17 00:00:00 2001 From: Crozet Sébastien Date: Tue, 30 Mar 2021 17:11:52 +0200 Subject: Run the position solver after the CCD motion clamping. --- src_testbed/engine.rs | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) (limited to 'src_testbed/engine.rs') diff --git a/src_testbed/engine.rs b/src_testbed/engine.rs index 29e57db..876cb7e 100644 --- a/src_testbed/engine.rs +++ b/src_testbed/engine.rs @@ -624,19 +624,17 @@ impl GraphicsManager { // ); for (_, ns) in self.b2sn.iter_mut() { for n in ns.iter_mut() { - /* - if let Some(co) = colliders.get(n.collider()) { - let bo = &bodies[co.parent()]; - - if bo.is_dynamic() { - if bo.is_sleeping() { - n.set_color(Point3::new(1.0, 0.0, 0.0)); - } else { - n.set_color(Point3::new(0.0, 1.0, 0.0)); - } - } - } - */ + // if let Some(co) = colliders.get(n.collider()) { + // let bo = &_bodies[co.parent()]; + // + // if bo.is_dynamic() { + // if bo.is_ccd_active() { + // n.set_color(Point3::new(1.0, 0.0, 0.0)); + // } else { + // n.set_color(Point3::new(0.0, 1.0, 0.0)); + // } + // } + // } n.update(colliders); n.draw(window); -- cgit