diff options
| author | Sébastien Crozet <developer@crozet.re> | 2022-01-09 20:42:34 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-09 20:42:34 +0100 |
| commit | 2bfceadf0672572a360af33cf4a78cb42488e684 (patch) | |
| tree | b6459c5a9e26d6729f1d2955ac3ffde0e0ee9c79 /src_testbed/graphics.rs | |
| parent | 6627f7193b3a110915b05839c7fb6d592ad24fd2 (diff) | |
| parent | a0d197e6919dda61ac2957e93ac72234fd6850e4 (diff) | |
| download | rapier-2bfceadf0672572a360af33cf4a78cb42488e684.tar.gz rapier-2bfceadf0672572a360af33cf4a78cb42488e684.tar.bz2 rapier-2bfceadf0672572a360af33cf4a78cb42488e684.zip | |
Merge pull request #273 from dimforge/testbed-bevy-0.6
Update the testbed to use bevy 0.6
Diffstat (limited to 'src_testbed/graphics.rs')
| -rw-r--r-- | src_testbed/graphics.rs | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/src_testbed/graphics.rs b/src_testbed/graphics.rs index 706fc60..b623f26 100644 --- a/src_testbed/graphics.rs +++ b/src_testbed/graphics.rs @@ -17,6 +17,11 @@ use rand::{Rng, SeedableRng}; use rand_pcg::Pcg32; use std::collections::HashMap; +#[cfg(feature = "dim2")] +pub type BevyMaterial = ColorMaterial; +#[cfg(feature = "dim3")] +pub type BevyMaterial = StandardMaterial; + pub struct GraphicsManager { rand: Pcg32, b2sn: HashMap<RigidBodyHandle, Vec<EntityWithGraphics>>, @@ -84,7 +89,7 @@ impl GraphicsManager { pub fn set_body_color( &mut self, - materials: &mut Assets<StandardMaterial>, + materials: &mut Assets<BevyMaterial>, b: RigidBodyHandle, color: [f32; 3], ) { @@ -161,7 +166,7 @@ impl GraphicsManager { fn alloc_color( &mut self, - materials: &mut Assets<StandardMaterial>, + materials: &mut Assets<BevyMaterial>, handle: RigidBodyHandle, is_static: bool, ) -> Point3<f32> { @@ -183,7 +188,7 @@ impl GraphicsManager { &mut self, commands: &mut Commands, meshes: &mut Assets<Mesh>, - materials: &mut Assets<StandardMaterial>, + materials: &mut Assets<BevyMaterial>, components: &mut Query<(&mut Transform,)>, handle: RigidBodyHandle, bodies: &RigidBodySet, @@ -206,7 +211,7 @@ impl GraphicsManager { &mut self, commands: &mut Commands, meshes: &mut Assets<Mesh>, - materials: &mut Assets<StandardMaterial>, + materials: &mut Assets<BevyMaterial>, components: &mut Query<(&mut Transform,)>, handle: RigidBodyHandle, bodies: &RigidBodySet, @@ -257,7 +262,7 @@ impl GraphicsManager { &mut self, commands: &mut Commands, meshes: &mut Assets<Mesh>, - materials: &mut Assets<StandardMaterial>, + materials: &mut Assets<BevyMaterial>, handle: ColliderHandle, colliders: &ColliderSet, ) { @@ -292,7 +297,7 @@ impl GraphicsManager { &mut self, commands: &mut Commands, meshes: &mut Assets<Mesh>, - materials: &mut Assets<StandardMaterial>, + materials: &mut Assets<BevyMaterial>, handle: Option<ColliderHandle>, shape: &dyn Shape, sensor: bool, |