1
1
use crate :: { Material , MaterialPipeline , MaterialPipelineKey , MaterialPlugin } ;
2
2
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 } ;
4
4
use bevy_ecs:: prelude:: * ;
5
5
use bevy_reflect:: { std_traits:: ReflectDefault , Reflect , TypePath , TypeUuid } ;
6
6
use bevy_render:: {
@@ -72,7 +72,7 @@ fn apply_material(
72
72
wireframes : Query < Entity , ( With < Wireframe > , Without < Handle < WireframeMaterial > > ) > ,
73
73
mut removed_wireframes : RemovedComponents < Wireframe > ,
74
74
) {
75
- for e in removed_wireframes. iter ( ) {
75
+ for e in removed_wireframes. read ( ) {
76
76
if let Some ( mut commands) = commands. get_entity ( e) {
77
77
commands. remove :: < Handle < WireframeMaterial > > ( ) ;
78
78
}
@@ -90,7 +90,6 @@ fn apply_material(
90
90
fn apply_global (
91
91
mut commands : Commands ,
92
92
config : Res < WireframeConfig > ,
93
- mut materials : ResMut < Assets < WireframeMaterial > > ,
94
93
meshes_without_material : Query <
95
94
Entity ,
96
95
(
@@ -128,17 +127,17 @@ fn apply_global(
128
127
}
129
128
}
130
129
131
- #[ derive( Default , AsBindGroup , TypeUuid , TypePath , Debug , Clone ) ]
130
+ #[ derive( Default , AsBindGroup , TypeUuid , TypePath , Debug , Clone , Asset ) ]
132
131
#[ uuid = "9e694f70-9963-4418-8bc1-3474c66b13b8" ]
133
132
struct WireframeMaterial { }
134
133
135
134
impl Material for WireframeMaterial {
136
135
fn vertex_shader ( ) -> ShaderRef {
137
- WIREFRAME_SHADER_HANDLE . typed ( ) . into ( )
136
+ WIREFRAME_SHADER_HANDLE . into ( )
138
137
}
139
138
140
139
fn fragment_shader ( ) -> ShaderRef {
141
- WIREFRAME_SHADER_HANDLE . typed ( ) . into ( )
140
+ WIREFRAME_SHADER_HANDLE . into ( )
142
141
}
143
142
144
143
fn specialize (
0 commit comments