src/map.rs

@@ -242,7 +242,6 @@ fn spawn_colliders<D: 'static + Clone + Default + Send + Sync>(
                                 .spawn()
                                 .insert(Collider::cuboid(0.5, 0.5))
                                 .insert(Transform::from_xyz(x as f32 + 0.5, y as f32 + 0.5, 0.))
-                                .insert(GlobalTransform::default())
                                 .insert(MapObstruction)
                                 .id();
                             if tile.blocks_visibility() {
@@ -327,7 +326,6 @@ fn spawn_colliders<D: 'static + Clone + Default + Send + Sync>(
                                 .spawn()
                                 .insert(Collider::cuboid(half_width, half_height))
                                 .insert(Transform::from_xyz(center.x(), center.y(), 0.))
-                                .insert(GlobalTransform::default())
                                 .insert(MapObstruction)
                                 .id();
                             if map.at(x as usize, y as usize).blocks_visibility() {
@@ -430,7 +428,6 @@ fn spawn_portal_colliders<D: 'static + Clone + Default + Send + Sync>(
                 commands
                     .entity(portal_entity)
                     .insert(Transform::from_xyz(position.x(), position.y(), 0.))
-                    .insert(GlobalTransform::default())
                     .insert(Collider::cuboid(0.5, 0.5))
                     .insert(Sensor(true))
                     .insert(ActiveEvents::COLLISION_EVENTS);

src/sound/icon.rs

@@ -9,7 +9,7 @@ use crate::{
     commands::RunIfExistsExt,
     core::Player,
     exploration::ExplorationFocused,
-    visibility::{VisibilityChanged, Visible, VisibleEntities},
+    visibility::{Visible, VisibleEntities},
 };
 
 #[derive(Component, Clone, Debug)]
@@ -242,38 +242,6 @@ fn exploration_focus_removed(
     }
 }
 
-fn reset_timer_on_visibility_gain(
-    mut events: EventReader<VisibilityChanged>,
-    player: Query<Entity, With<Player>>,
-    mut icons: Query<&mut SoundIcon>,
-    children: Query<&Children>,
-) {
-    for event in events.iter() {
-        if let VisibilityChanged::Gained { viewer, viewed } = event {
-            if player.get(*viewer).is_ok() {
-                let mut targets = vec![];
-                if icons.get(*viewed).is_ok() {
-                    targets.push(viewed);
-                }
-                if let Ok(children) = children.get(*viewed) {
-                    for child in children.iter() {
-                        if icons.get(*child).is_ok() {
-                            targets.push(&*child);
-                        }
-                    }
-                }
-                for icon in targets.iter_mut() {
-                    if let Ok(mut icon) = icons.get_mut(**icon) {
-                        if let Some(timer) = icon.interval.as_mut() {
-                            timer.set_elapsed(timer.duration());
-                        }
-                    }
-                }
-            }
-        }
-    }
-}
-
 #[derive(Clone, Debug, Default)]
 pub struct SoundIconConfig<S> {
     pub states: Vec<S>,
@@ -305,7 +273,6 @@ where
             .add_system_to_stage(
                 CoreStage::PostUpdate,
                 exploration_focus_removed.after(exploration_focus_changed),
-            )
-            .add_system_to_stage(CoreStage::PostUpdate, reset_timer_on_visibility_gain);
+            );
     }
 }