From 5e7b03d251b033c5649d2cc4a43a4bb9db6623f4 Mon Sep 17 00:00:00 2001
From: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
Date: Mon, 18 Mar 2019 23:54:58 +0100
Subject: [PATCH] Make content use SWSL shaders.

---
 Content.Client/GameObjects/Components/Mobs/SpeciesUI.cs    | 7 ++++++-
 Resources/Prototypes/Shaders/shaders.yml                   | 4 ++--
 Resources/Shaders/{circlemask.gdsl => circlemask.swsl}     | 3 ---
 .../{gradientcirclemask.gdsl => gradientcirclemask.swsl}   | 1 -
 SpaceStation14Content.sln.DotSettings                      | 3 ++-
 5 files changed, 10 insertions(+), 8 deletions(-)
 rename Resources/Shaders/{circlemask.gdsl => circlemask.swsl} (85%)
 rename Resources/Shaders/{gradientcirclemask.gdsl => gradientcirclemask.swsl} (93%)

diff --git a/Content.Client/GameObjects/Components/Mobs/SpeciesUI.cs b/Content.Client/GameObjects/Components/Mobs/SpeciesUI.cs
index 3df7791d1c..cbdf25ba7a 100644
--- a/Content.Client/GameObjects/Components/Mobs/SpeciesUI.cs
+++ b/Content.Client/GameObjects/Components/Mobs/SpeciesUI.cs
@@ -131,7 +131,12 @@ namespace Content.Client.GameObjects
         {
             if (_currentEffect != ScreenEffects.None)
             {
-                _overlayManager.AddOverlay(EffectsDictionary[_currentEffect]);
+                var overlay = EffectsDictionary[_currentEffect];
+                if (_overlayManager.HasOverlay(overlay.ID))
+                {
+                    return;
+                }
+                _overlayManager.AddOverlay(overlay);
             }
         }
 
diff --git a/Resources/Prototypes/Shaders/shaders.yml b/Resources/Prototypes/Shaders/shaders.yml
index f7920f1cd5..16b384fa30 100644
--- a/Resources/Prototypes/Shaders/shaders.yml
+++ b/Resources/Prototypes/Shaders/shaders.yml
@@ -1,9 +1,9 @@
 - type: shader
   id: circlemask
   kind: source
-  path: "/Shaders/circlemask.gdsl"
+  path: "/Shaders/circlemask.swsl"
 
 - type: shader
   id: gradientcirclemask
   kind: source
-  path: "/Shaders/gradientcirclemask.gdsl"
\ No newline at end of file
+  path: "/Shaders/gradientcirclemask.swsl"
diff --git a/Resources/Shaders/circlemask.gdsl b/Resources/Shaders/circlemask.swsl
similarity index 85%
rename from Resources/Shaders/circlemask.gdsl
rename to Resources/Shaders/circlemask.swsl
index c29fd7657c..fa47a61fcb 100644
--- a/Resources/Shaders/circlemask.gdsl
+++ b/Resources/Shaders/circlemask.swsl
@@ -1,5 +1,3 @@
-shader_type canvas_item;
-
 float circle(in vec2 _st, in float _radius){
     vec2 dist = _st-vec2(0.5);
 	return smoothstep(_radius-(_radius*0.01),
@@ -10,7 +8,6 @@ float circle(in vec2 _st, in float _radius){
 void fragment(){
 	vec2 st = FRAGCOORD.xy*SCREEN_PIXEL_SIZE.xy;
 
-	COLOR = texture(TEXTURE, UV);
 	COLOR.rgb = vec3(0);
     COLOR.a = circle(st,0.05);
 }
diff --git a/Resources/Shaders/gradientcirclemask.gdsl b/Resources/Shaders/gradientcirclemask.swsl
similarity index 93%
rename from Resources/Shaders/gradientcirclemask.gdsl
rename to Resources/Shaders/gradientcirclemask.swsl
index e5c662ff06..382d8b164c 100644
--- a/Resources/Shaders/gradientcirclemask.gdsl
+++ b/Resources/Shaders/gradientcirclemask.swsl
@@ -1,4 +1,3 @@
-shader_type canvas_item;
 uniform float percentagedistanceshow = 0.1;
 uniform float gradientfalloffwidth = 0.2;
 
diff --git a/SpaceStation14Content.sln.DotSettings b/SpaceStation14Content.sln.DotSettings
index 3d774a5106..a74f7297a3 100644
--- a/SpaceStation14Content.sln.DotSettings
+++ b/SpaceStation14Content.sln.DotSettings
@@ -7,4 +7,5 @@
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=RSI/@EntryIndexedValue">RSI</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=UI/@EntryIndexedValue">UI</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=UV/@EntryIndexedValue">UV</s:String>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=Noto/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
\ No newline at end of file
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Noto/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=swsl/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
\ No newline at end of file