Skip to content

Commit f7f5f88

Browse files
committed
fix
1 parent 4b7f678 commit f7f5f88

File tree

1 file changed

+5
-6
lines changed

1 file changed

+5
-6
lines changed

crates/bevy_pbr/src/wireframe.rs

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use crate::{Material, MaterialPipeline, MaterialPipelineKey, MaterialPlugin};
22
use bevy_app::{Plugin, Startup, Update};
3-
use bevy_asset::{load_internal_asset, Assets, Handle, HandleUntyped};
3+
use bevy_asset::{load_internal_asset, Asset, Assets, Handle};
44
use bevy_ecs::prelude::*;
55
use bevy_reflect::{std_traits::ReflectDefault, Reflect, TypePath, TypeUuid};
66
use bevy_render::{
@@ -72,7 +72,7 @@ fn apply_material(
7272
wireframes: Query<Entity, (With<Wireframe>, Without<Handle<WireframeMaterial>>)>,
7373
mut removed_wireframes: RemovedComponents<Wireframe>,
7474
) {
75-
for e in removed_wireframes.iter() {
75+
for e in removed_wireframes.read() {
7676
if let Some(mut commands) = commands.get_entity(e) {
7777
commands.remove::<Handle<WireframeMaterial>>();
7878
}
@@ -90,7 +90,6 @@ fn apply_material(
9090
fn apply_global(
9191
mut commands: Commands,
9292
config: Res<WireframeConfig>,
93-
mut materials: ResMut<Assets<WireframeMaterial>>,
9493
meshes_without_material: Query<
9594
Entity,
9695
(
@@ -128,17 +127,17 @@ fn apply_global(
128127
}
129128
}
130129

131-
#[derive(Default, AsBindGroup, TypeUuid, TypePath, Debug, Clone)]
130+
#[derive(Default, AsBindGroup, TypeUuid, TypePath, Debug, Clone, Asset)]
132131
#[uuid = "9e694f70-9963-4418-8bc1-3474c66b13b8"]
133132
struct WireframeMaterial {}
134133

135134
impl Material for WireframeMaterial {
136135
fn vertex_shader() -> ShaderRef {
137-
WIREFRAME_SHADER_HANDLE.typed().into()
136+
WIREFRAME_SHADER_HANDLE.into()
138137
}
139138

140139
fn fragment_shader() -> ShaderRef {
141-
WIREFRAME_SHADER_HANDLE.typed().into()
140+
WIREFRAME_SHADER_HANDLE.into()
142141
}
143142

144143
fn specialize(

0 commit comments

Comments
 (0)