f8b0295...0671290

Barotrauma/BarotraumaClient/Source/Map/Hull.cs

@@ -599,61 +599,5 @@ namespace Barotrauma
                 }
             }
         }
-
-        public void ClientRead(ServerNetObject type, NetBuffer message, float sendingTime)
-        {
-            float newWaterVolume = message.ReadRangedSingle(0.0f, 1.5f, 8) * Volume;
-            float newOxygenPercentage = message.ReadRangedSingle(0.0f, 100.0f, 8);
-
-            bool hasFireSources = message.ReadBoolean();
-            int fireSourceCount = 0;
-            List<Vector3> newFireSources = new List<Vector3>();
-            if (hasFireSources)
-            {
-                fireSourceCount = message.ReadRangedInteger(0, 16);
-                for (int i = 0; i < fireSourceCount; i++)
-                {
-                    newFireSources.Add(new Vector3(
-                        MathHelper.Clamp(message.ReadRangedSingle(0.0f, 1.0f, 8), 0.05f, 0.95f),
-                        MathHelper.Clamp(message.ReadRangedSingle(0.0f, 1.0f, 8), 0.05f, 0.95f),
-                        message.ReadRangedSingle(0.0f, 1.0f, 8)));
-                }
-            }
-
-            if (serverUpdateDelay > 0.0f) { return; }
-
-            WaterVolume = newWaterVolume;
-            OxygenPercentage = newOxygenPercentage;
-            
-            for (int i = 0; i < fireSourceCount; i++)
-            {
-                Vector2 pos = new Vector2(
-                    rect.X + rect.Width * newFireSources[i].X,
-                    rect.Y - rect.Height + (rect.Height * newFireSources[i].Y));
-                float size = newFireSources[i].Z * rect.Width;
-
-                var newFire = i < FireSources.Count ?
-                    FireSources[i] :
-                    new FireSource(Submarine == null ? pos : pos + Submarine.Position, null, true);
-                newFire.Position = pos;
-                newFire.Size = new Vector2(size, newFire.Size.Y);
-
-                //ignore if the fire wasn't added to this room (invalid position)?
-                if (!FireSources.Contains(newFire))
-                {
-                    newFire.Remove();
-                    continue;
-                }
-            }
-
-            for (int i = FireSources.Count - 1; i >= fireSourceCount; i--)
-            {
-                FireSources[i].Remove();
-                if (i < FireSources.Count)
-                {
-                    FireSources.RemoveAt(i);
-                }
-            }
-        }        
     }
 }

Barotrauma/BarotraumaClient/Source/Map/Levels/LevelObjects/LevelObject.cs

@@ -211,7 +211,7 @@ namespace Barotrauma
                 }
                 else if (SoundChannels[i] != null && SoundChannels[i].IsPlaying)
                 {
-                    SoundChannels[i].Dispose();
+                    SoundChannels[i].FadeOutAndDispose();
                     SoundChannels[i] = null;
                 }
             }

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

@@ -43,11 +43,19 @@ namespace Barotrauma.Lights
             get;
             private set;
         }
+        public RenderTarget2D HighlightMap
+        {
+            get;
+            private set;
+        }
+
+        private readonly Texture2D highlightRaster;
 
         private BasicEffect lightEffect;
 
         public Effect LosEffect { get; private set; }
-        
+        public Effect SolidColorEffect { get; private set; }
+
         private List<LightSource> lights;
 
         public bool LosEnabled = true;
@@ -58,7 +66,6 @@ namespace Barotrauma.Lights
         public bool ObstructVision;
 
         private Texture2D visionCircle;
-
         
         private Dictionary<Hull, Color> hullAmbientLights;
         private Dictionary<Hull, Color> smoothedHullAmbientLights;
@@ -73,6 +80,8 @@ namespace Barotrauma.Lights
 
             visionCircle = Sprite.LoadTexture("Content/Lights/visioncircle.png");
 
+            highlightRaster = Sprite.LoadTexture("Content/UI/HighlightRaster.png");
+
             CreateRenderTargets(graphics);
             GameMain.Instance.OnResolutionChanged += () =>
             {
@@ -81,8 +90,10 @@ namespace Barotrauma.Lights
 
 #if WINDOWS
             LosEffect = content.Load<Effect>("Effects/losshader");
+            SolidColorEffect = content.Load<Effect>("Effects/solidcolor");
 #else
             LosEffect = content.Load<Effect>("Effects/losshader_opengl");
+            SolidColorEffect = content.Load<Effect>("Effects/solidcolor_opengl");
 #endif
 
             if (lightEffect == null)
@@ -117,6 +128,12 @@ namespace Barotrauma.Lights
                        pp.BackBufferFormat, pp.DepthStencilFormat, pp.MultiSampleCount,
                        RenderTargetUsage.DiscardContents);
 
+            HighlightMap?.Dispose();
+            HighlightMap = new RenderTarget2D(graphics,
+                       (int)(GameMain.GraphicsWidth * GameMain.Config.LightMapScale), (int)(GameMain.GraphicsHeight * GameMain.Config.LightMapScale), false,
+                       pp.BackBufferFormat, pp.DepthStencilFormat, pp.MultiSampleCount,
+                       RenderTargetUsage.DiscardContents);
+
             LosTexture?.Dispose();
             LosTexture = new RenderTarget2D(graphics, (int)(GameMain.GraphicsWidth * GameMain.Config.LightMapScale), (int)(GameMain.GraphicsHeight * GameMain.Config.LightMapScale), false, SurfaceFormat.Color, DepthFormat.None);
         }
@@ -176,7 +193,7 @@ namespace Barotrauma.Lights
         public void UpdateLightMap(GraphicsDevice graphics, SpriteBatch spriteBatch, Camera cam, RenderTarget2D backgroundObstructor = null)
         {
             if (!LightingEnabled) return;
-
+            
             if (Math.Abs(currLightMapScale - GameMain.Config.LightMapScale) > 0.01f)
             {
                 //lightmap scale has changed -> recreate render targets
@@ -187,6 +204,8 @@ namespace Barotrauma.Lights
             Matrix transform = cam.ShaderTransform
                 * Matrix.CreateOrthographic(GameMain.GraphicsWidth, GameMain.GraphicsHeight, -1, 1) * 0.5f;
 
+            bool highlightsVisible = UpdateHighlights(graphics, spriteBatch, spriteBatchTransform, cam);
+
             if (GameMain.Config.SpecularityEnabled)
             {
                 UpdateSpecularMap(graphics, spriteBatch, spriteBatchTransform, cam, backgroundObstructor);
@@ -211,7 +230,6 @@ namespace Barotrauma.Lights
             graphics.Clear(Color.Black);
             graphics.BlendState = BlendState.Additive;
 
-
             //draw background lights
             //---------------------------------------------------------------------------------------------------
             bool backgroundSpritesDrawn = false;
@@ -260,31 +278,7 @@ namespace Barotrauma.Lights
             //draw the focused item and character to highlight them,
             //and light sprites (done before drawing the actual light volumes so we can make characters obstruct the highlights and sprites)
             //---------------------------------------------------------------------------------------------------
-            spriteBatch.Begin(SpriteSortMode.Deferred, BlendState.Additive, transformMatrix: spriteBatchTransform);
-            
-            if (Character.Controlled != null)
-            {
-                if (Character.Controlled.FocusedItem != null)
-                {
-                    Character.Controlled.FocusedItem.IsHighlighted = true;
-                }
-                if (Character.Controlled.FocusedCharacter != null)
-                {
-                    Character.Controlled.FocusedCharacter.Draw(spriteBatch, cam);
-                }
-
-                if (!GUI.DisableItemHighlights)
-                {
-                    foreach (Item item in Item.ItemList)
-                    {
-                        if (item.IsHighlighted)
-                        {
-                            item.Draw(spriteBatch, false, true);
-                        }
-                    }
-                }
-            }
-
+            spriteBatch.Begin(SpriteSortMode.Deferred, BlendState.Additive, transformMatrix: spriteBatchTransform);            
             foreach (LightSource light in activeLights)
             {
                 if (light.IsBackground) continue;
@@ -292,6 +286,13 @@ namespace Barotrauma.Lights
             }
             spriteBatch.End();
 
+            if (highlightsVisible)
+            {
+                spriteBatch.Begin(SpriteSortMode.Deferred, BlendState.Additive);
+                spriteBatch.Draw(HighlightMap, Vector2.Zero, Color.White);
+                spriteBatch.End();
+            }
+
             //draw characters to obstruct the highlighted items/characters and light sprites
             //---------------------------------------------------------------------------------------------------
             spriteBatch.Begin(SpriteSortMode.BackToFront, BlendState.AlphaBlend, transformMatrix: spriteBatchTransform);
@@ -377,13 +378,95 @@ namespace Barotrauma.Lights
             graphics.BlendState = BlendState.AlphaBlend;
         }
 
+        private readonly List<Entity> highlightedEntities = new List<Entity>();
+
+        private bool UpdateHighlights(GraphicsDevice graphics, SpriteBatch spriteBatch, Matrix spriteBatchTransform, Camera cam)
+        {
+            if (GUI.DisableItemHighlights) { return false; }
+
+            highlightedEntities.Clear();
+            if (Character.Controlled != null)
+            {
+                if (Character.Controlled.FocusedItem != null)
+                {
+                    highlightedEntities.Add(Character.Controlled.FocusedItem);
+                }
+                if (Character.Controlled.FocusedCharacter != null)
+                {
+                    highlightedEntities.Add(Character.Controlled.FocusedCharacter);
+                }
+                foreach (Item item in Item.ItemList)
+                {
+                    if (item.IsHighlighted && !highlightedEntities.Contains(item))
+                    {
+                        highlightedEntities.Add(item);
+                    }
+                }
+            }
+            if (highlightedEntities.Count == 0) { return false; }
+            
+            //draw characters in light blue first
+            graphics.SetRenderTarget(HighlightMap);
+            SolidColorEffect.CurrentTechnique = SolidColorEffect.Techniques["SolidColor"];
+            SolidColorEffect.Parameters["color"].SetValue(Color.LightBlue.ToVector4());
+            SolidColorEffect.CurrentTechnique.Passes[0].Apply();
+            DeformableSprite.Effect.CurrentTechnique = DeformableSprite.Effect.Techniques["DeformShaderSolidColor"];
+            DeformableSprite.Effect.Parameters["solidColor"].SetValue(Color.LightBlue.ToVector4());
+            DeformableSprite.Effect.CurrentTechnique.Passes[0].Apply();
+            spriteBatch.Begin(SpriteSortMode.Deferred, BlendState.Additive, samplerState: SamplerState.LinearWrap, effect: SolidColorEffect, transformMatrix: spriteBatchTransform);
+            foreach (Entity highlighted in highlightedEntities)
+            {
+                if (highlighted is Item item)
+                {
+                    item.Draw(spriteBatch, false, true);
+                }
+                else if (highlighted is Character character)
+                {
+                    character.Draw(spriteBatch, cam);
+                }
+            }
+            spriteBatch.End();
+
+            //draw characters in black with a bit of blur, leaving the white edges visible
+            float phase = (float)(Math.Sin(Timing.TotalTime * 3.0f) + 1.0f) / 2.0f; //phase oscillates between 0 and 1
+            Vector4 overlayColor = Color.Black.ToVector4() * MathHelper.Lerp(0.5f, 0.9f, phase);
+            SolidColorEffect.Parameters["color"].SetValue(overlayColor);
+            SolidColorEffect.CurrentTechnique = SolidColorEffect.Techniques["SolidColorBlur"];
+            SolidColorEffect.CurrentTechnique.Passes[0].Apply();
+            DeformableSprite.Effect.Parameters["solidColor"].SetValue(overlayColor);
+            DeformableSprite.Effect.CurrentTechnique.Passes[0].Apply();
+            spriteBatch.Begin(SpriteSortMode.Immediate, BlendState.AlphaBlend, samplerState: SamplerState.LinearWrap, effect: SolidColorEffect, transformMatrix: spriteBatchTransform);
+            foreach (Entity highlighted in highlightedEntities)
+            {
+                if (highlighted is Item item)
+                {
+                    SolidColorEffect.Parameters["blurDistance"].SetValue(0.02f);
+                    item.Draw(spriteBatch, false, true);
+                }
+                else if (highlighted is Character character)
+                {
+                    SolidColorEffect.Parameters["blurDistance"].SetValue(0.05f);
+                    character.Draw(spriteBatch, cam);
+                }
+            }
+            spriteBatch.End();
+
+            //raster pattern on top of everything
+            spriteBatch.Begin(blendState: BlendState.AlphaBlend, samplerState: SamplerState.LinearWrap);
+            spriteBatch.Draw(highlightRaster, new Rectangle(0, 0, HighlightMap.Width, HighlightMap.Height), new Rectangle(0, 0, HighlightMap.Width, HighlightMap.Height), Color.White * 0.5f);
+            spriteBatch.End();
+
+            DeformableSprite.Effect.CurrentTechnique = DeformableSprite.Effect.Techniques["DeformShader"];
+
+            return true;
+        }
 
         public void UpdateSpecularMap(GraphicsDevice graphics, SpriteBatch spriteBatch, Matrix spriteBatchTransform, Camera cam, RenderTarget2D backgroundObstructor = null)
         {
             graphics.SetRenderTarget(SpecularMap);
             
             //clear the lightmap
-            graphics.Clear(Color.Black);
+            graphics.Clear(Color.Gray);
             graphics.BlendState = BlendState.AlphaBlend;
 
             spriteBatch.Begin(sortMode: SpriteSortMode.Deferred, blendState: BlendState.AlphaBlend, transformMatrix: spriteBatchTransform);
@@ -394,20 +477,31 @@ namespace Barotrauma.Lights
             }
             spriteBatch.End();
 
-            //TODO: specular maps for level walls
             Level.Loaded?.Renderer?.RenderWalls(graphics, cam, specular: true);
 
-            spriteBatch.Begin(SpriteSortMode.Deferred, BlendState.AlphaBlend);
+            DeformableSprite.Effect.CurrentTechnique = DeformableSprite.Effect.Techniques["DeformShaderSolidColor"];
+            DeformableSprite.Effect.Parameters["solidColor"].SetValue(Color.Gray.ToVector4());
+            DeformableSprite.Effect.CurrentTechnique.Passes[0].Apply();
+
+            //obstruct specular maps behind the sub and characters by drawing them on the map in solid gray
+            SolidColorEffect.CurrentTechnique = SolidColorEffect.Techniques["SolidColor"];
+            SolidColorEffect.Parameters["color"].SetValue(Color.Gray.ToVector4());
+            SolidColorEffect.CurrentTechnique.Passes[0].Apply();
+            spriteBatch.Begin(SpriteSortMode.Deferred, BlendState.AlphaBlend, effect: SolidColorEffect);
             if (backgroundObstructor != null)
             {
                 spriteBatch.Draw(backgroundObstructor, new Rectangle(0, 0,
-                    (int)(GameMain.GraphicsWidth * currLightMapScale), (int)(GameMain.GraphicsHeight * currLightMapScale)), Color.Black);
+                    (int)(GameMain.GraphicsWidth * currLightMapScale), (int)(GameMain.GraphicsHeight * currLightMapScale)), Color.White);
+            }
+            foreach (Character c in Character.CharacterList)
+            {
+                if (c.Enabled) { c.Draw(spriteBatch, cam); }
             }
-            GUI.DrawRectangle(spriteBatch, new Rectangle(0, 0,
-                    (int)(GameMain.GraphicsWidth * currLightMapScale), (int)(GameMain.GraphicsHeight * currLightMapScale)),
-                    Color.White * 0.4f, isFilled: true);
             spriteBatch.End();
 
+
+            DeformableSprite.Effect.CurrentTechnique = DeformableSprite.Effect.Techniques["DeformShader"];
+
             graphics.SetRenderTarget(null);
             graphics.BlendState = BlendState.AlphaBlend;
         }

Barotrauma/BarotraumaClient/Source/Map/MapEntity.cs

@@ -549,7 +549,6 @@ namespace Barotrauma
 
             if ((PlayerInput.KeyDown(Keys.LeftControl) || PlayerInput.KeyDown(Keys.RightControl)))
             {
-                //TODO: a UI button for flipping entities
                 if (PlayerInput.KeyHit(Keys.N))
                 {
                     float minX = selectedList[0].WorldRect.X, maxX = selectedList[0].WorldRect.Right;

Barotrauma/BarotraumaClient/Source/Map/Structure.cs

@@ -92,15 +92,41 @@ namespace Barotrauma
             editingHUD = new GUIFrame(new RectTransform(new Vector2(0.3f, 0.25f), GUI.Canvas, Anchor.CenterRight) { MinSize = new Point(400, 0) }) { UserData = this };
             GUIListBox listBox = new GUIListBox(new RectTransform(new Vector2(0.95f, 0.8f), editingHUD.RectTransform, Anchor.Center), style: null);
             var editor = new SerializableEntityEditor(listBox.Content.RectTransform, this, inGame, showName: true, elementHeight: 20);
-            var reloadTextureButton = new GUIButton(new RectTransform(new Point(editingHUD.Rect.Width / 2, 20)), TextManager.Get("ReloadSprite"));
-            reloadTextureButton.OnClicked += (button, data) =>
-            {
-                Sprite.ReloadXML();
-                Sprite.ReloadTexture();
-                return true;
-            };
-            editor.AddCustomContent(reloadTextureButton, editor.ContentCount);
 
+            var buttonContainer = new GUILayoutGroup(new RectTransform(new Point(listBox.Content.Rect.Width, 20)), isHorizontal: true)
+            {
+                Stretch = true,
+                RelativeSpacing = 0.02f
+            };
+            new GUIButton(new RectTransform(new Vector2(0.25f, 1.0f), buttonContainer.RectTransform), TextManager.Get("MirrorEntityX"))
+            {
+                ToolTip = TextManager.Get("MirrorEntityXToolTip"),
+                OnClicked = (button, data) =>
+                {
+                    FlipX(relativeToSub: false);
+                    return true;
+                }
+            };
+            new GUIButton(new RectTransform(new Vector2(0.3f, 1.0f), buttonContainer.RectTransform), TextManager.Get("MirrorEntityY"))
+            {
+                ToolTip = TextManager.Get("MirrorEntityYToolTip"),
+                OnClicked = (button, data) =>
+                {
+                    FlipY(relativeToSub: false);
+                    return true;
+                }
+            };
+            var reloadTextureButton = new GUIButton(new RectTransform(new Vector2(0.3f, 1.0f), buttonContainer.RectTransform), TextManager.Get("ReloadSprite"))
+            {
+                OnClicked = (button, data) =>
+                {
+                    Sprite.ReloadXML();
+                    Sprite.ReloadTexture();
+                    return true;
+                }
+            };
+            editor.AddCustomContent(buttonContainer, editor.ContentCount);
+            
             PositionEditingHUD();
 
             return editingHUD;

Barotrauma/BarotraumaClient/Source/Map/Submarine.cs

@@ -405,6 +405,11 @@ namespace Barotrauma
                 errorMsgs.Add(TextManager.Get("NoBallastTagsWarning"));
             }
 
+            if (Gap.GapList.Any(g => g.linkedTo.Count == 0))
+            {
+                errorMsgs.Add(TextManager.Get("NonLinkedGapsWarning"));
+            }
+
             if (errorMsgs.Any())
             {
                 new GUIMessageBox(TextManager.Get("Warning"), string.Join("\n\n", errorMsgs), 400, 0);