aboutsummaryrefslogtreecommitdiff
path: root/src_testbed/plugin.rs
diff options
context:
space:
mode:
authorSébastien Crozet <developer@crozet.re>2022-01-09 17:25:17 +0100
committerSébastien Crozet <developer@crozet.re>2022-01-09 20:41:41 +0100
commita0d197e6919dda61ac2957e93ac72234fd6850e4 (patch)
treeb6459c5a9e26d6729f1d2955ac3ffde0e0ee9c79 /src_testbed/plugin.rs
parent6627f7193b3a110915b05839c7fb6d592ad24fd2 (diff)
downloadrapier-a0d197e6919dda61ac2957e93ac72234fd6850e4.tar.gz
rapier-a0d197e6919dda61ac2957e93ac72234fd6850e4.tar.bz2
rapier-a0d197e6919dda61ac2957e93ac72234fd6850e4.zip
Update the testbed to use bevy 0.6
Diffstat (limited to 'src_testbed/plugin.rs')
-rw-r--r--src_testbed/plugin.rs15
1 files changed, 6 insertions, 9 deletions
diff --git a/src_testbed/plugin.rs b/src_testbed/plugin.rs
index 8a9d98c..6eaf09e 100644
--- a/src_testbed/plugin.rs
+++ b/src_testbed/plugin.rs
@@ -1,22 +1,19 @@
+use crate::graphics::BevyMaterial;
use crate::harness::Harness;
use crate::physics::PhysicsState;
use crate::GraphicsManager;
use bevy::prelude::*;
-use bevy::render::pipeline::PipelineDescriptor;
+// use bevy::render::render_resource::RenderPipelineDescriptor;
use bevy_egui::EguiContext;
pub trait TestbedPlugin {
- fn init_plugin(
- &mut self,
- pipelines: &mut Assets<PipelineDescriptor>,
- shaders: &mut Assets<Shader>,
- );
+ fn init_plugin(&mut self);
fn init_graphics(
&mut self,
graphics: &mut GraphicsManager,
commands: &mut Commands,
meshes: &mut Assets<Mesh>,
- materials: &mut Assets<StandardMaterial>,
+ materials: &mut Assets<BevyMaterial>,
components: &mut Query<(&mut Transform,)>,
harness: &mut Harness,
);
@@ -28,7 +25,7 @@ pub trait TestbedPlugin {
graphics: &mut GraphicsManager,
commands: &mut Commands,
meshes: &mut Assets<Mesh>,
- materials: &mut Assets<StandardMaterial>,
+ materials: &mut Assets<BevyMaterial>,
components: &mut Query<(&mut Transform,)>,
harness: &mut Harness,
);
@@ -39,7 +36,7 @@ pub trait TestbedPlugin {
graphics: &mut GraphicsManager,
commands: &mut Commands,
meshes: &mut Assets<Mesh>,
- materials: &mut Assets<StandardMaterial>,
+ materials: &mut Assets<BevyMaterial>,
components: &mut Query<(&mut Transform,)>,
);
fn profiling_string(&self) -> String;