mirror of
https://github.com/bevyengine/bevy
synced 2024-12-21 02:23:08 +00:00
efda7f3f9c
Takes the first two commits from #15375 and adds suggestions from this comment: https://github.com/bevyengine/bevy/pull/15375#issuecomment-2366968300 See #15375 for more reasoning/motivation. ## Rebasing (rerunning) ```rust git switch simpler-lint-fixes git reset --hard main cargo fmt --all -- --unstable-features --config normalize_comments=true,imports_granularity=Crate cargo fmt --all git add --update git commit --message "rustfmt" cargo clippy --workspace --all-targets --all-features --fix cargo fmt --all -- --unstable-features --config normalize_comments=true,imports_granularity=Crate cargo fmt --all git add --update git commit --message "clippy" git cherry-pick e6c0b94f6795222310fb812fa5c4512661fc7887 ```
34 lines
1.2 KiB
Rust
34 lines
1.2 KiB
Rust
use winit::monitor::MonitorHandle;
|
|
|
|
use bevy_ecs::{entity::Entity, system::Resource};
|
|
|
|
/// Stores [`winit`] monitors and their corresponding entities
|
|
///
|
|
/// # Known Issues
|
|
///
|
|
/// On some platforms, physically disconnecting a monitor might result in a
|
|
/// panic in [`winit`]'s loop. This will lead to a crash in the bevy app. See
|
|
/// [13669] for investigations and discussions.
|
|
///
|
|
/// [13669]: https://github.com/bevyengine/bevy/pull/13669
|
|
#[derive(Resource, Debug, Default)]
|
|
pub struct WinitMonitors {
|
|
/// Stores [`winit`] monitors and their corresponding entities
|
|
// We can't use a `BtreeMap` here because clippy complains about using `MonitorHandle` as a key
|
|
// on some platforms. Using a `Vec` is fine because we don't expect to have a large number of
|
|
// monitors and avoids having to audit the code for `MonitorHandle` equality.
|
|
pub(crate) monitors: Vec<(MonitorHandle, Entity)>,
|
|
}
|
|
|
|
impl WinitMonitors {
|
|
pub fn nth(&self, n: usize) -> Option<MonitorHandle> {
|
|
self.monitors.get(n).map(|(monitor, _)| monitor.clone())
|
|
}
|
|
|
|
pub fn find_entity(&self, entity: Entity) -> Option<MonitorHandle> {
|
|
self.monitors
|
|
.iter()
|
|
.find(|(_, e)| *e == entity)
|
|
.map(|(monitor, _)| monitor.clone())
|
|
}
|
|
}
|