Merge branch 'master' of https://github.com/Regalis11/Barotrauma

Barotrauma/BarotraumaClient/Source/GameMain.cs

@@ -225,7 +225,7 @@ namespace Barotrauma
             DebugConsole.Log(SelectedPackage == null ? "No content package selected" : "Content package \"" + SelectedPackage.Name + "\" selected");
         yield return CoroutineStatus.Running;
 
-            LightManager = new Lights.LightManager(base.GraphicsDevice);
+            LightManager = new Lights.LightManager(base.GraphicsDevice, Content);
 
             Hull.renderer = new WaterRenderer(base.GraphicsDevice, Content);
             TitleScreen.LoadState = 1.0f;

Barotrauma/BarotraumaClient/Source/Map/Levels/WaterRenderer.cs

@@ -43,12 +43,7 @@ namespace Barotrauma
             waterEffect.Parameters["xWaveWidth"].SetValue(0.05f);
             waterEffect.Parameters["xWaveHeight"].SetValue(0.05f);
 
-#if WINDOWS
-            //waterEffect.Parameters["xTexture"].SetValue(waterTexture);
-#endif
-#if LINUX
             waterEffect.Parameters["xWaterBumpMap"].SetValue(waterTexture);
-#endif
 
             if (basicEffect == null)
             {
@@ -68,13 +63,13 @@ namespace Barotrauma
             waterEffect.Parameters["xBlurDistance"].SetValue(blurAmount);
             //waterEffect.CurrentTechnique.Passes[0].Apply();
             
-#if WINDOWS
+//#if WINDOWS
             waterEffect.Parameters["xTexture"].SetValue(texture);
-            spriteBatch.Draw(waterTexture, new Rectangle(0, 0, GameMain.GraphicsWidth, GameMain.GraphicsHeight), Color.White);
-#elif LINUX
-
             spriteBatch.Draw(texture, new Rectangle(0, 0, GameMain.GraphicsWidth, GameMain.GraphicsHeight), Color.White);
-#endif
+//#elif LINUX
+
+//            spriteBatch.Draw(texture, new Rectangle(0, 0, GameMain.GraphicsWidth, GameMain.GraphicsHeight), Color.White);
+//#endif
             spriteBatch.End();
         }
 

Barotrauma/BarotraumaClient/Source/Map/Lights/LightManager.cs

@@ -1,5 +1,6 @@
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
+using Microsoft.Xna.Framework.Content;
 using System.Collections.Generic;
 using System.Linq;
 
@@ -36,6 +37,11 @@ namespace Barotrauma.Lights
         }
 
         BasicEffect lightEffect;
+
+        public Effect losEffect
+        {
+            get; private set;
+        }
         
         private static Texture2D alphaClearTexture;
 
@@ -55,7 +61,7 @@ namespace Barotrauma.Lights
 
         private float ambientLightUpdateTimer;
 
-        public LightManager(GraphicsDevice graphics)
+        public LightManager(GraphicsDevice graphics, ContentManager content)
         {
             lights = new List<LightSource>();
 
@@ -71,12 +77,18 @@ namespace Barotrauma.Lights
                        pp.BackBufferFormat, pp.DepthStencilFormat, pp.MultiSampleCount,
                        RenderTargetUsage.DiscardContents);
 
-            losTexture = new RenderTarget2D(graphics, (int)(GameMain.GraphicsWidth*lightmapScale), (int)(GameMain.GraphicsHeight*lightmapScale), false, SurfaceFormat.Alpha8, DepthFormat.None);
+            losTexture = new RenderTarget2D(graphics, (int)(GameMain.GraphicsWidth*lightmapScale), (int)(GameMain.GraphicsHeight*lightmapScale), false, SurfaceFormat.Color, DepthFormat.None);
 
             losSource = new LightSource(Vector2.Zero, GameMain.GraphicsWidth, Color.White, null, false);
             losSource.texture = new Texture2D(graphics, 1, 1);
             losSource.texture.SetData(new Color[] { Color.White });// fill the texture with white
 
+#if WINDOWS
+            losEffect = content.Load<Effect>("losshader");
+#else
+            losEffect = content.Load<Effect>("losshader_opengl");
+#endif
+
             if (lightEffect == null)
             {
                 lightEffect = new BasicEffect(GameMain.Instance.GraphicsDevice);

Barotrauma/BarotraumaClient/Source/Map/Structure.cs

@@ -152,7 +152,7 @@ namespace Barotrauma
                         {
                             damageEffect.Parameters["aCutoff"].SetValue(newCutoff);
                             damageEffect.Parameters["cCutoff"].SetValue(newCutoff * 1.2f);
-                            damageEffect.Parameters["color"].SetValue(color.ToVector4());
+                            damageEffect.Parameters["inColor"].SetValue(color.ToVector4());
 
 
                             damageEffect.CurrentTechnique.Passes[0].Apply();

Barotrauma/BarotraumaClient/Source/Screens/GameScreen.cs

@@ -237,9 +237,10 @@ namespace Barotrauma
 				spriteBatch.Draw(renderTargetBackground, new Rectangle(0, 0, GameMain.GraphicsWidth, GameMain.GraphicsHeight),
 				                 Color.Lerp(GameMain.LightManager.AmbientLight * 0.5f, Color.Red, r));
 				spriteBatch.End();
-				Hull.renderer.waterEffect.CurrentTechnique = Hull.renderer.waterEffect.Techniques["LosShader"];
-				Hull.renderer.waterEffect.Parameters["xLosTexture"].SetValue(GameMain.LightManager.losTexture);
-				spriteBatch.Begin(SpriteSortMode.Deferred, BlendState.NonPremultiplied, SamplerState.PointClamp, DepthStencilState.None, null, Hull.renderer.waterEffect, null);
+                GameMain.LightManager.losEffect.CurrentTechnique = GameMain.LightManager.losEffect.Techniques["LosShader"];
+                GameMain.LightManager.losEffect.Parameters["xTexture"].SetValue(renderTargetFinal);
+                GameMain.LightManager.losEffect.Parameters["xLosTexture"].SetValue(GameMain.LightManager.losTexture);
+                spriteBatch.Begin(SpriteSortMode.Deferred, BlendState.AlphaBlend, SamplerState.PointClamp, DepthStencilState.None, null, GameMain.LightManager.losEffect, null);
 			}
 			spriteBatch.Draw(renderTargetFinal, new Rectangle(0, 0, GameMain.GraphicsWidth, GameMain.GraphicsHeight), Color.White);
 			spriteBatch.End();