Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions crates/bevy_editor_cam/src/controller/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ impl Plugin for MinimalEditorCamPlugin {
)
.chain()
.after(bevy::picking::PickingSystems::Last),
)
.register_type::<component::EditorCam>();
);
}
}
4 changes: 1 addition & 3 deletions crates/bevy_editor_cam/src/extensions/anchor_indicator.rs
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,7 @@ impl Plugin for AnchorIndicatorPlugin {
commands.entity(anchor_root.0).despawn();
}
},
)
.register_type::<AnchorIndicator>()
.register_type::<AnchorRoot>();
);
}
}

Expand Down
3 changes: 1 addition & 2 deletions crates/bevy_editor_cam/src/extensions/dolly_zoom.rs
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,7 @@ impl Plugin for DollyZoomPlugin {
PreUpdate,
DollyZoom::update.before(EditorCam::update_camera_positions),
)
.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.
.register_type::<DollyZoom>();
.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.
}
}

Expand Down
3 changes: 1 addition & 2 deletions crates/bevy_editor_cam/src/extensions/independent_skybox.rs
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,7 @@ impl Plugin for IndependentSkyboxPlugin {
IndependentSkyboxCamera::update,
)
.chain(),
)
.register_type::<IndependentSkybox>();
);
}
}

Expand Down
3 changes: 1 addition & 2 deletions crates/bevy_editor_cam/src/extensions/look_to.rs
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,7 @@ impl Plugin for LookToPlugin {
PreUpdate,
LookTo::update.before(EditorCam::update_camera_positions),
)
.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.
.register_type::<LookTo>();
.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.
}
}

Expand Down
4 changes: 1 addition & 3 deletions crates/bevy_editor_cam/src/input.rs
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,7 @@ impl Plugin for DefaultInputPlugin {
.chain()
.after(bevy::picking::PickingSystems::Last)
.before(EditorCam::update_camera_positions),
)
.register_type::<CameraPointerMap>()
.register_type::<EditorCamInputEvent>();
);
}
}

Expand Down
12 changes: 0 additions & 12 deletions crates/bevy_editor_settings/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,6 @@ mod tests {
fn basic_test() {
let mut app = App::new();

app.register_type::<BasicSettings>();

app.insert_resource(BasicSettings {
name: "John".to_string(),
age: 25,
Expand Down Expand Up @@ -120,9 +118,6 @@ mod tests {
fn test_lists() {
let mut app = App::new();

app.register_type::<ListTesting>();
app.register_type::<ListTestingAppend>();

app.insert_resource(ListTesting {
list: vec!["one".to_string(), "two".to_string()],
});
Expand Down Expand Up @@ -175,10 +170,6 @@ mod tests {
fn test_enum() {
let mut app = App::new();

app.register_type::<EnumTesting>();
app.register_type::<EnumSettings>();
app.register_type::<EnumSettingsList>();

app.insert_resource(EnumTesting::One);
app.insert_resource(EnumSettings {
test1: EnumTestingField::Unit,
Expand Down Expand Up @@ -230,9 +221,6 @@ mod tests {
fn test_tuple_struct() {
let mut app = App::new();

app.register_type::<TupleStruct>();
app.register_type::<StructWithTuple>();

app.insert_resource(TupleStruct(1, "one".to_string()));
app.insert_resource(StructWithTuple {
tuple: TupleStruct(2, "two".to_string()),
Expand Down
6 changes: 0 additions & 6 deletions crates/bevy_proto_bsn/src/construct_impls.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,6 @@ use bevy::{

use crate::*;

pub(crate) fn register_construct_impls(app: &mut App) {
app.register_type::<ConstructEntity>();
app.register_type::<ConstructTextFont>();
app.register_type::<ConstructTextFontProps>();
}

/// Constructable asset handle (because [`Handle<T>`] implements Default in Bevy right now)
#[derive(Deref, DerefMut, Clone, Reflect, Debug)]
#[reflect(Construct)]
Expand Down
28 changes: 0 additions & 28 deletions crates/bevy_proto_bsn/src/construct_reflect.rs
Original file line number Diff line number Diff line change
Expand Up @@ -86,20 +86,17 @@ pub(crate) fn register_reflect_construct(app: &mut App) {
app.register_type_data::<bevy::audio::SpatialListener, ReflectConstruct>();

app.register_type_data::<bevy::anti_aliasing::contrast_adaptive_sharpening::ContrastAdaptiveSharpening, ReflectConstruct>();
app.register_type::<bevy::anti_aliasing::contrast_adaptive_sharpening::DenoiseCas>();
app.register_type_data::<bevy::anti_aliasing::contrast_adaptive_sharpening::DenoiseCas, ReflectConstruct>();
app.register_type_data::<bevy::anti_aliasing::fxaa::Fxaa, ReflectConstruct>();
app.register_type_data::<bevy::anti_aliasing::smaa::Smaa, ReflectConstruct>();
app.register_type_data::<bevy::anti_aliasing::taa::TemporalAntiAliasing, ReflectConstruct>();

app.register_type::<bevy::core_pipeline::auto_exposure::AutoExposure>();
app.register_type_data::<bevy::core_pipeline::auto_exposure::AutoExposure, ReflectConstruct>();
app.register_type_data::<bevy::core_pipeline::bloom::Bloom, ReflectConstruct>();
app.register_type_data::<bevy::core_pipeline::core_2d::Camera2d, ReflectConstruct>();
app.register_type_data::<bevy::core_pipeline::core_3d::Camera3d, ReflectConstruct>();
app.register_type_data::<bevy::core_pipeline::dof::DepthOfField, ReflectConstruct>();

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

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

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

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

app.register_type::<bevy::input_focus::AutoFocus>();
app.register_type_data::<bevy::input_focus::AutoFocus, ReflectConstruct>();
app.register_type::<bevy::input_focus::tab_navigation::TabGroup>();
app.register_type_data::<bevy::input_focus::tab_navigation::TabGroup, ReflectConstruct>();
app.register_type::<bevy::input_focus::tab_navigation::TabIndex>();
app.register_type_data::<bevy::input_focus::tab_navigation::TabIndex, ReflectConstruct>();

app.register_type_data::<bevy::input::gamepad::GamepadSettings, ReflectConstruct>();
Expand All @@ -132,11 +125,8 @@ pub(crate) fn register_reflect_construct(app: &mut App) {
app.register_type_data::<bevy::pbr::AtmosphereSettings, ReflectConstruct>();
app.register_type_data::<bevy::pbr::CascadesVisibleEntities, ReflectConstruct>();
app.register_type_data::<bevy::pbr::CubemapVisibleEntities, ReflectConstruct>();
app.register_type::<bevy::pbr::RenderCascadesVisibleEntities>();
app.register_type_data::<bevy::pbr::RenderCascadesVisibleEntities, ReflectConstruct>();
app.register_type::<bevy::pbr::RenderCubemapVisibleEntities>();
app.register_type_data::<bevy::pbr::RenderCubemapVisibleEntities, ReflectConstruct>();
app.register_type::<bevy::pbr::RenderVisibleMeshEntities>();
app.register_type_data::<bevy::pbr::RenderVisibleMeshEntities, ReflectConstruct>();
app.register_type_data::<bevy::pbr::VisibleMeshEntities, ReflectConstruct>();
app.register_type_data::<bevy::pbr::DistanceFog, ReflectConstruct>();
Expand All @@ -149,25 +139,18 @@ pub(crate) fn register_reflect_construct(app: &mut App) {
app.register_type_data::<bevy::pbr::DirectionalLight, ReflectConstruct>();
app.register_type_data::<bevy::pbr::PointLight, ReflectConstruct>();
app.register_type_data::<bevy::pbr::SpotLight, ReflectConstruct>();
app.register_type::<bevy::pbr::Lightmap>();
app.register_type_data::<bevy::pbr::Lightmap, ReflectConstruct>();
//app.register_type_data::<bevy::pbr::MeshMaterial3d, ReflectConstruct>();
app.register_type_data::<bevy::pbr::ScreenSpaceAmbientOcclusion, ReflectConstruct>();
app.register_type_data::<bevy::pbr::ScreenSpaceReflections, ReflectConstruct>();
app.register_type::<bevy::pbr::FogVolume>();
app.register_type_data::<bevy::pbr::FogVolume, ReflectConstruct>();
app.register_type_data::<bevy::pbr::VolumetricFog, ReflectConstruct>();
app.register_type_data::<bevy::pbr::VolumetricLight, ReflectConstruct>();
app.register_type::<bevy::pbr::wireframe::NoWireframe>();
app.register_type_data::<bevy::pbr::wireframe::NoWireframe, ReflectConstruct>();
app.register_type::<bevy::pbr::wireframe::Wireframe>();
app.register_type_data::<bevy::pbr::wireframe::Wireframe, ReflectConstruct>();
app.register_type::<bevy::pbr::wireframe::WireframeColor>();
app.register_type_data::<bevy::pbr::wireframe::WireframeColor, ReflectConstruct>();

app.register_type::<bevy::picking::mesh_picking::ray_cast::RayCastBackfaces>();
app.register_type_data::<bevy::picking::mesh_picking::ray_cast::RayCastBackfaces, ReflectConstruct>();
app.register_type::<bevy::picking::mesh_picking::MeshPickingCamera>();
app.register_type_data::<bevy::picking::mesh_picking::MeshPickingCamera, ReflectConstruct>();
app.register_type_data::<bevy::picking::Pickable, ReflectConstruct>();
app.register_type_data::<bevy::picking::pointer::PointerInteraction, ReflectConstruct>();
Expand All @@ -183,7 +166,6 @@ pub(crate) fn register_reflect_construct(app: &mut App) {
app.register_type_data::<bevy::render::experimental::occlusion_culling::OcclusionCulling, ReflectConstruct>();
app.register_type_data::<bevy::render::mesh::Mesh2d, ReflectConstruct>();
app.register_type_data::<bevy::render::mesh::Mesh3d, ReflectConstruct>();
app.register_type::<bevy::render::mesh::MeshTag>();
app.register_type_data::<bevy::render::mesh::MeshTag, ReflectConstruct>();
app.register_type_data::<bevy::render::mesh::morph::MeshMorphWeights, ReflectConstruct>();
app.register_type_data::<bevy::render::mesh::morph::MorphWeights, ReflectConstruct>();
Expand All @@ -193,14 +175,12 @@ pub(crate) fn register_reflect_construct(app: &mut App) {
app.register_type_data::<bevy::render::primitives::CubemapFrusta, ReflectConstruct>();
app.register_type_data::<bevy::render::primitives::Frustum, ReflectConstruct>();
app.register_type_data::<bevy::render::sync_world::SyncToRenderWorld, ReflectConstruct>();
app.register_type::<bevy::render::sync_world::TemporaryRenderEntity>();
app.register_type_data::<bevy::render::sync_world::TemporaryRenderEntity, ReflectConstruct>();
app.register_type_data::<bevy::render::view::ColorGrading, ReflectConstruct>();
app.register_type_data::<bevy::render::view::visibility::Visibility, ReflectConstruct>();
app.register_type_data::<bevy::render::view::visibility::InheritedVisibility, ReflectConstruct>();
app.register_type_data::<bevy::render::view::visibility::VisibilityRange, ReflectConstruct>();
app.register_type_data::<bevy::render::view::visibility::RenderLayers, ReflectConstruct>();
app.register_type::<bevy::render::view::visibility::RenderVisibleEntities>();
app.register_type_data::<bevy::render::view::visibility::RenderVisibleEntities, ReflectConstruct>();
app.register_type_data::<bevy::render::view::visibility::ViewVisibility, ReflectConstruct>();
app.register_type_data::<bevy::render::view::visibility::VisibilityClass, ReflectConstruct>();
Expand All @@ -210,11 +190,8 @@ pub(crate) fn register_reflect_construct(app: &mut App) {
app.register_type_data::<bevy::scene::SceneRoot, ReflectConstruct>();

//app.register_type_data::<bevy::sprite::MeshMaterial2d, ReflectConstruct>();
app.register_type::<bevy::sprite::NoWireframe2d>();
app.register_type_data::<bevy::sprite::NoWireframe2d, ReflectConstruct>();
app.register_type::<bevy::sprite::Wireframe2d>();
app.register_type_data::<bevy::sprite::Wireframe2d, ReflectConstruct>();
app.register_type::<bevy::sprite::Wireframe2dColor>();
app.register_type_data::<bevy::sprite::Wireframe2dColor, ReflectConstruct>();
app.register_type_data::<bevy::sprite::SpritePickingCamera, ReflectConstruct>();
app.register_type_data::<bevy::sprite::Sprite, ReflectConstruct>();
Expand Down Expand Up @@ -243,18 +220,13 @@ pub(crate) fn register_reflect_construct(app: &mut App) {
app.register_type_data::<bevy::ui_render::BoxShadowSamples, ReflectConstruct>();
app.register_type_data::<bevy::ui::CalculatedClip, ReflectConstruct>();
app.register_type_data::<bevy::ui::ComputedNode, ReflectConstruct>();
app.register_type::<bevy::ui::ComputedNodeTarget>();
app.register_type_data::<bevy::ui::ComputedNodeTarget, ReflectConstruct>();
app.register_type::<bevy::ui::GlobalZIndex>();
app.register_type_data::<bevy::ui::GlobalZIndex, ReflectConstruct>();
app.register_type::<bevy::ui::LayoutConfig>();
app.register_type_data::<bevy::ui::LayoutConfig, ReflectConstruct>();
app.register_type_data::<bevy::ui::Node, ReflectConstruct>();
app.register_type_data::<bevy::ui::Outline, ReflectConstruct>();
app.register_type_data::<bevy::ui::ScrollPosition, ReflectConstruct>();
app.register_type_data::<bevy::ui::widget::TextShadow, ReflectConstruct>();
app.register_type::<bevy::ui::UiTransform>();
app.register_type::<bevy::ui::UiGlobalTransform>();
app.register_type_data::<bevy::ui::ZIndex, ReflectConstruct>();
app.register_type_data::<bevy::ui::widget::Button, ReflectConstruct>();
app.register_type_data::<bevy::ui::widget::ImageNode, ReflectConstruct>();
Expand Down
1 change: 0 additions & 1 deletion crates/bevy_proto_bsn/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ pub struct BsnPlugin;
impl Plugin for BsnPlugin {
fn build(&self, app: &mut App) {
register_reflect_construct(app);
register_construct_impls(app);
bsn_asset_plugin(app);
bsn_reflect_plugin(app);
prefab_plugin(app);
Expand Down