From bb3a879dd843526b1bd4fd2b12a21cdb05851ab9 Mon Sep 17 00:00:00 2001 From: IceSentry Date: Mon, 14 Aug 2023 16:33:03 -0400 Subject: [PATCH] fix for 0.11 --- crates/bevy_pbr/src/wireframe.rs | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/crates/bevy_pbr/src/wireframe.rs b/crates/bevy_pbr/src/wireframe.rs index f1946c7b45bce0..5c8321fa0fe481 100644 --- a/crates/bevy_pbr/src/wireframe.rs +++ b/crates/bevy_pbr/src/wireframe.rs @@ -1,8 +1,8 @@ use crate::{Material, MaterialPipeline, MaterialPipelineKey, MaterialPlugin}; -use bevy_app::Plugin; +use bevy_app::{Plugin, Update}; use bevy_asset::{load_internal_asset, Assets, Handle, HandleUntyped}; use bevy_ecs::prelude::*; -use bevy_reflect::{std_traits::ReflectDefault, Reflect, TypeUuid}; +use bevy_reflect::{std_traits::ReflectDefault, Reflect, TypePath, TypeUuid}; use bevy_render::{ extract_resource::ExtractResource, mesh::{Mesh, MeshVertexBufferLayout}, @@ -31,10 +31,11 @@ impl Plugin for WireframePlugin { app.register_type::() .register_type::() .init_resource::() - .add_plugin(MaterialPlugin::::default()) - .add_system(apply_global) - .add_system(apply_material); + .add_plugins(MaterialPlugin::::default()) + .add_systems(Update, apply_global) + .add_systems(Update, apply_material); } +} /// Toggles wireframe rendering for any entity it is attached to. /// @@ -104,7 +105,7 @@ fn apply_global( } } -#[derive(Default, AsBindGroup, TypeUuid, Debug, Clone)] +#[derive(Default, AsBindGroup, TypeUuid, TypePath, Debug, Clone)] #[uuid = "9e694f70-9963-4418-8bc1-3474c66b13b8"] struct WireframeMaterial {}