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

Fix 3000 errors

Browse Source
This commit is contained in:
DrSmugleaf
2021-12-05 18:09:01 +01:00
parent 2bfec7ec62
commit 2a3b7d809d
569 changed files with 2979 additions and 3280 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -43,7 +43,7 @@ namespace Content.Client.Singularity
var viewportWB = _eyeManager.GetWorldViewport();
// Has to be correctly handled because of the way intensity/falloff transform works so just do it.
_shader?.SetParameter("renderScale", args.Viewport.RenderScale);
foreach (SingularityShaderInstance instance in _singularities.Values)
foreach (var instance in _singularities.Values)
{
// To be clear, this needs to use "inside-viewport" pixels.
// In other words, specifically NOT IViewportControl.WorldToScreen (which uses outer coordinates).
@@ -80,29 +80,29 @@ namespace Content.Client.Singularity
if (!_singularities.Keys.Contains(singuloEntity) && SinguloQualifies(singuloEntity, currentEyeLoc))
{
_singularities.Add(singuloEntity, new SingularityShaderInstance(IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(singuloEntity).MapPosition.Position, distortion.Intensity, distortion.Falloff));
_singularities.Add(singuloEntity, new SingularityShaderInstance(_entityManager.GetComponent<TransformComponent>(singuloEntity).MapPosition.Position, distortion.Intensity, distortion.Falloff));
}
}
var activeShaderIds = _singularities.Keys;
foreach (var activeSinguloUid in activeShaderIds) //Remove all singulos that are added and no longer qualify
foreach (var activeSingulo in activeShaderIds) //Remove all singulos that are added and no longer qualify
{
if (_entityManager.TryGetEntity(activeSinguloUid, out var singuloEntity))
if (_entityManager.EntityExists(activeSingulo))
{
if (!SinguloQualifies(singuloEntity, currentEyeLoc))
if (!SinguloQualifies(activeSingulo, currentEyeLoc))
{
_singularities.Remove(activeSinguloUid);
_singularities.Remove(activeSingulo);
}
else
{
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent<SingularityDistortionComponent?>(singuloEntity, out var distortion))
if (!_entityManager.TryGetComponent<SingularityDistortionComponent?>(activeSingulo, out var distortion))
{
_singularities.Remove(activeSinguloUid);
_singularities.Remove(activeSingulo);
}
else
{
var shaderInstance = _singularities[activeSinguloUid];
shaderInstance.CurrentMapCoords = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(singuloEntity).MapPosition.Position;
var shaderInstance = _singularities[activeSingulo];
shaderInstance.CurrentMapCoords = _entityManager.GetComponent<TransformComponent>(activeSingulo).MapPosition.Position;
shaderInstance.Intensity = distortion.Intensity;
shaderInstance.Falloff = distortion.Falloff;
}
@@ -111,15 +111,15 @@ namespace Content.Client.Singularity
}
else
{
_singularities.Remove(activeSinguloUid);
_singularities.Remove(activeSingulo);
}
}
}
private bool SinguloQualifies(IEntity singuloEntity, MapCoordinates currentEyeLoc)
private bool SinguloQualifies(EntityUid singuloEntity, MapCoordinates currentEyeLoc)
{
return IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(singuloEntity).MapID == currentEyeLoc.MapId && IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(singuloEntity).Coordinates.InRange(_entityManager, EntityCoordinates.FromMap(_entityManager, IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(singuloEntity).ParentUid, currentEyeLoc), MaxDist);
return _entityManager.GetComponent<TransformComponent>(singuloEntity).MapID == currentEyeLoc.MapId && _entityManager.GetComponent<TransformComponent>(singuloEntity).Coordinates.InRange(_entityManager, EntityCoordinates.FromMap(_entityManager, _entityManager.GetComponent<TransformComponent>(singuloEntity).ParentUid, currentEyeLoc), MaxDist);
}
private sealed class SingularityShaderInstance

4
Content.Client/Singularity/Visualizers/EmitterVisualizer.cs
View File

@@ -4,6 +4,7 @@ using Content.Shared.Storage;
using JetBrains.Annotations;
using Robust.Client.GameObjects;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
namespace Content.Client.Singularity.Visualizers
{
@@ -17,7 +18,8 @@ namespace Content.Client.Singularity.Visualizers
{
base.OnChangeData(component);
if (!component.Owner.TryGetComponent(out ISpriteComponent? sprite))
var entities = IoCManager.Resolve<IEntityManager>();
if (!entities.TryGetComponent(component.Owner, out ISpriteComponent? sprite))
{
return;
}

7
Content.Client/Singularity/Visualizers/RadiationCollectorVisualizer.cs
View File

@@ -44,7 +44,7 @@ namespace Content.Client.Singularity.Visualizers
}
}
public override void InitializeEntity(IEntity entity)
public override void InitializeEntity(EntityUid entity)
{
if (!IoCManager.Resolve<IEntityManager>().HasComponent<AnimationPlayerComponent>(entity))
{
@@ -56,8 +56,9 @@ namespace Content.Client.Singularity.Visualizers
{
base.OnChangeData(component);
if (!component.Owner.TryGetComponent<ISpriteComponent>(out var sprite)) return;
if (!component.Owner.TryGetComponent<AnimationPlayerComponent>(out var animPlayer)) return;
var entities = IoCManager.Resolve<IEntityManager>();
if (!entities.TryGetComponent(component.Owner, out ISpriteComponent sprite)) return;
if (!entities.TryGetComponent(component.Owner, out AnimationPlayerComponent animPlayer)) return;
if (!component.TryGetData(RadiationCollectorVisuals.VisualState, out RadiationCollectorVisualState state))
{
state = RadiationCollectorVisualState.Deactive;

2
Content.Client/Singularity/Visualizers/SingularityVisualizer.cs
View File

@@ -14,7 +14,7 @@ namespace Content.Client.Singularity.Visualizers
[DataField("layer")]
private int Layer { get; } = 0;
public override void InitializeEntity(IEntity entity)
public override void InitializeEntity(EntityUid entity)
{
base.InitializeEntity(entity);