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

fixes singulo shader z-levels (#3672)

Browse Source
This commit is contained in:
GraniteSidewalk
2021-03-14 22:19:14 -05:00
committed by GitHub
parent 3929edf6a5
commit 97db03b065
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Content.Client/Graphics/Overlays/SingularityOverlay.cs
View File

@@ -62,29 +62,30 @@ namespace Content.Client.Graphics.Overlays
//Queries all singulos on the map and either adds or removes them from the list of singulos to render depending on their location and existence. //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 float _maxDist = 15.0f;
private void SingularityQuery() private void SingularityQuery()
{ {
var currentEyeLoc = _eyeManager.CurrentEye.Position; var currentEyeLoc = _eyeManager.CurrentEye.Position;
var currentMap = _eyeManager.CurrentMap; //TODO: support multiple viewports once it is added
var singuloComponents = _componentManager.EntityQuery<IClientSingularityInstance>(); var singuloComponents = _componentManager.EntityQuery<IClientSingularityInstance>();
foreach (var singuloInterface in singuloComponents) foreach (var singuloInterface in singuloComponents) //Add all singulos that are not added yet but qualify
{ {
var singuloComponent = (Component)singuloInterface; var singuloComponent = (Component)singuloInterface;
var singuloEntity = singuloComponent.Owner; var singuloEntity = singuloComponent.Owner;
if (!_singularities.Keys.Contains(singuloEntity.Uid) && singuloEntity.Transform.Coordinates.InRange(_entityManager, EntityCoordinates.FromMap(_entityManager, singuloEntity.Transform.ParentUid, currentEyeLoc), _maxDist)) if (!_singularities.Keys.Contains(singuloEntity.Uid) && singuloEntity.Transform.MapID == currentMap && singuloEntity.Transform.Coordinates.InRange(_entityManager, EntityCoordinates.FromMap(_entityManager, singuloEntity.Transform.ParentUid, currentEyeLoc), _maxDist))
{ {
_singularities.Add(singuloEntity.Uid, new SingularityShaderInstance(singuloEntity.Transform.MapPosition.Position, singuloInterface.Level)); _singularities.Add(singuloEntity.Uid, new SingularityShaderInstance(singuloEntity.Transform.MapPosition.Position, singuloInterface.Level));
} }
} }
var activeShaderUids = _singularities.Keys; var activeShaderUids = _singularities.Keys;
foreach (var activeSinguloUid in activeShaderUids) foreach (var activeSinguloUid in activeShaderUids) //Remove all singulos that are added and no longer qualify
{ {
if (_entityManager.TryGetEntity(activeSinguloUid, out IEntity? singuloEntity)) if (_entityManager.TryGetEntity(activeSinguloUid, out IEntity? singuloEntity))
{ {
if (!singuloEntity.Transform.Coordinates.InRange(_entityManager, EntityCoordinates.FromMap(_entityManager, singuloEntity.Transform.ParentUid, currentEyeLoc), _maxDist)) if (singuloEntity.Transform.MapID != currentMap || !singuloEntity.Transform.Coordinates.InRange(_entityManager, EntityCoordinates.FromMap(_entityManager, singuloEntity.Transform.ParentUid, currentEyeLoc), _maxDist))
{ {
_singularities.Remove(activeSinguloUid); _singularities.Remove(activeSinguloUid);
} }