Skip to content

Commit df992cc

Browse files
committed
Remove ModifiesWindows
1 parent 0ba7104 commit df992cc

File tree

6 files changed

+3
-15
lines changed

6 files changed

+3
-15
lines changed

crates/bevy_pbr/src/lib.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ mod render;
1111

1212
pub use alpha::*;
1313
use bevy_transform::TransformSystem;
14-
use bevy_window::ModifiesWindows;
1514
pub use bundle::*;
1615
pub use fog::*;
1716
pub use light::*;
@@ -199,8 +198,7 @@ impl Plugin for PbrPlugin {
199198
.in_set(SimulationLightSystems::AssignLightsToClusters)
200199
.after(TransformSystem::TransformPropagate)
201200
.after(VisibilitySystems::CheckVisibility)
202-
.after(CameraUpdateSystem)
203-
.after(ModifiesWindows),
201+
.after(CameraUpdateSystem),
204202
)
205203
.add_system(
206204
update_directional_light_cascades

crates/bevy_render/src/camera/projection.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ use bevy_reflect::{
77
std_traits::ReflectDefault, FromReflect, GetTypeRegistration, Reflect, ReflectDeserialize,
88
ReflectSerialize,
99
};
10-
use bevy_window::ModifiesWindows;
1110
use serde::{Deserialize, Serialize};
1211

1312
/// Adds [`Camera`](crate::camera::Camera) driver systems for a given projection type.
@@ -43,7 +42,6 @@ impl<T: CameraProjection + Component + GetTypeRegistration> Plugin for CameraPro
4342
.add_system(
4443
crate::camera::camera_system::<T>
4544
.in_set(CameraUpdateSystem)
46-
.after(ModifiesWindows)
4745
// We assume that each camera will only have one projection,
4846
// so we can ignore ambiguities with all other monomorphizations.
4947
// FIXME: Add an archetype invariant for this https://github.com/bevyengine/bevy/issues/1481.

crates/bevy_text/src/lib.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ use bevy_asset::AddAsset;
2828
use bevy_ecs::prelude::*;
2929
use bevy_render::{camera::CameraUpdateSystem, ExtractSchedule, RenderApp};
3030
use bevy_sprite::SpriteSystem;
31-
use bevy_window::ModifiesWindows;
3231
use std::num::NonZeroUsize;
3332

3433
#[derive(Default)]
@@ -83,7 +82,6 @@ impl Plugin for TextPlugin {
8382
.add_system(
8483
update_text2d_layout
8584
.in_base_set(CoreSet::PostUpdate)
86-
.after(ModifiesWindows)
8785
// Potential conflict: `Assets<Image>`
8886
// In practice, they run independently since `bevy_render::camera_update_system`
8987
// will only ever observe its own render target, and `update_text2d_layout`

crates/bevy_ui/src/lib.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ use bevy_app::prelude::*;
3434
use bevy_ecs::prelude::*;
3535
use bevy_input::InputSystem;
3636
use bevy_transform::TransformSystem;
37-
use bevy_window::ModifiesWindows;
3837
use stack::ui_stack_system;
3938
pub use stack::UiStack;
4039
use update::update_clipping_system;
@@ -110,7 +109,6 @@ impl Plugin for UiPlugin {
110109
widget::text_system
111110
.in_base_set(CoreSet::PostUpdate)
112111
.before(UiSystem::Flex)
113-
.after(ModifiesWindows)
114112
// Potential conflict: `Assets<Image>`
115113
// In practice, they run independently since `bevy_render::camera_update_system`
116114
// will only ever observe its own render target, and `widget::text_system`
@@ -135,8 +133,7 @@ impl Plugin for UiPlugin {
135133
.add_system(
136134
flex_node_system
137135
.in_set(UiSystem::Flex)
138-
.before(TransformSystem::TransformPropagate)
139-
.after(ModifiesWindows),
136+
.before(TransformSystem::TransformPropagate),
140137
)
141138
.add_system(ui_stack_system.in_set(UiSystem::Stack))
142139
.add_system(

crates/bevy_window/src/lib.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -137,9 +137,6 @@ impl Plugin for WindowPlugin {
137137
}
138138
}
139139

140-
#[derive(Debug, Hash, PartialEq, Eq, Clone, SystemSet)]
141-
pub struct ModifiesWindows;
142-
143140
/// Defines the specific conditions the application should exit on
144141
#[derive(Clone)]
145142
pub enum ExitCondition {

crates/bevy_winit/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ use bevy_utils::{
2626
};
2727
use bevy_window::{
2828
exit_on_all_closed, CursorEntered, CursorLeft, CursorMoved, FileDragAndDrop, Ime,
29-
ModifiesWindows, ReceivedCharacter, RequestRedraw, Window, WindowBackendScaleFactorChanged,
29+
ReceivedCharacter, RequestRedraw, Window, WindowBackendScaleFactorChanged,
3030
WindowCloseRequested, WindowCreated, WindowFocused, WindowMoved, WindowResized,
3131
WindowScaleFactorChanged,
3232
};

0 commit comments

Comments
 (0)