forestia/bevy
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reflect and register the wireframe materials (#17334)

Browse Source 
# Objective

These were missing, but can trivially be reflected.

## Solution

Do that.
This commit is contained in:
Sludge 2025-01-28 06:19:34 +01:00 committed by GitHub
parent 99b0d574f9
commit 581034a7e9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
crates/bevy_pbr/src/wireframe.rs
View File

@ -1,9 +1,9 @@
use crate::{Material, MaterialPipeline, MaterialPipelineKey, MaterialPlugin, MeshMaterial3d};
use bevy_app::{Plugin, Startup, Update};
use bevy_asset::{load_internal_asset, Asset, Assets, Handle};
use bevy_asset::{load_internal_asset, Asset, AssetApp, Assets, Handle};
use bevy_color::{Color, LinearRgba};
use bevy_ecs::prelude::*;
use bevy_reflect::{std_traits::ReflectDefault, Reflect, TypePath};
use bevy_reflect::{std_traits::ReflectDefault, Reflect};
use bevy_render::{
extract_resource::ExtractResource,
mesh::{Mesh3d, MeshVertexBufferLayoutRef},
@ -39,6 +39,7 @@ impl Plugin for WireframePlugin {
.register_type::<WireframeColor>()
.init_resource::<WireframeConfig>()
.add_plugins(MaterialPlugin::<WireframeMaterial>::default())
.register_asset_reflect::<WireframeMaterial>()
.add_systems(Startup, setup_global_wireframe_material)
.add_systems(
Update,
@ -219,7 +220,7 @@ fn get_wireframe_material(
}
}
#[derive(Default, AsBindGroup, TypePath, Debug, Clone, Asset)]
#[derive(Default, AsBindGroup, Debug, Clone, Asset, Reflect)]
pub struct WireframeMaterial {
#[uniform(0)]
pub color: LinearRgba,

7
crates/bevy_sprite/src/mesh2d/wireframe2d.rs
View File

@ -1,9 +1,9 @@
use crate::{Material2d, Material2dKey, Material2dPlugin, Mesh2d};
use bevy_app::{Plugin, Startup, Update};
use bevy_asset::{load_internal_asset, Asset, Assets, Handle};
use bevy_asset::{load_internal_asset, Asset, AssetApp, Assets, Handle};
use bevy_color::{Color, LinearRgba};
use bevy_ecs::prelude::*;
use bevy_reflect::{std_traits::ReflectDefault, Reflect, TypePath};
use bevy_reflect::{std_traits::ReflectDefault, Reflect};
use bevy_render::{
extract_resource::ExtractResource, mesh::MeshVertexBufferLayoutRef, prelude::*,
render_resource::*,
@ -39,6 +39,7 @@ impl Plugin for Wireframe2dPlugin {
.register_type::<Wireframe2dColor>()
.init_resource::<Wireframe2dConfig>()
.add_plugins(Material2dPlugin::<Wireframe2dMaterial>::default())
.register_asset_reflect::<Wireframe2dMaterial>()
.add_systems(Startup, setup_global_wireframe_material)
.add_systems(
Update,
@ -217,7 +218,7 @@ fn apply_global_wireframe_material(
}
}
#[derive(Default, AsBindGroup, TypePath, Debug, Clone, Asset)]
#[derive(Default, AsBindGroup, Debug, Clone, Asset, Reflect)]
pub struct Wireframe2dMaterial {
#[uniform(0)]
pub color: LinearRgba,