diff --git a/Content.Client/AI/ClientPathfindingDebugSystem.cs b/Content.Client/AI/ClientPathfindingDebugSystem.cs index 2c42189087..d65f4a87c0 100644 --- a/Content.Client/AI/ClientPathfindingDebugSystem.cs +++ b/Content.Client/AI/ClientPathfindingDebugSystem.cs @@ -510,6 +510,8 @@ namespace Content.Client.AI { DrawRegions(screenHandle, viewport); } + + screenHandle.UseShader(null); } } diff --git a/Content.Client/Administration/UI/SpawnExplosion/ExplosionDebugOverlay.cs b/Content.Client/Administration/UI/SpawnExplosion/ExplosionDebugOverlay.cs index 2a2e88d107..a8d6fc872e 100644 --- a/Content.Client/Administration/UI/SpawnExplosion/ExplosionDebugOverlay.cs +++ b/Content.Client/Administration/UI/SpawnExplosion/ExplosionDebugOverlay.cs @@ -148,6 +148,7 @@ public sealed class ExplosionDebugOverlay : Overlay handle.SetTransform(SpaceMatrix); DrawTiles(handle, gridBounds, SpaceTiles, SpaceTileSize); + handle.SetTransform(Matrix3.Identity); } private void DrawTiles( diff --git a/Content.Client/CombatMode/ColoredScreenBorderOverlay.cs b/Content.Client/CombatMode/ColoredScreenBorderOverlay.cs index e042e5081b..9ca94fc3b4 100644 --- a/Content.Client/CombatMode/ColoredScreenBorderOverlay.cs +++ b/Content.Client/CombatMode/ColoredScreenBorderOverlay.cs @@ -25,6 +25,7 @@ namespace Content.Client.CombatMode worldHandle.UseShader(_shader); var viewport = args.WorldAABB; worldHandle.DrawRect(viewport, Color.White); + worldHandle.UseShader(null); } } } diff --git a/Content.Client/Cooldown/CooldownGraphic.cs b/Content.Client/Cooldown/CooldownGraphic.cs index 5e916f0a74..3ef966a140 100644 --- a/Content.Client/Cooldown/CooldownGraphic.cs +++ b/Content.Client/Cooldown/CooldownGraphic.cs @@ -48,6 +48,7 @@ namespace Content.Client.Cooldown _shader.SetParameter("progress", Progress); handle.UseShader(_shader); handle.DrawRect(PixelSizeBox, color); + handle.UseShader(null); } } diff --git a/Content.Client/Decals/DecalOverlay.cs b/Content.Client/Decals/DecalOverlay.cs index 3370ac34f6..6cde83158e 100644 --- a/Content.Client/Decals/DecalOverlay.cs +++ b/Content.Client/Decals/DecalOverlay.cs @@ -69,6 +69,8 @@ namespace Content.Client.Decals } } } + + handle.SetTransform(Matrix3.Identity); } public SpriteSpecifier GetDecalSprite(string id) diff --git a/Content.Client/DoAfter/UI/DoAfterBar.cs b/Content.Client/DoAfter/UI/DoAfterBar.cs index 06a92daf14..69efc91388 100644 --- a/Content.Client/DoAfter/UI/DoAfterBar.cs +++ b/Content.Client/DoAfter/UI/DoAfterBar.cs @@ -118,6 +118,7 @@ namespace Content.Client.DoAfter.UI leftOffset + (int) (XPixelDiff * Ratio * UIScale), -2); handle.DrawRect(box, color); + handle.UseShader(null); } } diff --git a/Content.Client/Drugs/RainbowOverlay.cs b/Content.Client/Drugs/RainbowOverlay.cs index 2111ceba13..9af8271dae 100644 --- a/Content.Client/Drugs/RainbowOverlay.cs +++ b/Content.Client/Drugs/RainbowOverlay.cs @@ -66,5 +66,6 @@ public sealed class RainbowOverlay : Overlay _rainbowShader.SetParameter("effectScale", EffectScale); handle.UseShader(_rainbowShader); handle.DrawRect(args.WorldBounds, Color.White); + handle.UseShader(null); } } diff --git a/Content.Client/Drunk/DrunkOverlay.cs b/Content.Client/Drunk/DrunkOverlay.cs index 60378989c6..0a49679846 100644 --- a/Content.Client/Drunk/DrunkOverlay.cs +++ b/Content.Client/Drunk/DrunkOverlay.cs @@ -67,6 +67,7 @@ public sealed class DrunkOverlay : Overlay _drunkShader.SetParameter("boozePower", _visualScale); handle.UseShader(_drunkShader); handle.DrawRect(args.WorldBounds, Color.White); + handle.UseShader(null); } /// diff --git a/Content.Client/Explosion/ExplosionOverlay.cs b/Content.Client/Explosion/ExplosionOverlay.cs index 999f2f9744..2335267ee6 100644 --- a/Content.Client/Explosion/ExplosionOverlay.cs +++ b/Content.Client/Explosion/ExplosionOverlay.cs @@ -60,6 +60,7 @@ public sealed class ExplosionOverlay : Overlay } drawHandle.SetTransform(Matrix3.Identity); + drawHandle.UseShader(null); } private void DrawExplosion(DrawingHandleWorld drawHandle, Box2Rotated worldBounds, Explosion exp, int index, EntityQuery xforms) @@ -84,7 +85,7 @@ public sealed class ExplosionOverlay : Overlay gridBounds = Matrix3.Invert(exp.SpaceMatrix).TransformBox(worldBounds); drawHandle.SetTransform(exp.SpaceMatrix); - + DrawTiles(drawHandle, gridBounds, index, exp.SpaceTiles, exp, exp.SpaceTileSize); } diff --git a/Content.Client/Eye/Blinding/BlindOverlay.cs b/Content.Client/Eye/Blinding/BlindOverlay.cs index a1a9b5c86c..c023435615 100644 --- a/Content.Client/Eye/Blinding/BlindOverlay.cs +++ b/Content.Client/Eye/Blinding/BlindOverlay.cs @@ -70,11 +70,11 @@ namespace Content.Client.Eye.Blinding var worldHandle = args.WorldHandle; var viewport = args.WorldBounds; - worldHandle.SetTransform(Matrix3.Identity); worldHandle.UseShader(_greyscaleShader); worldHandle.DrawRect(viewport, Color.White); worldHandle.UseShader(_circleMaskShader); worldHandle.DrawRect(viewport, Color.White); + worldHandle.UseShader(null); } } } diff --git a/Content.Client/Flash/FlashOverlay.cs b/Content.Client/Flash/FlashOverlay.cs index 4ab5ff7b5a..70a3876021 100644 --- a/Content.Client/Flash/FlashOverlay.cs +++ b/Content.Client/Flash/FlashOverlay.cs @@ -60,6 +60,8 @@ namespace Content.Client.Flash { screenSpaceHandle.DrawTextureRect(_screenshotTexture, screenSize); } + + screenSpaceHandle.UseShader(null); } protected override void DisposeBehavior() diff --git a/Content.Client/MobState/Overlays/DamageOverlay.cs b/Content.Client/MobState/Overlays/DamageOverlay.cs index 743af6f21b..70fc218407 100644 --- a/Content.Client/MobState/Overlays/DamageOverlay.cs +++ b/Content.Client/MobState/Overlays/DamageOverlay.cs @@ -214,6 +214,8 @@ public sealed class DamageOverlay : Overlay handle.UseShader(_critShader); handle.DrawRect(viewport, Color.White); } + + handle.UseShader(null); } private float GetDiff(float value, float lastFrameTime) diff --git a/Content.Client/Radiation/RadiationPulseOverlay.cs b/Content.Client/Radiation/RadiationPulseOverlay.cs index cc00348586..475816ce7a 100644 --- a/Content.Client/Radiation/RadiationPulseOverlay.cs +++ b/Content.Client/Radiation/RadiationPulseOverlay.cs @@ -62,6 +62,8 @@ namespace Content.Client.Radiation worldHandle.UseShader(shd); worldHandle.DrawRect(Box2.CenteredAround(instance.CurrentMapCoords, new Vector2(instance.Range, instance.Range) * 2f), Color.White); } + + worldHandle.UseShader(null); } //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?) diff --git a/Content.Client/UserInterface/Controls/DirectionIcon.cs b/Content.Client/UserInterface/Controls/DirectionIcon.cs index 16cebcc9a5..fe1a93ded6 100644 --- a/Content.Client/UserInterface/Controls/DirectionIcon.cs +++ b/Content.Client/UserInterface/Controls/DirectionIcon.cs @@ -55,7 +55,7 @@ public sealed class DirectionIcon : TextureRect } var rotation = direction.ToWorldAngle() - relativeAngle; - Rotation = snap ? rotation.GetDir().ToAngle() : rotation; + Rotation = snap ? rotation.GetDir().ToAngle() : rotation; } protected override void Draw(DrawingHandleScreen handle) @@ -65,6 +65,8 @@ public sealed class DirectionIcon : TextureRect var offset = (-_rotation.Value).RotateVec(Size * UIScale / 2) - Size * UIScale / 2; handle.SetTransform(Matrix3.CreateTransform(GlobalPixelPosition - offset, -_rotation.Value)); } + + handle.SetTransform(Matrix3.Identity); base.Draw(handle); } }