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

Revert "Fix chat bubbles (#25643)" (#25645)

Browse Source 
* Revert "Fix chat bubbles (#25643)"

This reverts commit 23d2c4d924.

* Revert "Fixes obsolete Transform warnings in Content. (#25256)"

This reverts commit f284b43ff6.
This commit is contained in:
metalgearsloth
2024-02-28 00:51:20 +11:00
committed by GitHub
parent d204896bf5
commit a9502be29e
154 changed files with 435 additions and 611 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Content.Client/Radiation/Overlays/RadiationPulseOverlay.cs
View File

@@ -14,7 +14,6 @@ namespace Content.Client.Radiation.Overlays
[Dependency] private readonly IEntityManager _entityManager = default!;
[Dependency] private readonly IPrototypeManager _prototypeManager = default!;
[Dependency] private readonly IGameTiming _gameTiming = default!;
private SharedTransformSystem? _xformSystem = null;
private const float MaxDist = 15.0f;
@@ -73,9 +72,7 @@ namespace Content.Client.Radiation.Overlays
//Queries all pulses on the map and either adds or removes them from the list of rendered pulses based on whether they should be drawn (in range? on the same z-level/map? pulse entity still exists?)
private void RadiationQuery(IEye? currentEye)
{
_xformSystem ??= _entityManager.SystemOrNull<SharedTransformSystem>();
if (_xformSystem is null || currentEye is null)
if (currentEye == null)
{
_pulses.Clear();
return;
@@ -94,7 +91,7 @@ namespace Content.Client.Radiation.Overlays
(
_baseShader.Duplicate(),
new RadiationShaderInstance(
_xformSystem.GetMapCoordinates(pulseEntity),
_entityManager.GetComponent<TransformComponent>(pulseEntity).MapPosition,
pulse.VisualRange,
pulse.StartTime,
pulse.VisualDuration
@@ -112,7 +109,7 @@ namespace Content.Client.Radiation.Overlays
_entityManager.TryGetComponent(pulseEntity, out RadiationPulseComponent? pulse))
{
var shaderInstance = _pulses[pulseEntity];
shaderInstance.instance.CurrentMapCoords = _xformSystem.GetMapCoordinates(pulseEntity);
shaderInstance.instance.CurrentMapCoords = _entityManager.GetComponent<TransformComponent>(pulseEntity).MapPosition;
shaderInstance.instance.Range = pulse.VisualRange;
} else {
_pulses[pulseEntity].shd.Dispose();