tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove IClientSingularityInstance, move visual effects to SingularityDistortionComponent (#4194)

Browse Source 
* Remove IClientSingularityInstance

* In and out 5 minute refactor

* Component states for singularity distortion

* Fix distortion states

* Address reviews
This commit is contained in:
DrSmugleaf
2021-06-24 04:48:11 +02:00
committed by GitHub
parent 34e457b854
commit 716bee0746
16 changed files with 244 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
Content.Client/Singularity/Components/ClientSingularityComponent.cs
View File

@@ -1,75 +1,11 @@
using Content.Shared.Singularity.Components;
using Content.Shared.Singularity.Components;
using Robust.Shared.GameObjects;
using Robust.Shared.ViewVariables;
namespace Content.Client.Singularity.Components
{
[RegisterComponent]
[ComponentReference(typeof(IClientSingularityInstance))]
class ClientSingularityComponent : SharedSingularityComponent, IClientSingularityInstance
[ComponentReference(typeof(SharedSingularityComponent))]
public class ClientSingularityComponent : SharedSingularityComponent
{
[ViewVariables]
public int Level { get; set; }
//I am lazy
[ViewVariables]
public float Intensity
{
get
{
switch (Level)
{
case 0:
return 0.0f;
case 1:
return 2.7f;
case 2:
return 14.4f;
case 3:
return 47.2f;
case 4:
return 180.0f;
case 5:
return 600.0f;
case 6:
return 800.0f;
}
return -1.0f;
}
}
[ViewVariables]
public float Falloff
{
get
{
switch (Level)
{
case 0:
return 9999f;
case 1:
return 6.4f;
case 2:
return 7.0f;
case 3:
return 8.0f;
case 4:
return 10.0f;
case 5:
return 12.0f;
case 6:
return 12.0f;
}
return -1.0f;
}
}
public override void HandleComponentState(ComponentState? curState, ComponentState? nextState)
{
if (curState is not SingularityComponentState state)
{
return;
}
Level = state.Level;
}
}
}

4
Content.Client/Singularity/Components/ContainmentFieldComponent.cs
View File

@@ -6,7 +6,7 @@ namespace Content.Client.Singularity.Components
{
public class ContainmentFieldComponent : Component
{
public override string Name => "Containment Field";
public override string Name => "ContainmentField";
private SpriteComponent? _spriteComponent;
@@ -16,7 +16,7 @@ namespace Content.Client.Singularity.Components
if (!Owner.TryGetComponent(out _spriteComponent))
{
Logger.Error("Containmentfieldcomponent created without spritecomponent");
Logger.Error($"{nameof(ContainmentFieldComponent)} created without {nameof(SpriteComponent)}");
}
else
{

12
Content.Client/Singularity/Components/ISingularity.cs
View File

@@ -1,12 +0,0 @@
namespace Content.Client.Singularity.Components
{
interface IClientSingularityInstance
{
public float Intensity { get; }
public float Falloff { get; }
}
}

17
Content.Client/Singularity/Components/ToySingularityComponent.cs
View File

@@ -1,17 +0,0 @@
using Robust.Shared.GameObjects;
using Robust.Shared.ViewVariables;
namespace Content.Client.Singularity.Components
{
[RegisterComponent]
[ComponentReference(typeof(IClientSingularityInstance))]
public class ToySingularityComponent : Component, IClientSingularityInstance
{
public override string Name => "ToySingularity";
[ViewVariables(VVAccess.ReadWrite)]
public float Falloff { get; set; } = 2.0f;
[ViewVariables(VVAccess.ReadWrite)]
public float Intensity { get; set; } = 0.25f;
}
}

42
Content.Client/Singularity/SingularityOverlay.cs
View File

@@ -1,7 +1,7 @@
#nullable enable
using System.Collections.Generic;
using System.Linq;
using Content.Client.Singularity.Components;
using Content.Shared.Singularity.Components;
using Robust.Client.Graphics;
using Robust.Shared.Enums;
using Robust.Shared.GameObjects;
@@ -17,14 +17,14 @@ namespace Content.Client.Singularity
[Dependency] private readonly IComponentManager _componentManager = default!;
[Dependency] private readonly IEntityManager _entityManager = default!;
[Dependency] private readonly IPrototypeManager _prototypeManager = default!;
[Dependency] private readonly IClyde _displayManager = default!;
private const float MaxDist = 15.0f;
public override OverlaySpace Space => OverlaySpace.WorldSpace;
public override bool RequestScreenTexture => true;
private readonly ShaderInstance _shader;
Dictionary<EntityUid, SingularityShaderInstance> _singularities = new Dictionary<EntityUid, SingularityShaderInstance>();
private readonly Dictionary<EntityUid, SingularityShaderInstance> _singularities = new();
public SingularityOverlay()
{
@@ -34,7 +34,7 @@ namespace Content.Client.Singularity
public override bool OverwriteTargetFrameBuffer()
{
return _singularities.Count() > 0;
return _singularities.Count > 0;
}
protected override void Draw(in OverlayDrawArgs args)
@@ -63,10 +63,7 @@ namespace Content.Client.Singularity
}
//Queries all singulos on the map and either adds or removes them from the list of rendered singulos based on whether they should be drawn (in range? on the same z-level/map? singulo entity still exists?)
private float _maxDist = 15.0f;
private void SingularityQuery(IEye? currentEye)
{
if (currentEye == null)
@@ -74,24 +71,24 @@ namespace Content.Client.Singularity
_singularities.Clear();
return;
}
var currentEyeLoc = currentEye.Position;
var currentMap = currentEye.Position.MapId;
var singuloComponents = _componentManager.EntityQuery<IClientSingularityInstance>();
foreach (var singuloInterface in singuloComponents) //Add all singulos that are not added yet but qualify
var currentEyeLoc = currentEye.Position;
var distortions = _componentManager.EntityQuery<SingularityDistortionComponent>();
foreach (var distortion in distortions) //Add all singulos that are not added yet but qualify
{
var singuloComponent = (Component)singuloInterface;
var singuloEntity = singuloComponent.Owner;
var singuloEntity = distortion.Owner;
if (!_singularities.Keys.Contains(singuloEntity.Uid) && SinguloQualifies(singuloEntity, currentEyeLoc))
{
_singularities.Add(singuloEntity.Uid, new SingularityShaderInstance(singuloEntity.Transform.MapPosition.Position, singuloInterface.Intensity, singuloInterface.Falloff));
_singularities.Add(singuloEntity.Uid, new SingularityShaderInstance(singuloEntity.Transform.MapPosition.Position, distortion.Intensity, distortion.Falloff));
}
}
var activeShaderUids = _singularities.Keys;
foreach (var activeSinguloUid in activeShaderUids) //Remove all singulos that are added and no longer qualify
var activeShaderIds = _singularities.Keys;
foreach (var activeSinguloUid in activeShaderIds) //Remove all singulos that are added and no longer qualify
{
if (_entityManager.TryGetEntity(activeSinguloUid, out IEntity? singuloEntity))
if (_entityManager.TryGetEntity(activeSinguloUid, out var singuloEntity))
{
if (!SinguloQualifies(singuloEntity, currentEyeLoc))
{
@@ -99,7 +96,7 @@ namespace Content.Client.Singularity
}
else
{
if (!singuloEntity.TryGetComponent<IClientSingularityInstance>(out var singuloInterface))
if (!singuloEntity.TryGetComponent<SingularityDistortionComponent>(out var distortion))
{
_singularities.Remove(activeSinguloUid);
}
@@ -107,8 +104,8 @@ namespace Content.Client.Singularity
{
var shaderInstance = _singularities[activeSinguloUid];
shaderInstance.CurrentMapCoords = singuloEntity.Transform.MapPosition.Position;
shaderInstance.Intensity = singuloInterface.Intensity;
shaderInstance.Falloff = singuloInterface.Falloff;
shaderInstance.Intensity = distortion.Intensity;
shaderInstance.Falloff = distortion.Falloff;
}
}
@@ -123,7 +120,7 @@ namespace Content.Client.Singularity
private bool SinguloQualifies(IEntity singuloEntity, MapCoordinates currentEyeLoc)
{
return singuloEntity.Transform.MapID == currentEyeLoc.MapId && singuloEntity.Transform.Coordinates.InRange(_entityManager, EntityCoordinates.FromMap(_entityManager, singuloEntity.Transform.ParentUid, currentEyeLoc), _maxDist);
return singuloEntity.Transform.MapID == currentEyeLoc.MapId && singuloEntity.Transform.Coordinates.InRange(_entityManager, EntityCoordinates.FromMap(_entityManager, singuloEntity.Transform.ParentUid, currentEyeLoc), MaxDist);
}
private sealed class SingularityShaderInstance
@@ -131,6 +128,7 @@ namespace Content.Client.Singularity
public Vector2 CurrentMapCoords;
public float Intensity;
public float Falloff;
public SingularityShaderInstance(Vector2 mapCoords, float intensity, float falloff)
{
CurrentMapCoords = mapCoords;

8
Content.Client/Singularity/SingularitySystem.cs Normal file
View File

@@ -0,0 +1,8 @@
using Content.Shared.Singularity;
namespace Content.Client.Singularity
{
public class SingularitySystem : SharedSingularitySystem
{
}
}