Skip to content

Commit c11b627

Browse files
MrGVSVcart
authored andcommitted
bevy_reflect: Register missing reflected types for bevy_render (bevyengine#6725)
Many types in `bevy_render` implemented `Reflect` but were not registered. Register all types in `bevy_render` that impl `Reflect`. This also registers additional dependent types (i.e. field types). > Note: Adding these dependent types would not be needed using something like bevyengine#5781 😉 --- - Register missing `bevy_render` types in the `TypeRegistry`: - `camera::RenderTarget` - `globals::GlobalsUniform` - `texture::Image` - `view::ComputedVisibility` - `view::Visibility` - `view::VisibleEntities` - Register additional dependent types: - `view::ComputedVisibilityFlags` - `Vec<Entity>`
1 parent 4f17cd9 commit c11b627

File tree

6 files changed

+20
-22
lines changed

6 files changed

+20
-22
lines changed

crates/bevy_render/src/camera/mod.rs

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,7 @@ pub use camera::*;
77
pub use camera_driver_node::*;
88
pub use projection::*;
99

10-
use crate::{
11-
primitives::Aabb,
12-
render_graph::RenderGraph,
13-
view::{ComputedVisibility, RenderLayers, Visibility, VisibleEntities},
14-
RenderApp, RenderStage,
15-
};
10+
use crate::{render_graph::RenderGraph, RenderApp, RenderStage};
1611
use bevy_app::{App, Plugin};
1712

1813
#[derive(Default)]
@@ -23,14 +18,10 @@ impl Plugin for CameraPlugin {
2318
app.register_type::<Camera>()
2419
.register_type::<Viewport>()
2520
.register_type::<Option<Viewport>>()
26-
.register_type::<Visibility>()
27-
.register_type::<ComputedVisibility>()
28-
.register_type::<VisibleEntities>()
2921
.register_type::<WindowOrigin>()
3022
.register_type::<ScalingMode>()
31-
.register_type::<Aabb>()
3223
.register_type::<CameraRenderGraph>()
33-
.register_type::<RenderLayers>()
24+
.register_type::<RenderTarget>()
3425
.add_plugin(CameraProjectionPlugin::<Projection>::default())
3526
.add_plugin(CameraProjectionPlugin::<OrthographicProjection>::default())
3627
.add_plugin(CameraProjectionPlugin::<PerspectiveProjection>::default());

crates/bevy_render/src/globals.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ pub struct GlobalsPlugin;
1414

1515
impl Plugin for GlobalsPlugin {
1616
fn build(&self, app: &mut App) {
17+
app.register_type::<GlobalsUniform>();
1718
if let Ok(render_app) = app.get_sub_app_mut(RenderApp) {
1819
render_app
1920
.init_resource::<GlobalsBuffer>()

crates/bevy_render/src/lib.rs

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,11 @@ pub mod prelude {
3838

3939
use globals::GlobalsPlugin;
4040
pub use once_cell;
41-
use prelude::ComputedVisibility;
4241

4342
use crate::{
4443
camera::CameraPlugin,
45-
color::Color,
4644
mesh::MeshPlugin,
47-
primitives::{CubemapFrusta, Frustum},
48-
render_graph::RenderGraph,
45+
prelude::ComputedVisibility,
4946
render_resource::{PipelineCache, Shader, ShaderLoader},
5047
renderer::{render_system, RenderInstance},
5148
view::{ViewPlugin, WindowRenderPlugin},
@@ -138,8 +135,7 @@ impl Plugin for RenderPlugin {
138135
app.add_asset::<Shader>()
139136
.add_debug_asset::<Shader>()
140137
.init_asset_loader::<ShaderLoader>()
141-
.init_debug_asset_loader::<ShaderLoader>()
142-
.register_type::<Color>();
138+
.init_debug_asset_loader::<ShaderLoader>();
143139

144140
if let Some(backends) = options.backends {
145141
let windows = app.world.resource_mut::<bevy_window::Windows>();
@@ -167,9 +163,7 @@ impl Plugin for RenderPlugin {
167163
.insert_resource(queue.clone())
168164
.insert_resource(adapter_info.clone())
169165
.insert_resource(render_adapter.clone())
170-
.init_resource::<ScratchMainWorld>()
171-
.register_type::<Frustum>()
172-
.register_type::<CubemapFrusta>();
166+
.init_resource::<ScratchMainWorld>();
173167

174168
let pipeline_cache = PipelineCache::new(device.clone());
175169
let asset_server = app.world.resource::<AssetServer>().clone();
@@ -204,7 +198,7 @@ impl Plugin for RenderPlugin {
204198
.with_system(render_system.at_end()),
205199
)
206200
.add_stage(RenderStage::Cleanup, SystemStage::parallel())
207-
.init_resource::<RenderGraph>()
201+
.init_resource::<render_graph::RenderGraph>()
208202
.insert_resource(RenderInstance(instance))
209203
.insert_resource(device)
210204
.insert_resource(queue)
@@ -335,6 +329,11 @@ impl Plugin for RenderPlugin {
335329
.add_plugin(MeshPlugin)
336330
.add_plugin(GlobalsPlugin)
337331
.add_plugin(FrameCountPlugin);
332+
333+
app.register_type::<color::Color>()
334+
.register_type::<primitives::Aabb>()
335+
.register_type::<primitives::CubemapFrusta>()
336+
.register_type::<primitives::Frustum>();
338337
}
339338
}
340339

crates/bevy_render/src/mesh/mod.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ pub use mesh::*;
88
use crate::render_asset::RenderAssetPlugin;
99
use bevy_app::{App, Plugin};
1010
use bevy_asset::AddAsset;
11+
use bevy_ecs::entity::Entity;
1112

1213
/// Adds the [`Mesh`] as an asset and makes sure that they are extracted and prepared for the GPU.
1314
pub struct MeshPlugin;
@@ -17,6 +18,7 @@ impl Plugin for MeshPlugin {
1718
app.add_asset::<Mesh>()
1819
.add_asset::<skinning::SkinnedMeshInverseBindposes>()
1920
.register_type::<skinning::SkinnedMesh>()
21+
.register_type::<Vec<Entity>>()
2022
.add_plugin(RenderAssetPlugin::<Mesh>::default());
2123
}
2224
}

crates/bevy_render/src/texture/mod.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ impl Plugin for ImagePlugin {
8686
app.add_plugin(RenderAssetPlugin::<Image>::with_prepare_asset_label(
8787
PrepareAssetLabel::PreAssetPrepare,
8888
))
89+
.register_type::<Image>()
8990
.add_asset::<Image>()
9091
.register_asset_reflect::<Image>();
9192
app.world

crates/bevy_render/src/view/mod.rs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,11 @@ pub struct ViewPlugin;
3131

3232
impl Plugin for ViewPlugin {
3333
fn build(&self, app: &mut App) {
34-
app.register_type::<Msaa>()
34+
app.register_type::<ComputedVisibility>()
35+
.register_type::<Msaa>()
36+
.register_type::<RenderLayers>()
37+
.register_type::<Visibility>()
38+
.register_type::<VisibleEntities>()
3539
.init_resource::<Msaa>()
3640
// NOTE: windows.is_changed() handles cases where a window was resized
3741
.add_plugin(ExtractResourcePlugin::<Msaa>::default())

0 commit comments

Comments
 (0)