aboutsummaryrefslogtreecommitdiff
path: root/src_testbed/objects
diff options
context:
space:
mode:
authorrezural <rezural@protonmail.com>2021-07-08 11:04:06 +1000
committerSébastien Crozet <sebastien@crozet.re>2021-07-08 10:07:42 +0200
commit3b0d25646407e9b1d7e39dee1005d9a24e09ab66 (patch)
treec7f0fe2766bdada8db7e11e9d52b547f16f90ecc /src_testbed/objects
parent53700db8603ee9ab7c2cb89d6d186ba47f7ae203 (diff)
downloadrapier-3b0d25646407e9b1d7e39dee1005d9a24e09ab66.tar.gz
rapier-3b0d25646407e9b1d7e39dee1005d9a24e09ab66.tar.bz2
rapier-3b0d25646407e9b1d7e39dee1005d9a24e09ab66.zip
make collider Option<> on EntityWithGraphics
Diffstat (limited to 'src_testbed/objects')
-rw-r--r--src_testbed/objects/node.rs8
1 files changed, 4 insertions, 4 deletions
diff --git a/src_testbed/objects/node.rs b/src_testbed/objects/node.rs
index 47c9b41..9bbece2 100644
--- a/src_testbed/objects/node.rs
+++ b/src_testbed/objects/node.rs
@@ -23,7 +23,7 @@ pub struct EntityWithGraphics {
pub entity: Entity,
pub color: Point3<f32>,
pub base_color: Point3<f32>,
- pub collider: ColliderHandle,
+ pub collider: Option<ColliderHandle>,
pub delta: Isometry<f32>,
pub opacity: f32,
material: Handle<StandardMaterial>,
@@ -36,7 +36,7 @@ impl EntityWithGraphics {
materials: &mut Assets<StandardMaterial>,
prefab_meshs: &HashMap<ShapeType, Handle<Mesh>>,
shape: &dyn Shape,
- collider: ColliderHandle,
+ collider: Option<ColliderHandle>,
collider_pos: Isometry<f32>,
delta: Isometry<f32>,
color: Point3<f32>,
@@ -136,7 +136,7 @@ impl EntityWithGraphics {
}
pub fn update(&mut self, colliders: &ColliderSet, components: &mut Query<(&mut Transform,)>) {
- if let Some(co) = colliders.get(self.collider) {
+ if let Some(Some(co)) = self.collider.map(|c| colliders.get(c)) {
if let Ok(mut pos) = components.get_component_mut::<Transform>(self.entity) {
let co_pos = co.position() * self.delta;
pos.translation.x = co_pos.translation.vector.x;
@@ -159,7 +159,7 @@ impl EntityWithGraphics {
}
}
- pub fn object(&self) -> ColliderHandle {
+ pub fn object(&self) -> Option<ColliderHandle> {
self.collider
}