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

Change from using obsolete method in ExplosionOverlay (#30550)

Browse Source 
* Change from obsolete method in ExplosionOverlay

* Send AppearanceSystem through constructor
This commit is contained in:
SlamBamActionman
2024-08-01 15:17:15 +02:00
committed by GitHub
parent ff76214247
commit 7da2fb1218
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Content.Client/Explosion/ExplosionOverlay.cs
View File

@@ -16,15 +16,17 @@ public sealed class ExplosionOverlay : Overlay
[Dependency] private readonly IRobustRandom _robustRandom = default!; [Dependency] private readonly IRobustRandom _robustRandom = default!;
[Dependency] private readonly IEntityManager _entMan = default!; [Dependency] private readonly IEntityManager _entMan = default!;
[Dependency] private readonly IPrototypeManager _proto = default!; [Dependency] private readonly IPrototypeManager _proto = default!;
private SharedAppearanceSystem _appearance;
public override OverlaySpace Space => OverlaySpace.WorldSpaceBelowFOV; public override OverlaySpace Space => OverlaySpace.WorldSpaceBelowFOV;
private ShaderInstance _shader; private ShaderInstance _shader;
public ExplosionOverlay() public ExplosionOverlay(SharedAppearanceSystem appearanceSystem)
{ {
IoCManager.InjectDependencies(this); IoCManager.InjectDependencies(this);
_shader = _proto.Index<ShaderPrototype>("unshaded").Instance(); _shader = _proto.Index<ShaderPrototype>("unshaded").Instance();
_appearance = appearanceSystem;
} }
protected override void Draw(in OverlayDrawArgs args) protected override void Draw(in OverlayDrawArgs args)
@@ -33,15 +35,14 @@ public sealed class ExplosionOverlay : Overlay
drawHandle.UseShader(_shader); drawHandle.UseShader(_shader);
var xforms = _entMan.GetEntityQuery<TransformComponent>(); var xforms = _entMan.GetEntityQuery<TransformComponent>();
var query = _entMan var query = _entMan.EntityQueryEnumerator<ExplosionVisualsComponent, ExplosionVisualsTexturesComponent>();
.EntityQuery<ExplosionVisualsComponent, ExplosionVisualsTexturesComponent, AppearanceComponent>(true);
foreach (var (visuals, textures, appearance) in query) while (query.MoveNext(out var uid, out var visuals, out var textures))
{ {
if (visuals.Epicenter.MapId != args.MapId) if (visuals.Epicenter.MapId != args.MapId)
continue; continue;
if (!appearance.TryGetData(ExplosionAppearanceData.Progress, out int index)) if (!_appearance.TryGetData(uid, ExplosionAppearanceData.Progress, out int index))
continue; continue;
index = Math.Min(index, visuals.Intensity.Count - 1); index = Math.Min(index, visuals.Intensity.Count - 1);

3
Content.Client/Explosion/ExplosionOverlaySystem.cs
View File

@@ -20,6 +20,7 @@ public sealed class ExplosionOverlaySystem : EntitySystem
[Dependency] private readonly IOverlayManager _overlayMan = default!; [Dependency] private readonly IOverlayManager _overlayMan = default!;
[Dependency] private readonly SharedPointLightSystem _lights = default!; [Dependency] private readonly SharedPointLightSystem _lights = default!;
[Dependency] private readonly IMapManager _mapMan = default!; [Dependency] private readonly IMapManager _mapMan = default!;
[Dependency] private readonly SharedAppearanceSystem _appearance = default!;
public override void Initialize() public override void Initialize()
{ {
@@ -28,7 +29,7 @@ public sealed class ExplosionOverlaySystem : EntitySystem
SubscribeLocalEvent<ExplosionVisualsComponent, ComponentInit>(OnExplosionInit); SubscribeLocalEvent<ExplosionVisualsComponent, ComponentInit>(OnExplosionInit);
SubscribeLocalEvent<ExplosionVisualsComponent, ComponentRemove>(OnCompRemove); SubscribeLocalEvent<ExplosionVisualsComponent, ComponentRemove>(OnCompRemove);
SubscribeLocalEvent<ExplosionVisualsComponent, ComponentHandleState>(OnExplosionHandleState); SubscribeLocalEvent<ExplosionVisualsComponent, ComponentHandleState>(OnExplosionHandleState);
_overlayMan.AddOverlay(new ExplosionOverlay()); _overlayMan.AddOverlay(new ExplosionOverlay(_appearance));
} }
private void OnExplosionHandleState(EntityUid uid, ExplosionVisualsComponent component, ref ComponentHandleState args) private void OnExplosionHandleState(EntityUid uid, ExplosionVisualsComponent component, ref ComponentHandleState args)