Optimized GameScreen.DrawMap

- Downscaled lightmap, since blurring will make this unnoticeable anyway
(TODO: make this optional)
- Render LOS in fewer passes by using a shader
- Use light volume to calculate LOS
- This also means we can use the override texture to render the diving
suit obstruct effect
- Don't render bunks and labels onto LOS background (TODO: add the
option to render back into the LOS background, i.e. just use
multiplicative blending as if it was the lightmap)
- Prefer SpriteSortMode.Deferred over all others, prefer
SamplerState.LinearClamp/PointClamp over all others
- Remove shader blur in favor of geometry blur (TODO: improve on this
further, right now it has a few artifacts)
- Trim light volumes
- Do some weird shit with the background particles (use DrawTiled
instead of relying on SamplerState.LinearWrap, because that's faster
somehow :/ )
- Pressing up/down in the console only returns a typed command now

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

@@ -1,4 +1,4 @@
-using Microsoft.Xna.Framework;
+using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
 using System;
 using System.Collections.Generic;
@@ -63,6 +63,7 @@ namespace Barotrauma
         public void Update(float deltaTime)
         {
             dustOffset -= Vector2.UnitY * 10.0f * deltaTime;
+            while (dustOffset.Y <= -1024.0f) dustOffset.Y += 1024.0f;
         }
 
         public static VertexPositionColorTexture[] GetColoredVertices(VertexPositionTexture[] vertices, Color color)
@@ -108,7 +109,7 @@ namespace Barotrauma
             Vector2 backgroundPos = cam.WorldViewCenter;
             
             backgroundPos.Y = -backgroundPos.Y;
-            backgroundPos /= 20.0f;
+            backgroundPos *= 0.05f;
 
             if (backgroundPos.Y < 1024)
             {
@@ -130,35 +131,38 @@ namespace Barotrauma
 
             spriteBatch.End();
 
-            spriteBatch.Begin(SpriteSortMode.BackToFront,
+            spriteBatch.Begin(SpriteSortMode.Deferred,
                 BlendState.AlphaBlend,
                 SamplerState.LinearWrap, DepthStencilState.Default, null, null,
                 cam.Transform);
+            
+            Vector2 origin = new Vector2(cam.WorldView.X, -cam.WorldView.Y);
+            Vector2 offset = -origin + dustOffset;
+            while (offset.X <= -1024.0f) offset.X += 1024.0f;
+            while (offset.X > 0.0f) offset.X -= 1024.0f;
+            while (offset.Y <= -1024.0f) offset.Y += 1024.0f;
+            while (offset.Y > 0.0f) offset.Y -= 1024.0f;
 
             if (backgroundSpriteManager != null) backgroundSpriteManager.DrawSprites(spriteBatch, cam);
             if (backgroundCreatureManager != null) backgroundCreatureManager.Draw(spriteBatch);
-            
+
             for (int i = 0; i < 4; i++)
             {
                 float scale = 1.0f - i * 0.2f;
+                float recipScale = 1.0f / scale;
 
-                //alpha goes from 1.0 to 0.0 when scale is in the range of 0.2-0.1
-                float alpha = (cam.Zoom * scale) < 0.2f ? (cam.Zoom * scale - 0.1f) * 10.0f : 1.0f;
+                //alpha goes from 1.0 to 0.0 when scale is in the range of 0.5-0.25
+                float alpha = (cam.Zoom * scale) < 0.5f ? (cam.Zoom * scale - 0.25f) * 40.0f : 1.0f;
                 if (alpha <= 0.0f) continue;
 
-                Vector2 offset = (new Vector2(cam.WorldViewCenter.X, cam.WorldViewCenter.Y) + dustOffset) * scale;
-                Vector3 origin = new Vector3(cam.WorldView.Width, cam.WorldView.Height, 0.0f) * 0.5f;
+                Vector2 offsetS = offset * scale + new Vector2(cam.WorldView.Width, cam.WorldView.Height) * (1.0f - scale) * 0.5f - new Vector2(256.0f * i);
+                while (offsetS.X <= -1024.0f*scale) offsetS.X += 1024.0f*scale;
+                while (offsetS.X > 0.0f) offsetS.X -= 1024.0f*scale;
+                while (offsetS.Y <= -1024.0f*scale) offsetS.Y += 1024.0f*scale;
+                while (offsetS.Y > 0.0f) offsetS.Y -= 1024.0f*scale;
 
-                dustParticles.SourceRect = new Rectangle(
-                    (int)((offset.X - origin.X + (i * 256)) / scale),
-                    (int)((-offset.Y - origin.Y + (i * 256)) / scale),
-                    (int)((cam.WorldView.Width) / scale),
-                    (int)((cam.WorldView.Height) / scale));
-
-                spriteBatch.Draw(dustParticles.Texture,
-                    new Vector2(cam.WorldViewCenter.X, -cam.WorldViewCenter.Y),
-                    dustParticles.SourceRect, Color.White * alpha, 0.0f,
-                    new Vector2(cam.WorldView.Width, cam.WorldView.Height) * 0.5f / scale, scale, SpriteEffects.None, 1.0f - scale);
+                Rectangle srcRect = new Rectangle(0, 0, 2048, 2048);
+                dustParticles.DrawTiled(spriteBatch, origin + offsetS, new Vector2(cam.WorldView.Width - offsetS.X, cam.WorldView.Height - offsetS.Y), Vector2.Zero, srcRect, Color.White * alpha, new Vector2(scale));
             }
 
             spriteBatch.End();

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

@@ -1,4 +1,4 @@
-using Microsoft.Xna.Framework;
+using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Content;
 using Microsoft.Xna.Framework.Graphics;
 using System;
@@ -13,7 +13,11 @@ namespace Barotrauma
 
         public VertexPositionTexture[] vertices = new VertexPositionTexture[DefaultBufferSize];
 
-        private Effect waterEffect;
+        public Effect waterEffect
+        {
+            get;
+            private set;
+        }
         private BasicEffect basicEffect;
 
         public int PositionInBuffer = 0;
@@ -93,7 +97,7 @@ namespace Barotrauma
 
             basicEffect.CurrentTechnique.Passes[0].Apply();
 
-            graphicsDevice.SamplerStates[0] = SamplerState.LinearWrap;
+            graphicsDevice.SamplerStates[0] = SamplerState.PointWrap;
             graphicsDevice.DrawUserPrimitives<VertexPositionTexture>(PrimitiveType.TriangleList, vertices, 0, vertices.Length / 3);
         }