(d88b2f1f7) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev

2019-04-29 21:08:16 +03:00
parent b3b1d1851d
commit c5452048d7
20 changed files with 66 additions and 58 deletions
@@ -1,6 +1,9 @@
 using Barotrauma.Extensions;
 using Barotrauma.Lights;
 using Barotrauma.Networking;
+using FarseerPhysics;
+using FarseerPhysics.Dynamics;
+using FarseerPhysics.Dynamics.Contacts;
 using Lidgren.Network;
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
@@ -165,6 +168,20 @@ namespace Barotrauma
            {
                Vector2 pos = ConvertUnits.ToDisplayUnits(f2.Body.Position);

+                int section = FindSectionIndex(pos);
+                if (section > -1)
+                {
+                    Vector2 normal = contact.Manifold.LocalNormal;
+
+                    float impact = Vector2.Dot(f2.Body.LinearVelocity, -normal) * f2.Body.Mass * 0.1f;
+                    if (impact > 10.0f)
+                    {
+                        SoundPlayer.PlayDamageSound("StructureBlunt", impact, SectionPosition(section, true), tags: Tags);
+                    }
+                }
+            }
+        }
+
        public override bool IsVisible(Rectangle worldView)
        {
            Rectangle worldRect = WorldRect;