vlad.os/LuaCsForBarotraumaEP
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Using nonpremultiplied alpha when drawing damaged wall sections (-> no artifacts around windows anymore), particle collision optimization

Browse Source
This commit is contained in:
Regalis
2016-09-22 18:14:16 +03:00
parent 721f4ff5a6
commit 0ba69a3472
3 changed files with 12 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Subsurface/Source/Map/Structure.cs
View File

@@ -437,7 +437,7 @@ namespace Barotrauma
{
if (damageEffect != null)
{
float newCutoff = Math.Min((s.damage / prefab.MaxHealth), 0.65f);
float newCutoff = Math.Min((s.damage / prefab.MaxHealth), 0.65f);
if (Math.Abs(newCutoff - prevCutoff) > 0.01f)
{
@@ -539,7 +539,9 @@ namespace Barotrauma
var section = sections[sectionIndex];
int particleAmount = (int)(Math.Min(Health - section.damage, damage) * Rand.Range(0.1f, 1.0f));
int particleAmount = (int)(Math.Min(Health - section.damage, damage) * Rand.Range(0.01f, 1.0f));
particleAmount = Math.Min(particleAmount, 200);
for (int i = 0; i < particleAmount; i++)
{
Vector2 particlePos = new Vector2(

31
Subsurface/Source/Particles/Particle.cs
View File

@@ -38,9 +38,7 @@ namespace Barotrauma.Particles
private Vector2 drawPosition;
private float drawRotation;
//private float checkCollisionTimer;
private Hull currentHull;
private List<Gap> hullGaps;
@@ -75,7 +73,6 @@ namespace Barotrauma.Particles
public void Init(ParticlePrefab prefab, Vector2 position, Vector2 speed, float rotation, Hull hullGuess = null)
{
this.prefab = prefab;
spriteIndex = Rand.Int(prefab.Sprites.Count);
@@ -116,8 +113,6 @@ namespace Barotrauma.Particles
if (prefab.DeleteOnCollision || prefab.CollidesWithWalls)
{
hullGaps = currentHull == null ? new List<Gap>() : currentHull.ConnectedGaps;
//hullLimits = new List<Hull>();
//hullLimits = FindLimits(position);
}
if (prefab.RotateToDirection)
@@ -128,18 +123,6 @@ namespace Barotrauma.Particles
}
}
//private List<Hull> FindLimits(Vector2 position)
//{
// List<Hull> hullList = new List<Hull>();
// currentHull = Hull.FindHull(position);
// if (currentHull == null) return hullList;
// hullList.Add(currentHull);
// return FindAdjacentHulls(hullList, currentHull, Math.Abs(velocity.X) > Math.Abs(velocity.Y));
//}
public bool Update(float deltaTime)
{
prevPosition = position;
@@ -190,12 +173,13 @@ namespace Barotrauma.Particles
if (currentHull == null)
{
var collidedHull = Hull.FindHullOld(edgePos);
Hull collidedHull = Hull.FindHull(position);
if (collidedHull != null)
{
if (prefab.DeleteOnCollision) return false;
OnWallCollisionOutside(collidedHull);
}
}
}
else if (!Submarine.RectContains(currentHull.WorldRect, edgePos))
{
@@ -216,11 +200,11 @@ namespace Barotrauma.Particles
}
gapFound = true;
break;
}
if (!gapFound)
{
OnWallCollisionInside(currentHull, edgePos);
}
else
@@ -229,9 +213,8 @@ namespace Barotrauma.Particles
hullGaps = currentHull == null ? new List<Gap>() : currentHull.ConnectedGaps;
if (OnChangeHull != null) OnChangeHull(edgePos, currentHull);
}
}
}
}
}
lifeTime -= deltaTime;

2
Subsurface/Source/Screens/GameScreen.cs
View File

@@ -340,7 +340,7 @@ namespace Barotrauma
spriteBatch.End();
spriteBatch.Begin(SpriteSortMode.Immediate,
BlendState.AlphaBlend, SamplerState.LinearWrap,
BlendState.NonPremultiplied, SamplerState.LinearWrap,
null, null,
damageEffect,
cam.Transform);