remove state generic from a lot of things

This commit is contained in:
iris committed 2025-12-17 21:37:55 -05:00
1 parent 7e6369029f
commit 30bc55c78e
45 files changed
+740 -856

No files matched your search

+3 -4
View File
@@ -142,11 +142,10 @@ pub trait SensorUi<State> {
fn run_sensors(&mut self, cursor: &CursorState, window_size: Vec2);
}
impl<State: 'static + HasUi> SensorUi<State> for State {
impl<State: 'static + HasRsc> SensorUi<State> for State {
fn run_sensors(&mut self, cursor: &CursorState, window_size: Vec2) {
let layers = std::mem::take(&mut self.ui().layers);
let mut active =
std::mem::take(&mut self.ui().events.get_type::<CursorSense>().active);
let mut active = std::mem::take(&mut self.events().get_type::<CursorSense>().active);
for layer in layers.indices().rev() {
let mut sensed = false;
for (id, sensor) in active.get_mut(&layer).into_iter().flatten() {
@@ -175,7 +174,7 @@ impl<State: 'static + HasUi> SensorUi<State> for State {
break;
}
}
self.ui().events.get_type::<CursorSense>().active = active;
self.events().get_type::<CursorSense>().active = active;
self.ui().layers = layers;
}
}