Remove SharedEye (but content) (#19481)

space-sunrise · Sep 11, 2023 · 28bf3a6 · 28bf3a6
1 parent c477e5b
commit 28bf3a6
Show file tree

Hide file tree

Showing 29 changed files with 86 additions and 75 deletions.
diff --git a/Content.Client/Clickable/ClickableComponent.cs b/Content.Client/Clickable/ClickableComponent.cs
@@ -2,6 +2,7 @@
 using Robust.Client.GameObjects;
 using Robust.Client.Graphics;
 using Robust.Client.Utility;
+using Robust.Shared.Graphics;
 using static Robust.Client.GameObjects.SpriteComponent;
 
 namespace Content.Client.Clickable

diff --git a/Content.Client/DragDrop/DragDropSystem.cs b/Content.Client/DragDrop/DragDropSystem.cs
@@ -112,7 +112,7 @@ public override void Initialize()
         base.Initialize();
         _sawmill = Logger.GetSawmill("drag_drop");
         UpdatesOutsidePrediction = true;
-        UpdatesAfter.Add(typeof(EyeUpdateSystem));
+        UpdatesAfter.Add(typeof(SharedEyeSystem));
 
         _cfgMan.OnValueChanged(CCVars.DragDropDeadZone, SetDeadZone, true);
 

diff --git a/Content.Client/Drugs/RainbowOverlay.cs b/Content.Client/Drugs/RainbowOverlay.cs
@@ -1,6 +1,5 @@
 using Content.Shared.Drugs;
 using Content.Shared.StatusEffect;
-using Robust.Client.GameObjects;
 using Robust.Client.Graphics;
 using Robust.Client.Player;
 using Robust.Shared.Enums;

diff --git a/Content.Client/Drunk/DrunkOverlay.cs b/Content.Client/Drunk/DrunkOverlay.cs
@@ -1,6 +1,5 @@
 using Content.Shared.Drunk;
 using Content.Shared.StatusEffect;
-using Robust.Client.GameObjects;
 using Robust.Client.Graphics;
 using Robust.Client.Player;
 using Robust.Shared.Enums;

diff --git a/Content.Client/Eye/Blinding/BlindOverlay.cs b/Content.Client/Eye/Blinding/BlindOverlay.cs
@@ -1,4 +1,3 @@
-using Robust.Client.GameObjects;
 using Robust.Client.Graphics;
 using Robust.Client.Player;
 using Robust.Shared.Enums;

diff --git a/Content.Client/Eye/Blinding/BlurryVisionOverlay.cs b/Content.Client/Eye/Blinding/BlurryVisionOverlay.cs
@@ -1,4 +1,3 @@
-using Robust.Client.GameObjects;
 using Robust.Client.Graphics;
 using Robust.Client.Player;
 using Robust.Shared.Enums;

diff --git a/Content.Client/Eye/EyeLerpingSystem.cs b/Content.Client/Eye/EyeLerpingSystem.cs
@@ -13,6 +13,7 @@ public sealed class EyeLerpingSystem : EntitySystem
 {
     [Dependency] private readonly IPlayerManager _playerManager = default!;
     [Dependency] private readonly IGameTiming _gameTiming = default!;
+    [Dependency] private readonly SharedEyeSystem _eye = default!;
     [Dependency] private readonly SharedMoverController _mover = default!;
     [Dependency] private readonly SharedTransformSystem _transform = default!;
 
@@ -26,14 +27,14 @@ public override void Initialize()
 
         SubscribeLocalEvent<EyeComponent, ComponentStartup>(OnEyeStartup);
         SubscribeLocalEvent<EyeComponent, ComponentShutdown>(OnEyeShutdown);
-        SubscribeLocalEvent<EyeComponent, PlayerAttachedEvent>(OnAttached);
+        SubscribeLocalEvent<EyeAttachedEvent>(OnAttached);
 
         SubscribeLocalEvent<LerpingEyeComponent, EntParentChangedMessage>(HandleMapChange);
         SubscribeLocalEvent<LerpingEyeComponent, PlayerDetachedEvent>(OnDetached);
 
         UpdatesAfter.Add(typeof(TransformSystem));
         UpdatesAfter.Add(typeof(PhysicsSystem));
-        UpdatesBefore.Add(typeof(EyeUpdateSystem));
+        UpdatesBefore.Add(typeof(SharedEyeSystem));
         UpdatesOutsidePrediction = true;
     }
 
@@ -64,8 +65,8 @@ public void AddEye(EntityUid uid, EyeComponent? component = null, bool automatic
 
         if (component.Eye != null)
         {
-            component.Eye.Rotation = lerpInfo.TargetRotation;
-            component.Eye.Zoom = lerpInfo.TargetZoom;
+            _eye.SetRotation(uid, lerpInfo.TargetRotation, component);
+            _eye.SetZoom(uid, lerpInfo.TargetZoom, component);
         }
     }
 
@@ -88,9 +89,9 @@ private void HandleMapChange(EntityUid uid, LerpingEyeComponent component, ref E
             component.LastRotation = GetRotation(uid, args.Transform);
     }
 
-    private void OnAttached(EntityUid uid, EyeComponent component, PlayerAttachedEvent args)
+    private void OnAttached(ref EyeAttachedEvent ev)
     {
-        AddEye(uid, component, true);
+        AddEye(ev.Entity, ev.Component, true);
     }
 
     private void OnDetached(EntityUid uid, LerpingEyeComponent component, PlayerDetachedEvent args)
@@ -182,11 +183,11 @@ public override void FrameUpdate(float frameTime)
 
             if ((zoomDiff - lerpInfo.TargetZoom).Length() < lerpMinimum)
             {
-                eye.Zoom = lerpInfo.TargetZoom;
+                _eye.SetZoom(entity, lerpInfo.TargetZoom, eye);
             }
             else
             {
-                eye.Zoom = zoomDiff;
+                _eye.SetZoom(entity, zoomDiff, eye);
             }
 
             // Handle Rotation
@@ -197,19 +198,19 @@ public override void FrameUpdate(float frameTime)
 
             if (!NeedsLerp(mover))
             {
-                eye.Rotation = lerpInfo.TargetRotation;
+                _eye.SetRotation(entity, lerpInfo.TargetRotation, eye);
                 continue;
             }
 
             var shortest = Angle.ShortestDistance(lerpInfo.LastRotation, lerpInfo.TargetRotation);
 
             if (Math.Abs(shortest.Theta) < lerpMinimum)
             {
-                eye.Rotation = lerpInfo.TargetRotation;
+                _eye.SetRotation(entity, lerpInfo.TargetRotation, eye);
                 continue;
             }
 
-            eye.Rotation = shortest * tickFraction + lerpInfo.LastRotation;
+            _eye.SetRotation(entity, shortest * tickFraction + lerpInfo.LastRotation, eye);
         }
     }
 }
diff --git a/Content.Client/Flash/FlashOverlay.cs b/Content.Client/Flash/FlashOverlay.cs
@@ -1,6 +1,5 @@
 using System.Numerics;
 using Content.Client.Viewport;
-using Robust.Client.GameObjects;
 using Robust.Client.Graphics;
 using Robust.Client.State;
 using Robust.Client.Player;

diff --git a/Content.Client/Movement/Systems/ContentEyeSystem.cs b/Content.Client/Movement/Systems/ContentEyeSystem.cs
@@ -1,7 +1,6 @@
 using System.Numerics;
 using Content.Shared.Movement.Components;
 using Content.Shared.Movement.Systems;
-using Robust.Client.GameObjects;
 using Robust.Client.Player;
 
 namespace Content.Client.Movement.Systems;

diff --git a/Content.Client/Outline/InteractionOutlineSystem.cs b/Content.Client/Outline/InteractionOutlineSystem.cs
@@ -4,7 +4,6 @@
 using Content.Client.Viewport;
 using Content.Shared.CCVar;
 using Content.Shared.Interaction;
-using Robust.Client.GameObjects;
 using Robust.Client.Graphics;
 using Robust.Client.Input;
 using Robust.Client.Player;
@@ -42,7 +41,7 @@ public override void Initialize()
         base.Initialize();
 
         _configManager.OnValueChanged(CCVars.OutlineEnabled, SetCvarEnabled);
-        UpdatesAfter.Add(typeof(EyeUpdateSystem));
+        UpdatesAfter.Add(typeof(SharedEyeSystem));
     }
 
     public override void Shutdown()

diff --git a/Content.Client/Radiation/Overlays/RadiationPulseOverlay.cs b/Content.Client/Radiation/Overlays/RadiationPulseOverlay.cs
@@ -3,6 +3,7 @@
 using Content.Shared.Radiation.Components;
 using Robust.Client.Graphics;
 using Robust.Shared.Enums;
+using Robust.Shared.Graphics;
 using Robust.Shared.Map;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Timing;

diff --git a/Content.Client/SurveillanceCamera/UI/SurveillanceCameraMonitorWindow.xaml.cs b/Content.Client/SurveillanceCamera/UI/SurveillanceCameraMonitorWindow.xaml.cs
@@ -9,6 +9,7 @@
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Graphics;
 using Robust.Shared.Prototypes;
 
 namespace Content.Client.SurveillanceCamera.UI;

diff --git a/Content.Client/Tabletop/UI/TabletopWindow.xaml.cs b/Content.Client/Tabletop/UI/TabletopWindow.xaml.cs
@@ -3,6 +3,7 @@
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Graphics;
 using Robust.Shared.Maths;
 
 namespace Content.Client.Tabletop.UI

diff --git a/Content.Client/UserInterface/Systems/DamageOverlays/Overlays/DamageOverlay.cs b/Content.Client/UserInterface/Systems/DamageOverlays/Overlays/DamageOverlay.cs
@@ -1,5 +1,4 @@
 using Content.Shared.Mobs;
-using Robust.Client.GameObjects;
 using Robust.Client.Graphics;
 using Robust.Client.Player;
 using Robust.Shared.Enums;

diff --git a/Content.Client/UserInterface/Systems/Viewport/ViewportUIController.cs b/Content.Client/UserInterface/Systems/Viewport/ViewportUIController.cs
@@ -1,7 +1,6 @@
 using Content.Client.UserInterface.Controls;
 using Content.Client.UserInterface.Systems.Gameplay;
 using Content.Shared.CCVar;
-using Robust.Client.GameObjects;
 using Robust.Client.Graphics;
 using Robust.Client.Player;
 using Robust.Client.UserInterface.Controllers;

diff --git a/Content.Client/Vehicle/VehicleSystem.cs b/Content.Client/Vehicle/VehicleSystem.cs
@@ -7,6 +7,8 @@ namespace Content.Client.Vehicle;
 
 public sealed class VehicleSystem : SharedVehicleSystem
 {
+    [Dependency] private EyeSystem _eye = default!;
+
     public override void Initialize()
     {
         base.Initialize();
@@ -21,14 +23,18 @@ private void OnRiderStartup(EntityUid uid, RiderComponent component, ComponentSt
     {
         // Center the player's eye on the vehicle
         if (TryComp(uid, out EyeComponent? eyeComp))
-            eyeComp.Target ??= component.Vehicle;
+        {
+            _eye.SetTarget(uid, eyeComp.Target ?? component.Vehicle, eyeComp);
+        }
     }
 
     private void OnRiderShutdown(EntityUid uid, RiderComponent component, ComponentShutdown args)
     {
         // reset the riders eye centering.
         if (TryComp(uid, out EyeComponent? eyeComp) && eyeComp.Target == component.Vehicle)
-            eyeComp.Target = null;
+        {
+            _eye.SetTarget(uid, eyeComp.Target, eyeComp);
+        }
     }
 
     private void OnRiderHandleState(EntityUid uid, RiderComponent component, ref ComponentHandleState args)
@@ -39,7 +45,9 @@ private void OnRiderHandleState(EntityUid uid, RiderComponent component, ref Com
         var entity = EnsureEntity<RiderComponent>(state.Entity, uid);
 
         if (TryComp(uid, out EyeComponent? eyeComp) && eyeComp.Target == component.Vehicle)
-            eyeComp.Target = entity;
+        {
+            _eye.SetTarget(uid, entity, eyeComp);
+        }
 
         component.Vehicle = entity;
     }

diff --git a/Content.Client/Viewport/ScalingViewport.cs b/Content.Client/Viewport/ScalingViewport.cs
@@ -5,6 +5,7 @@
 using Robust.Client.Input;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.CustomControls;
+using Robust.Shared.Graphics;
 using Robust.Shared.IoC;
 using Robust.Shared.Map;
 using Robust.Shared.Maths;

diff --git a/Content.Server/Ghost/GhostSystem.cs b/Content.Server/Ghost/GhostSystem.cs
@@ -4,11 +4,11 @@
 using Content.Server.Ghost.Components;
 using Content.Server.Mind;
 using Content.Server.Roles.Jobs;
-using Content.Server.Visible;
 using Content.Server.Warps;
 using Content.Shared.Actions;
 using Content.Shared.Administration;
 using Content.Shared.Examine;
+using Content.Shared.Eye;
 using Content.Shared.Follower;
 using Content.Shared.Ghost;
 using Content.Shared.Mind;
@@ -37,6 +37,7 @@ public sealed partial class GhostSystem : SharedGhostSystem
         [Dependency] private readonly EntityLookupSystem _lookup = default!;
         [Dependency] private readonly FollowerSystem _followerSystem = default!;
         [Dependency] private readonly MobStateSystem _mobState = default!;
+        [Dependency] private readonly SharedEyeSystem _eye = default!;
         [Dependency] private readonly SharedPhysicsSystem _physics = default!;
         [Dependency] private readonly MindSystem _minds = default!;
         [Dependency] private readonly JobSystem _jobs = default!;
@@ -106,7 +107,7 @@ private void OnRelayMoveInput(EntityUid uid, GhostOnMoveComponent component, ref
         private void OnGhostStartup(EntityUid uid, GhostComponent component, ComponentStartup args)
         {
             // Allow this entity to be seen by other ghosts.
-            var visibility = EntityManager.EnsureComponent<VisibilityComponent>(component.Owner);
+            var visibility = EntityManager.EnsureComponent<VisibilityComponent>(uid);
 
             if (_ticker.RunLevel != GameRunLevel.PostRound)
             {
@@ -115,9 +116,9 @@ private void OnGhostStartup(EntityUid uid, GhostComponent component, ComponentSt
                 _visibilitySystem.RefreshVisibility(visibility);
             }
 
-            if (EntityManager.TryGetComponent(component.Owner, out EyeComponent? eye))
+            if (EntityManager.TryGetComponent(uid, out EyeComponent? eye))
             {
-                eye.VisibilityMask |= (uint) VisibilityFlags.Ghost;
+                _eye.SetVisibilityMask(uid, eye.VisibilityMask | (int) VisibilityFlags.Ghost, eye);
             }
 
             var time = _gameTiming.CurTime;
@@ -142,17 +143,17 @@ private void OnGhostShutdown(EntityUid uid, GhostComponent component, ComponentS
             if (!Terminating(uid))
             {
                 // Entity can't be seen by ghosts anymore.
-                if (EntityManager.TryGetComponent(component.Owner, out VisibilityComponent? visibility))
+                if (EntityManager.TryGetComponent(uid, out VisibilityComponent? visibility))
                 {
                     _visibilitySystem.RemoveLayer(visibility, (int) VisibilityFlags.Ghost, false);
                     _visibilitySystem.AddLayer(visibility, (int) VisibilityFlags.Normal, false);
                     _visibilitySystem.RefreshVisibility(visibility);
                 }
 
                 // Entity can't see ghosts anymore.
-                if (EntityManager.TryGetComponent(component.Owner, out EyeComponent? eye))
+                if (EntityManager.TryGetComponent(uid, out EyeComponent? eye))
                 {
-                    eye.VisibilityMask &= ~(uint) VisibilityFlags.Ghost;
+                    _eye.SetVisibilityMask(uid, eye.VisibilityMask & ~(int) VisibilityFlags.Ghost, eye);
                 }
 
                 _actions.RemoveAction(uid, component.ActionEntity);
@@ -334,9 +335,11 @@ public void Execute(IConsoleShell shell, string argStr, string[] args)
             if (uid == null
                 || !entityManager.HasComponent<GhostComponent>(uid)
                 || !entityManager.TryGetComponent<EyeComponent>(uid, out var eyeComponent))
+            {
                 return;
+            }
 
-            eyeComponent.VisibilityMask ^= (uint) VisibilityFlags.Ghost;
+            entityManager.System<EyeSystem>().SetVisibilityMask(uid.Value, eyeComponent.VisibilityMask ^ (int) VisibilityFlags.Ghost, eyeComponent);
         }
     }
 }
diff --git a/Content.Server/Pointing/EntitySystems/PointingSystem.cs b/Content.Server/Pointing/EntitySystems/PointingSystem.cs
@@ -1,9 +1,9 @@
 using System.Linq;
 using Content.Server.Administration.Logs;
 using Content.Server.Pointing.Components;
-using Content.Server.Visible;
 using Content.Shared.Bed.Sleep;
 using Content.Shared.Database;
+using Content.Shared.Eye;
 using Content.Shared.Ghost;
 using Content.Shared.IdentityManagement;
 using Content.Shared.Input;

diff --git a/Content.Server/Revenant/EntitySystems/CorporealSystem.cs b/Content.Server/Revenant/EntitySystems/CorporealSystem.cs
@@ -1,5 +1,5 @@
 using Content.Server.GameTicking;
-using Content.Server.Visible;
+using Content.Shared.Eye;
 using Content.Shared.Revenant.Components;
 using Content.Shared.Revenant.EntitySystems;
 using Robust.Server.GameObjects;

diff --git a/Content.Server/Revenant/EntitySystems/RevenantSystem.cs b/Content.Server/Revenant/EntitySystems/RevenantSystem.cs
@@ -3,11 +3,11 @@
 using Content.Server.GameTicking;
 using Content.Server.Store.Components;
 using Content.Server.Store.Systems;
-using Content.Server.Visible;
 using Content.Shared.Alert;
 using Content.Shared.Damage;
 using Content.Shared.DoAfter;
 using Content.Shared.Examine;
+using Content.Shared.Eye;
 using Content.Shared.FixedPoint;
 using Content.Shared.Interaction;
 using Content.Shared.Maps;
@@ -31,18 +31,19 @@ public sealed partial class RevenantSystem : EntitySystem
     [Dependency] private readonly ActionsSystem _action = default!;
     [Dependency] private readonly AlertsSystem _alerts = default!;
     [Dependency] private readonly DamageableSystem _damage = default!;
-    [Dependency] private readonly SharedDoAfterSystem _doAfter = default!;
     [Dependency] private readonly EntityLookupSystem _lookup = default!;
+    [Dependency] private readonly GameTicker _ticker = default!;
     [Dependency] private readonly MobStateSystem _mobState = default!;
     [Dependency] private readonly PhysicsSystem _physics = default!;
+    [Dependency] private readonly SharedDoAfterSystem _doAfter = default!;
+    [Dependency] private readonly SharedEyeSystem _eye = default!;
     [Dependency] private readonly StatusEffectsSystem _statusEffects = default!;
     [Dependency] private readonly SharedInteractionSystem _interact = default!;
     [Dependency] private readonly SharedPopupSystem _popup = default!;
     [Dependency] private readonly SharedStunSystem _stun = default!;
-    [Dependency] private readonly TagSystem _tag = default!;
     [Dependency] private readonly StoreSystem _store = default!;
+    [Dependency] private readonly TagSystem _tag = default!;
     [Dependency] private readonly VisibilitySystem _visibility = default!;
-    [Dependency] private readonly GameTicker _ticker = default!;
 
     [ValidatePrototypeId<EntityPrototype>]
     private const string RevenantShopId = "ActionRevenantShop";
@@ -83,7 +84,9 @@ private void OnStartup(EntityUid uid, RevenantComponent component, ComponentStar
 
         //ghost vision
         if (TryComp(uid, out EyeComponent? eye))
-            eye.VisibilityMask |= (uint) (VisibilityFlags.Ghost);
+        {
+            _eye.SetVisibilityMask(uid, eye.VisibilityMask | (int) (VisibilityFlags.Ghost), eye);
+        }
     }
 
     private void OnMapInit(EntityUid uid, RevenantComponent component, MapInitEvent args)