Merge remote-tracking branch 'refs/remotes/barotrauma/master'

Conflicts: Subsurface/Barotrauma.csproj Subsurface/Source/Screens/GameScreen.cs
2016-09-26 17:03:14 -03:00
parent bc5ace4f53 790212a20b
commit 0ef813f189
32 changed files with 2293 additions and 1781 deletions
@@ -442,6 +442,18 @@ namespace Barotrauma
                float wallImpact = Vector2.Dot(Velocity, -collisionNormal);

                ApplyImpact(wallImpact, -collisionNormal, contact);
+
+                Vector2 n;
+                FixedArray2<Vector2> particlePos;
+                contact.GetWorldManifold(out n, out particlePos);
+                
+                int particleAmount = (int)(wallImpact*10.0f);
+                for (int i = 0; i < particleAmount; i++)
+                {
+                    var particle = GameMain.ParticleManager.CreateParticle("iceshards",
+                        ConvertUnits.ToDisplayUnits(particlePos[0]) + Rand.Vector(Rand.Range(1.0f, 50.0f)), 
+                        Rand.Vector(Rand.Range(50.0f,500.0f)) + Velocity);
+                }
            
                return true;
            }