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

Fixed inconsistent decal draw order

Browse Source
This commit is contained in:
Joonas Rikkonen
2018-02-13 12:28:54 +02:00
parent fa52c66788
commit ff7f43ca83
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaClient/Source/Map/Hull.cs
+3 -1
View File
@@ -191,9 +191,11 @@ namespace Barotrauma
Rectangle hullDrawRect = rect; Rectangle hullDrawRect = rect;
if (Submarine != null) hullDrawRect.Location += Submarine.DrawPosition.ToPoint(); if (Submarine != null) hullDrawRect.Location += Submarine.DrawPosition.ToPoint();
float depth = 1.0f;
foreach (Decal d in decals) foreach (Decal d in decals)
{ {
d.Draw(spriteBatch, this); d.Draw(spriteBatch, this, depth);
depth -= 0.000001f;
} }
} }
Barotrauma/BarotraumaClient/Source/Particles/Decal.cs
+2 -2
View File
@@ -105,13 +105,13 @@ namespace Barotrauma.Particles
fadeTimer = Prefab.FadeInTime; fadeTimer = Prefab.FadeInTime;
} }
public void Draw(SpriteBatch spriteBatch, Hull hull) public void Draw(SpriteBatch spriteBatch, Hull hull, float depth)
{ {
Vector2 drawPos = position + hull.Rect.Location.ToVector2(); Vector2 drawPos = position + hull.Rect.Location.ToVector2();
drawPos += hull.Submarine.DrawPosition; drawPos += hull.Submarine.DrawPosition;
drawPos.Y = -drawPos.Y; drawPos.Y = -drawPos.Y;
spriteBatch.Draw(Sprite.Texture, drawPos, clippedSourceRect, Color * GetAlpha(), 0, Vector2.Zero, scale, SpriteEffects.None, 1); spriteBatch.Draw(Sprite.Texture, drawPos, clippedSourceRect, Color * GetAlpha(), 0, Vector2.Zero, scale, SpriteEffects.None, depth);
} }
private float GetAlpha() private float GetAlpha()