From a0d197e6919dda61ac2957e93ac72234fd6850e4 Mon Sep 17 00:00:00 2001
From: Sébastien Crozet <developer@crozet.re>
Date: Sun, 9 Jan 2022 17:25:17 +0100
Subject: Update the testbed to use bevy 0.6

---
 src_testbed/plugin.rs | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

(limited to 'src_testbed/plugin.rs')

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;
-- 
cgit