Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

nukes more resolves

Browse Source
This commit is contained in:
Paul
2021-12-08 19:39:03 +01:00
parent 4dcfebfd53
commit 0121f056df
8 changed files with 24 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Content.Client/AI/ClientPathfindingDebugSystem.cs
View File

@@ -18,6 +18,12 @@ namespace Content.Client.AI
#if DEBUG
public class ClientPathfindingDebugSystem : EntitySystem
{
[Dependency] private readonly IOverlayManager _overlayManager = default!;
[Dependency] private readonly IPrototypeManager _prototypeManager = default!;
[Dependency] private readonly IEyeManager _eyeManager = default!;
[Dependency] private readonly IPlayerManager _playerManager = default!;
private PathfindingDebugMode _modes = PathfindingDebugMode.None;
private float _routeDuration = 4.0f; // How long before we remove a route from the overlay
private DebugPathfindingOverlay? _overlay;
@@ -91,7 +97,7 @@ namespace Content.Client.AI
}
var overlayManager = IoCManager.Resolve<IOverlayManager>();
_overlay = new DebugPathfindingOverlay {Modes = _modes};
_overlay = new DebugPathfindingOverlay(EntityManager, _eyeManager, _playerManager, _prototypeManager) {Modes = _modes};
overlayManager.AddOverlay(_overlay);
return _overlay;
@@ -210,12 +216,12 @@ namespace Content.Client.AI
public readonly List<SharedAiDebug.AStarRouteMessage> AStarRoutes = new();
public readonly List<SharedAiDebug.JpsRouteMessage> JpsRoutes = new();
public DebugPathfindingOverlay()
public DebugPathfindingOverlay(IEntityManager entities, IEyeManager eyeManager, IPlayerManager playerManager, IPrototypeManager prototypeManager)
{
_shader = IoCManager.Resolve<IPrototypeManager>().Index<ShaderPrototype>("unshaded").Instance();
_eyeManager = IoCManager.Resolve<IEyeManager>();
_playerManager = IoCManager.Resolve<IPlayerManager>();
_entities = IoCManager.Resolve<IEntityManager>();
_entities = entities;
_eyeManager = eyeManager;
_playerManager = playerManager;
_shader = prototypeManager.Index<ShaderPrototype>("unshaded").Instance();
}
#region Graph

5
Content.Client/CharacterAppearance/Systems/HumanoidAppearanceSystem.cs
View File

@@ -107,13 +107,12 @@ namespace Content.Client.CharacterAppearance.Systems
// Scaffolding until Body is moved to ECS.
private void BodyPartAdded(HumanoidAppearanceBodyPartAddedEvent args)
{
var entityManager = IoCManager.Resolve<IEntityManager>();
if (!entityManager.TryGetComponent(args.Uid, out SpriteComponent? sprite))
if (!EntityManager.TryGetComponent(args.Uid, out SpriteComponent? sprite))
{
return;
}
if (!entityManager.HasComponent<SpriteComponent>(args.Args.Part.Owner))
if (!EntityManager.HasComponent<SpriteComponent>(args.Args.Part.Owner))
{
return;
}

8
Content.Client/Popups/PopupSystem.cs
View File

@@ -53,7 +53,7 @@ namespace Content.Client.Popups
public void PopupMessage(string message, ScreenCoordinates coordinates, EntityUid entity = default)
{
var label = new PopupLabel(_eyeManager)
var label = new PopupLabel(_eyeManager, EntityManager)
{
Entity = entity,
Text = message,
@@ -142,14 +142,16 @@ namespace Content.Client.Popups
private class PopupLabel : Label
{
private readonly IEyeManager _eyeManager;
private readonly IEntityManager _entityManager;
public float TimeLeft { get; private set; }
public Vector2 InitialPos { get; set; }
public EntityUid Entity { get; set; }
public PopupLabel(IEyeManager eyeManager)
public PopupLabel(IEyeManager eyeManager, IEntityManager entityManager)
{
_eyeManager = eyeManager;
_entityManager = entityManager;
ShadowOffsetXOverride = 1;
ShadowOffsetYOverride = 1;
FontColorShadowOverride = Color.Black;
@@ -161,7 +163,7 @@ namespace Content.Client.Popups
var position = Entity == default
? InitialPos
: (_eyeManager.CoordinatesToScreen(IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(Entity).Coordinates).Position / UIScale) - DesiredSize / 2;
: (_eyeManager.CoordinatesToScreen(_entityManager.GetComponent<TransformComponent>(Entity).Coordinates).Position / UIScale) - DesiredSize / 2;
LayoutContainer.SetPosition(this, position - (0, 20 * (TimeLeft * TimeLeft + TimeLeft)));