rechka/fish-station
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix scopes in separated interface (#2278)

Browse source 
Co-authored-by: Alkheemist <alkheemist@gmail.com>
This commit is contained in:
Vigers Ray 2025-06-04 14:56:26 +03:00 • committed by GitHub
parent de8983c708
commit ef91eb0444
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
Content.Client/Movement/Systems/EyeCursorOffsetSystem.cs
View file

@ -5,6 +5,7 @@ using Robust.Client.Graphics;
using Robust.Client.Input;
using Robust.Shared.Map;
using Robust.Client.Player;
using Robust.Client.UserInterface;
namespace Content.Client.Movement.Systems;
@ -13,12 +14,11 @@ public sealed partial class EyeCursorOffsetSystem : EntitySystem
[Dependency] private readonly IEyeManager _eyeManager = default!;
[Dependency] private readonly IInputManager _inputManager = default!;
[Dependency] private readonly IPlayerManager _player = default!;
[Dependency] private readonly SharedTransformSystem _transform = default!;
[Dependency] private readonly IClyde _clyde = default!;
// This value is here to make sure the user doesn't have to move their mouse
// all the way out to the edge of the screen to get the full offset.
static private float _edgeOffset = 0.9f;
private readonly float _edgeOffset = 0.9f;
public override void Initialize()
{
@ -40,7 +40,8 @@ public sealed partial class EyeCursorOffsetSystem : EntitySystem
{
var localPlayer = _player.LocalEntity;
var mousePos = _inputManager.MouseScreenPosition;
var screenSize = _clyde.MainWindow.Size;
var screenControl = _eyeManager.MainViewport as Control;
var screenSize = screenControl?.PixelSize ?? _clyde.MainWindow.Size;
var minValue = MathF.Min(screenSize.X / 2, screenSize.Y / 2) * _edgeOffset;
var mouseNormalizedPos = new Vector2(-(mousePos.X - screenSize.X / 2) / minValue, (mousePos.Y - screenSize.Y / 2) / minValue); // X needs to be inverted here for some reason, otherwise it ends up flipped.
@ -48,8 +49,6 @@ public sealed partial class EyeCursorOffsetSystem : EntitySystem
if (localPlayer == null)
return null;
var playerPos = _transform.GetWorldPosition(localPlayer.Value);
if (component == null)
{
component = EnsureComp<EyeCursorOffsetComponent>(uid);
@ -74,7 +73,7 @@ public sealed partial class EyeCursorOffsetSystem : EntitySystem
//Makes the view not jump immediately when moving the cursor fast.
if (component.CurrentPosition != component.TargetPosition)
{
Vector2 vectorOffset = component.TargetPosition - component.CurrentPosition;
var vectorOffset = component.TargetPosition - component.CurrentPosition;
if (vectorOffset.Length() > component.OffsetSpeed)
{
vectorOffset = vectorOffset.Normalized() * component.OffsetSpeed;