Skip to content

Commit 581034a

Browse files
authored
Reflect and register the wireframe materials (#17334)
# Objective These were missing, but can trivially be reflected. ## Solution Do that.
1 parent 99b0d57 commit 581034a

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

crates/bevy_pbr/src/wireframe.rs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
use crate::{Material, MaterialPipeline, MaterialPipelineKey, MaterialPlugin, MeshMaterial3d};
22
use bevy_app::{Plugin, Startup, Update};
3-
use bevy_asset::{load_internal_asset, Asset, Assets, Handle};
3+
use bevy_asset::{load_internal_asset, Asset, AssetApp, Assets, Handle};
44
use bevy_color::{Color, LinearRgba};
55
use bevy_ecs::prelude::*;
6-
use bevy_reflect::{std_traits::ReflectDefault, Reflect, TypePath};
6+
use bevy_reflect::{std_traits::ReflectDefault, Reflect};
77
use bevy_render::{
88
extract_resource::ExtractResource,
99
mesh::{Mesh3d, MeshVertexBufferLayoutRef},
@@ -39,6 +39,7 @@ impl Plugin for WireframePlugin {
3939
.register_type::<WireframeColor>()
4040
.init_resource::<WireframeConfig>()
4141
.add_plugins(MaterialPlugin::<WireframeMaterial>::default())
42+
.register_asset_reflect::<WireframeMaterial>()
4243
.add_systems(Startup, setup_global_wireframe_material)
4344
.add_systems(
4445
Update,
@@ -219,7 +220,7 @@ fn get_wireframe_material(
219220
}
220221
}
221222

222-
#[derive(Default, AsBindGroup, TypePath, Debug, Clone, Asset)]
223+
#[derive(Default, AsBindGroup, Debug, Clone, Asset, Reflect)]
223224
pub struct WireframeMaterial {
224225
#[uniform(0)]
225226
pub color: LinearRgba,

crates/bevy_sprite/src/mesh2d/wireframe2d.rs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
use crate::{Material2d, Material2dKey, Material2dPlugin, Mesh2d};
22
use bevy_app::{Plugin, Startup, Update};
3-
use bevy_asset::{load_internal_asset, Asset, Assets, Handle};
3+
use bevy_asset::{load_internal_asset, Asset, AssetApp, Assets, Handle};
44
use bevy_color::{Color, LinearRgba};
55
use bevy_ecs::prelude::*;
6-
use bevy_reflect::{std_traits::ReflectDefault, Reflect, TypePath};
6+
use bevy_reflect::{std_traits::ReflectDefault, Reflect};
77
use bevy_render::{
88
extract_resource::ExtractResource, mesh::MeshVertexBufferLayoutRef, prelude::*,
99
render_resource::*,
@@ -39,6 +39,7 @@ impl Plugin for Wireframe2dPlugin {
3939
.register_type::<Wireframe2dColor>()
4040
.init_resource::<Wireframe2dConfig>()
4141
.add_plugins(Material2dPlugin::<Wireframe2dMaterial>::default())
42+
.register_asset_reflect::<Wireframe2dMaterial>()
4243
.add_systems(Startup, setup_global_wireframe_material)
4344
.add_systems(
4445
Update,
@@ -217,7 +218,7 @@ fn apply_global_wireframe_material(
217218
}
218219
}
219220

220-
#[derive(Default, AsBindGroup, TypePath, Debug, Clone, Asset)]
221+
#[derive(Default, AsBindGroup, Debug, Clone, Asset, Reflect)]
221222
pub struct Wireframe2dMaterial {
222223
#[uniform(0)]
223224
pub color: LinearRgba,

0 commit comments

Comments
 (0)