Skip to content

Commit 8edc147

Browse files
tim-blackbirdtim-blackbird
authored
Remove Manual Type Registrations (#246)
1 parent 095463c commit 8edc147

File tree

10 files changed

+6
-61
lines changed

10 files changed

+6
-61
lines changed

‎crates/bevy_editor_cam/src/controller/mod.rs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ impl Plugin for MinimalEditorCamPlugin {
2727
)
2828
.chain()
2929
.after(bevy::picking::PickingSystems::Last),
30-
)
31-
.register_type::<component::EditorCam>();
30+
);
3231
}
3332
}

‎crates/bevy_editor_cam/src/extensions/anchor_indicator.rs‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,7 @@ impl Plugin for AnchorIndicatorPlugin {
5252
commands.entity(anchor_root.0).despawn();
5353
}
5454
},
55-
)
56-
.register_type::<AnchorIndicator>()
57-
.register_type::<AnchorRoot>();
55+
);
5856
}
5957
}
6058

‎crates/bevy_editor_cam/src/extensions/dolly_zoom.rs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,7 @@ impl Plugin for DollyZoomPlugin {
2828
PreUpdate,
2929
DollyZoom::update.before(EditorCam::update_camera_positions),
3030
)
31-
.add_systems(Last, DollyZoomTrigger::receive) // This mutates camera components, so we want to be sure it runs *after* rendering has happened. We place it in Last to ensure that we wake the next frame if needed. If we run this in PostUpdate, this can result in rendering artifacts because this will mutate projections right before rendering.
32-
.register_type::<DollyZoom>();
31+
.add_systems(Last, DollyZoomTrigger::receive); // This mutates camera components, so we want to be sure it runs *after* rendering has happened. We place it in Last to ensure that we wake the next frame if needed. If we run this in PostUpdate, this can result in rendering artifacts because this will mutate projections right before rendering.
3332
}
3433
}
3534

‎crates/bevy_editor_cam/src/extensions/independent_skybox.rs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,7 @@ impl Plugin for IndependentSkyboxPlugin {
3131
IndependentSkyboxCamera::update,
3232
)
3333
.chain(),
34-
)
35-
.register_type::<IndependentSkybox>();
34+
);
3635
}
3736
}
3837

‎crates/bevy_editor_cam/src/extensions/look_to.rs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,7 @@ impl Plugin for LookToPlugin {
2525
PreUpdate,
2626
LookTo::update.before(EditorCam::update_camera_positions),
2727
)
28-
.add_systems(PostUpdate, LookToTrigger::receive) // In PostUpdate so we don't miss users sending this in Update. LookTo::update will catch the changes next frame.
29-
.register_type::<LookTo>();
28+
.add_systems(PostUpdate, LookToTrigger::receive); // In PostUpdate so we don't miss users sending this in Update. LookTo::update will catch the changes next frame.
3029
}
3130
}
3231

‎crates/bevy_editor_cam/src/input.rs‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,7 @@ impl Plugin for DefaultInputPlugin {
5959
.chain()
6060
.after(bevy::picking::PickingSystems::Last)
6161
.before(EditorCam::update_camera_positions),
62-
)
63-
.register_type::<CameraPointerMap>()
64-
.register_type::<EditorCamInputEvent>();
62+
);
6563
}
6664
}
6765

‎crates/bevy_editor_settings/src/lib.rs‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,6 @@ mod tests {
8787
fn basic_test() {
8888
let mut app = App::new();
8989

90-
app.register_type::<BasicSettings>();
91-
9290
app.insert_resource(BasicSettings {
9391
name: "John".to_string(),
9492
age: 25,
@@ -120,9 +118,6 @@ mod tests {
120118
fn test_lists() {
121119
let mut app = App::new();
122120

123-
app.register_type::<ListTesting>();
124-
app.register_type::<ListTestingAppend>();
125-
126121
app.insert_resource(ListTesting {
127122
list: vec!["one".to_string(), "two".to_string()],
128123
});
@@ -175,10 +170,6 @@ mod tests {
175170
fn test_enum() {
176171
let mut app = App::new();
177172

178-
app.register_type::<EnumTesting>();
179-
app.register_type::<EnumSettings>();
180-
app.register_type::<EnumSettingsList>();
181-
182173
app.insert_resource(EnumTesting::One);
183174
app.insert_resource(EnumSettings {
184175
test1: EnumTestingField::Unit,
@@ -230,9 +221,6 @@ mod tests {
230221
fn test_tuple_struct() {
231222
let mut app = App::new();
232223

233-
app.register_type::<TupleStruct>();
234-
app.register_type::<StructWithTuple>();
235-
236224
app.insert_resource(TupleStruct(1, "one".to_string()));
237225
app.insert_resource(StructWithTuple {
238226
tuple: TupleStruct(2, "two".to_string()),

‎crates/bevy_proto_bsn/src/construct_impls.rs‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,6 @@ use bevy::{
1111

1212
use crate::*;
1313

14-
pub(crate) fn register_construct_impls(app: &mut App) {
15-
app.register_type::<ConstructEntity>();
16-
app.register_type::<ConstructTextFont>();
17-
app.register_type::<ConstructTextFontProps>();
18-
}
19-
2014
/// Constructable asset handle (because [`Handle<T>`] implements Default in Bevy right now)
2115
#[derive(Deref, DerefMut, Clone, Reflect, Debug)]
2216
#[reflect(Construct)]

‎crates/bevy_proto_bsn/src/construct_reflect.rs‎

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -86,20 +86,17 @@ pub(crate) fn register_reflect_construct(app: &mut App) {
8686
app.register_type_data::<bevy::audio::SpatialListener, ReflectConstruct>();
8787

8888
app.register_type_data::<bevy::anti_aliasing::contrast_adaptive_sharpening::ContrastAdaptiveSharpening, ReflectConstruct>();
89-
app.register_type::<bevy::anti_aliasing::contrast_adaptive_sharpening::DenoiseCas>();
9089
app.register_type_data::<bevy::anti_aliasing::contrast_adaptive_sharpening::DenoiseCas, ReflectConstruct>();
9190
app.register_type_data::<bevy::anti_aliasing::fxaa::Fxaa, ReflectConstruct>();
9291
app.register_type_data::<bevy::anti_aliasing::smaa::Smaa, ReflectConstruct>();
9392
app.register_type_data::<bevy::anti_aliasing::taa::TemporalAntiAliasing, ReflectConstruct>();
9493

95-
app.register_type::<bevy::core_pipeline::auto_exposure::AutoExposure>();
9694
app.register_type_data::<bevy::core_pipeline::auto_exposure::AutoExposure, ReflectConstruct>();
9795
app.register_type_data::<bevy::core_pipeline::bloom::Bloom, ReflectConstruct>();
9896
app.register_type_data::<bevy::core_pipeline::core_2d::Camera2d, ReflectConstruct>();
9997
app.register_type_data::<bevy::core_pipeline::core_3d::Camera3d, ReflectConstruct>();
10098
app.register_type_data::<bevy::core_pipeline::dof::DepthOfField, ReflectConstruct>();
10199

102-
app.register_type::<bevy::core_pipeline::motion_blur::MotionBlur>();
103100
app.register_type_data::<bevy::core_pipeline::motion_blur::MotionBlur, ReflectConstruct>();
104101
app.register_type_data::<bevy::core_pipeline::oit::OrderIndependentTransparencySettings, ReflectConstruct>();
105102
app.register_type_data::<bevy::core_pipeline::post_process::ChromaticAberration, ReflectConstruct>();
@@ -110,7 +107,6 @@ pub(crate) fn register_reflect_construct(app: &mut App) {
110107

111108
app.register_type_data::<bevy::ecs::name::Name, ReflectConstruct>();
112109

113-
app.register_type::<bevy::gizmos::retained::Gizmo>();
114110
app.register_type_data::<bevy::gizmos::retained::Gizmo, ReflectConstruct>();
115111

116112
app.register_type_data::<bevy::gltf::GltfExtras, ReflectConstruct>();
@@ -119,11 +115,8 @@ pub(crate) fn register_reflect_construct(app: &mut App) {
119115
app.register_type_data::<bevy::gltf::GltfMeshExtras, ReflectConstruct>();
120116
app.register_type_data::<bevy::gltf::GltfSceneExtras, ReflectConstruct>();
121117

122-
app.register_type::<bevy::input_focus::AutoFocus>();
123118
app.register_type_data::<bevy::input_focus::AutoFocus, ReflectConstruct>();
124-
app.register_type::<bevy::input_focus::tab_navigation::TabGroup>();
125119
app.register_type_data::<bevy::input_focus::tab_navigation::TabGroup, ReflectConstruct>();
126-
app.register_type::<bevy::input_focus::tab_navigation::TabIndex>();
127120
app.register_type_data::<bevy::input_focus::tab_navigation::TabIndex, ReflectConstruct>();
128121

129122
app.register_type_data::<bevy::input::gamepad::GamepadSettings, ReflectConstruct>();
@@ -132,11 +125,8 @@ pub(crate) fn register_reflect_construct(app: &mut App) {
132125
app.register_type_data::<bevy::pbr::AtmosphereSettings, ReflectConstruct>();
133126
app.register_type_data::<bevy::pbr::CascadesVisibleEntities, ReflectConstruct>();
134127
app.register_type_data::<bevy::pbr::CubemapVisibleEntities, ReflectConstruct>();
135-
app.register_type::<bevy::pbr::RenderCascadesVisibleEntities>();
136128
app.register_type_data::<bevy::pbr::RenderCascadesVisibleEntities, ReflectConstruct>();
137-
app.register_type::<bevy::pbr::RenderCubemapVisibleEntities>();
138129
app.register_type_data::<bevy::pbr::RenderCubemapVisibleEntities, ReflectConstruct>();
139-
app.register_type::<bevy::pbr::RenderVisibleMeshEntities>();
140130
app.register_type_data::<bevy::pbr::RenderVisibleMeshEntities, ReflectConstruct>();
141131
app.register_type_data::<bevy::pbr::VisibleMeshEntities, ReflectConstruct>();
142132
app.register_type_data::<bevy::pbr::DistanceFog, ReflectConstruct>();
@@ -149,25 +139,18 @@ pub(crate) fn register_reflect_construct(app: &mut App) {
149139
app.register_type_data::<bevy::pbr::DirectionalLight, ReflectConstruct>();
150140
app.register_type_data::<bevy::pbr::PointLight, ReflectConstruct>();
151141
app.register_type_data::<bevy::pbr::SpotLight, ReflectConstruct>();
152-
app.register_type::<bevy::pbr::Lightmap>();
153142
app.register_type_data::<bevy::pbr::Lightmap, ReflectConstruct>();
154143
//app.register_type_data::<bevy::pbr::MeshMaterial3d, ReflectConstruct>();
155144
app.register_type_data::<bevy::pbr::ScreenSpaceAmbientOcclusion, ReflectConstruct>();
156145
app.register_type_data::<bevy::pbr::ScreenSpaceReflections, ReflectConstruct>();
157-
app.register_type::<bevy::pbr::FogVolume>();
158146
app.register_type_data::<bevy::pbr::FogVolume, ReflectConstruct>();
159147
app.register_type_data::<bevy::pbr::VolumetricFog, ReflectConstruct>();
160148
app.register_type_data::<bevy::pbr::VolumetricLight, ReflectConstruct>();
161-
app.register_type::<bevy::pbr::wireframe::NoWireframe>();
162149
app.register_type_data::<bevy::pbr::wireframe::NoWireframe, ReflectConstruct>();
163-
app.register_type::<bevy::pbr::wireframe::Wireframe>();
164150
app.register_type_data::<bevy::pbr::wireframe::Wireframe, ReflectConstruct>();
165-
app.register_type::<bevy::pbr::wireframe::WireframeColor>();
166151
app.register_type_data::<bevy::pbr::wireframe::WireframeColor, ReflectConstruct>();
167152

168-
app.register_type::<bevy::picking::mesh_picking::ray_cast::RayCastBackfaces>();
169153
app.register_type_data::<bevy::picking::mesh_picking::ray_cast::RayCastBackfaces, ReflectConstruct>();
170-
app.register_type::<bevy::picking::mesh_picking::MeshPickingCamera>();
171154
app.register_type_data::<bevy::picking::mesh_picking::MeshPickingCamera, ReflectConstruct>();
172155
app.register_type_data::<bevy::picking::Pickable, ReflectConstruct>();
173156
app.register_type_data::<bevy::picking::pointer::PointerInteraction, ReflectConstruct>();
@@ -183,7 +166,6 @@ pub(crate) fn register_reflect_construct(app: &mut App) {
183166
app.register_type_data::<bevy::render::experimental::occlusion_culling::OcclusionCulling, ReflectConstruct>();
184167
app.register_type_data::<bevy::render::mesh::Mesh2d, ReflectConstruct>();
185168
app.register_type_data::<bevy::render::mesh::Mesh3d, ReflectConstruct>();
186-
app.register_type::<bevy::render::mesh::MeshTag>();
187169
app.register_type_data::<bevy::render::mesh::MeshTag, ReflectConstruct>();
188170
app.register_type_data::<bevy::render::mesh::morph::MeshMorphWeights, ReflectConstruct>();
189171
app.register_type_data::<bevy::render::mesh::morph::MorphWeights, ReflectConstruct>();
@@ -193,14 +175,12 @@ pub(crate) fn register_reflect_construct(app: &mut App) {
193175
app.register_type_data::<bevy::render::primitives::CubemapFrusta, ReflectConstruct>();
194176
app.register_type_data::<bevy::render::primitives::Frustum, ReflectConstruct>();
195177
app.register_type_data::<bevy::render::sync_world::SyncToRenderWorld, ReflectConstruct>();
196-
app.register_type::<bevy::render::sync_world::TemporaryRenderEntity>();
197178
app.register_type_data::<bevy::render::sync_world::TemporaryRenderEntity, ReflectConstruct>();
198179
app.register_type_data::<bevy::render::view::ColorGrading, ReflectConstruct>();
199180
app.register_type_data::<bevy::render::view::visibility::Visibility, ReflectConstruct>();
200181
app.register_type_data::<bevy::render::view::visibility::InheritedVisibility, ReflectConstruct>();
201182
app.register_type_data::<bevy::render::view::visibility::VisibilityRange, ReflectConstruct>();
202183
app.register_type_data::<bevy::render::view::visibility::RenderLayers, ReflectConstruct>();
203-
app.register_type::<bevy::render::view::visibility::RenderVisibleEntities>();
204184
app.register_type_data::<bevy::render::view::visibility::RenderVisibleEntities, ReflectConstruct>();
205185
app.register_type_data::<bevy::render::view::visibility::ViewVisibility, ReflectConstruct>();
206186
app.register_type_data::<bevy::render::view::visibility::VisibilityClass, ReflectConstruct>();
@@ -210,11 +190,8 @@ pub(crate) fn register_reflect_construct(app: &mut App) {
210190
app.register_type_data::<bevy::scene::SceneRoot, ReflectConstruct>();
211191

212192
//app.register_type_data::<bevy::sprite::MeshMaterial2d, ReflectConstruct>();
213-
app.register_type::<bevy::sprite::NoWireframe2d>();
214193
app.register_type_data::<bevy::sprite::NoWireframe2d, ReflectConstruct>();
215-
app.register_type::<bevy::sprite::Wireframe2d>();
216194
app.register_type_data::<bevy::sprite::Wireframe2d, ReflectConstruct>();
217-
app.register_type::<bevy::sprite::Wireframe2dColor>();
218195
app.register_type_data::<bevy::sprite::Wireframe2dColor, ReflectConstruct>();
219196
app.register_type_data::<bevy::sprite::SpritePickingCamera, ReflectConstruct>();
220197
app.register_type_data::<bevy::sprite::Sprite, ReflectConstruct>();
@@ -243,18 +220,13 @@ pub(crate) fn register_reflect_construct(app: &mut App) {
243220
app.register_type_data::<bevy::ui_render::BoxShadowSamples, ReflectConstruct>();
244221
app.register_type_data::<bevy::ui::CalculatedClip, ReflectConstruct>();
245222
app.register_type_data::<bevy::ui::ComputedNode, ReflectConstruct>();
246-
app.register_type::<bevy::ui::ComputedNodeTarget>();
247223
app.register_type_data::<bevy::ui::ComputedNodeTarget, ReflectConstruct>();
248-
app.register_type::<bevy::ui::GlobalZIndex>();
249224
app.register_type_data::<bevy::ui::GlobalZIndex, ReflectConstruct>();
250-
app.register_type::<bevy::ui::LayoutConfig>();
251225
app.register_type_data::<bevy::ui::LayoutConfig, ReflectConstruct>();
252226
app.register_type_data::<bevy::ui::Node, ReflectConstruct>();
253227
app.register_type_data::<bevy::ui::Outline, ReflectConstruct>();
254228
app.register_type_data::<bevy::ui::ScrollPosition, ReflectConstruct>();
255229
app.register_type_data::<bevy::ui::widget::TextShadow, ReflectConstruct>();
256-
app.register_type::<bevy::ui::UiTransform>();
257-
app.register_type::<bevy::ui::UiGlobalTransform>();
258230
app.register_type_data::<bevy::ui::ZIndex, ReflectConstruct>();
259231
app.register_type_data::<bevy::ui::widget::Button, ReflectConstruct>();
260232
app.register_type_data::<bevy::ui::widget::ImageNode, ReflectConstruct>();

‎crates/bevy_proto_bsn/src/lib.rs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ pub struct BsnPlugin;
4242
impl Plugin for BsnPlugin {
4343
fn build(&self, app: &mut App) {
4444
register_reflect_construct(app);
45-
register_construct_impls(app);
4645
bsn_asset_plugin(app);
4746
bsn_reflect_plugin(app);
4847
prefab_plugin(app);

0 commit comments

Comments
 (0)