From 1f2937fad1d8cf86afd913e2415a6a377d303a54 Mon Sep 17 00:00:00 2001
From: Regalis <regalis@undertowgames.com>
Date: Wed, 18 May 2016 11:45:38 +0300
Subject: [PATCH] - opengl blur shader - the "heal" console command cancels
 stun - the camera shakes when the sub hits something only if controlled
 character is inside the sub

---
 Subsurface/Barotrauma.csproj             |   3 ---
 Subsurface/Content/blurshader_opengl.xnb | Bin 0 -> 3795 bytes
 Subsurface/Source/Camera.cs              |   2 +-
 Subsurface/Source/DebugConsole.cs        |   1 +
 Subsurface/Source/Map/SubmarineBody.cs   |   6 +++++-
 Subsurface/Source/Screens/GameScreen.cs  |   5 +++++
 6 files changed, 12 insertions(+), 5 deletions(-)
 create mode 100644 Subsurface/Content/blurshader_opengl.xnb

diff --git a/Subsurface/Barotrauma.csproj b/Subsurface/Barotrauma.csproj
index 181e4e0e0..0e6cb6166 100644
--- a/Subsurface/Barotrauma.csproj
+++ b/Subsurface/Barotrauma.csproj
@@ -987,9 +987,6 @@
     </BootstrapperPackage>
   </ItemGroup>
   <ItemGroup>
-    <None Include="Content\blurshader.xnb">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
     <None Include="Content\blurshader.xnb">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
diff --git a/Subsurface/Content/blurshader_opengl.xnb b/Subsurface/Content/blurshader_opengl.xnb
new file mode 100644
index 0000000000000000000000000000000000000000..800d3ef75b1013a1fa1d75ced518bd5d420010f2
GIT binary patch
literal 3795
zcmd^?!EVzq9LAGP6Qa<KM~Jk`236GmziYb+^|Eg30R|JBU=o_DkUGU$8dpwIIuJ)*
zg%{!lI3VrH8-VSsTI-la8o3~RO6<@6oS&U9@!5;L;hObr-LmYDN7UymW<lbfMV@=e
zy)pT~_=VeJQ9`1`JqQBgC$ES%B)sMvv557B<VIL?UK1Wu7IhnL(*+k=?M}_<rD2kC
z(v3)(a4)Pm$LYI}`p?MaDZ3z1H%i0MlEv<cSse8b&+b`QKfZjmA5G#x8qt99aXgq3
zf9JcsB4s}<+q!ySS(`K%lECRd9~_)iD-%w9D$SiS8Paq-ae|O}$x~Acjb!~MiH0<&
zR;rb27e|^ny6f9U{amQ$ZM?pC19BWO3mOsG(XZ#b*Uy(Fke7fa!Mp@DNh2?5XcEJt
z>}Zl^ew3yrY2_s?P14Rw+L~lHFWJ>3oxG%@Nx*;?a(qpIb;4jk3_4>lKn9&M7%+p*
z84RF7Ck+PFptA-8Y|v?g0XOKp!2ld|;%Fd_I&m}*N1Zqth@(y%4a89=jt1hW6GsDa
z)QO{kIO@dFKpb`AXdsR{aWoJ|Nqn9^u{WNCgyX(^6=D@M9>1i~C`+d4DVg;c<3ri9
zkUG=4bJMic!g_UQ6b?j`k9sU*T!!70(V;W;XtcFmt$eCh?h7wocW0MQSK9g@FQ3TE
zsjL-NnL;!tWG15=_qWviYEq=SZZE1-rSmu&tmV!`nK!GkGaKcYw}C&|$gWE^at<8k
zK27DbolRV2w3_vTA)24-u7>SG!$!G=yM=~3<r;Ph4Fz=5R=Fcm6k9@++tyI*rZNr1
z?kF%6t6Zj`*n<UzVwKA@6nn71P^@y9hGGvE7(%&kJ{G_Epi-c;tidePZri6&ZrEUP
z*g&~ygT-kBe-k(I!_;+_A{_I1^I3kcY<V_VQy-iaalLA<R!`J-@?{XjB#Fg|U}eKz
zl_vvvJh(3ZSB1cG4do4?qxTAmy<sURil3nJkKWu{7k@qSuOnM@o~^I_u<xaDOuc9?
QOu1#R9eZ&M)-T!m8}f-9a{vGU

literal 0
HcmV?d00001

diff --git a/Subsurface/Source/Camera.cs b/Subsurface/Source/Camera.cs
index c8b75de5b..0c48b5ecc 100644
--- a/Subsurface/Source/Camera.cs
+++ b/Subsurface/Source/Camera.cs
@@ -210,7 +210,7 @@ namespace Barotrauma
 
             shakeTargetPosition = Rand.Vector(Shake);
             shakePosition = Vector2.Lerp(shakePosition, shakeTargetPosition, 0.5f);
-            Shake = MathHelper.Lerp(Shake, 0.0f, 0.03f);
+            Shake = MathHelper.Lerp(Shake, 0.0f, deltaTime*2.0f);
 
             Translate(moveCam+shakePosition);
         }
diff --git a/Subsurface/Source/DebugConsole.cs b/Subsurface/Source/DebugConsole.cs
index 7c3db5202..ca7dde0cc 100644
--- a/Subsurface/Source/DebugConsole.cs
+++ b/Subsurface/Source/DebugConsole.cs
@@ -332,6 +332,7 @@ namespace Barotrauma
                         Character.Controlled.AddDamage(CauseOfDeath.Damage, -Character.Controlled.MaxHealth, null);
                         Character.Controlled.Oxygen = 100.0f;
                         Character.Controlled.Bleeding = 0.0f;
+                        Character.Controlled.AnimController.StunTimer = 0.0f;
                     }
                     break;
                 case "revive":
diff --git a/Subsurface/Source/Map/SubmarineBody.cs b/Subsurface/Source/Map/SubmarineBody.cs
index 59d1d7875..880d54422 100644
--- a/Subsurface/Source/Map/SubmarineBody.cs
+++ b/Subsurface/Source/Map/SubmarineBody.cs
@@ -485,7 +485,11 @@ namespace Barotrauma
             Vector2 lastContactPoint = worldPoints[0];
 
             SoundPlayer.PlayDamageSound(DamageSoundType.StructureBlunt, impact * 10.0f, ConvertUnits.ToDisplayUnits(lastContactPoint));
-            GameMain.GameScreen.Cam.Shake = impact * 2.0f;
+
+            if (Character.Controlled != null && Character.Controlled.Submarine == submarine)
+            {
+                GameMain.GameScreen.Cam.Shake = impact * 2.0f;
+            }
 
             Vector2 impulse = direction * impact * 0.5f;
 
diff --git a/Subsurface/Source/Screens/GameScreen.cs b/Subsurface/Source/Screens/GameScreen.cs
index f5c818939..a00726b7c 100644
--- a/Subsurface/Source/Screens/GameScreen.cs
+++ b/Subsurface/Source/Screens/GameScreen.cs
@@ -36,7 +36,12 @@ namespace Barotrauma
                         
             BackgroundCreatureManager = new BackgroundCreatureManager("Content/BackgroundSprites/BackgroundCreaturePrefabs.xml");
 
+#if LINUX
+            var blurEffect = content.Load<Effect>("blurshader_opengl");
+#else
             var blurEffect = content.Load<Effect>("blurshader");
+#endif
+
 
             lightBlur = new BlurEffect(blurEffect, 0.001f, 0.001f);