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

Reduce duplicate code in Sprite constructors.

Browse Source
This commit is contained in:
itchyOwl
2018-04-06 15:56:32 +03:00
parent 1d30cbfac7
commit 9fc65298e8
2 changed files with 23 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Barotrauma/BarotraumaClient/Source/GUI/GUI.cs
View File

@@ -110,13 +110,13 @@ namespace Barotrauma
t = new Texture2D(graphicsDevice, 1, 1);
t.SetData(new Color[] { Color.White });// fill the texture with white
submarineIcon = new Sprite("Content/UI/uiIcons.png", new Rectangle(0, 192, 64, 64), null);
submarineIcon = new Sprite("Content/UI/uiIcons.png", new Rectangle(0, 192, 64, 64));
submarineIcon.Origin = submarineIcon.size / 2;
arrow = new Sprite("Content/UI/uiIcons.png", new Rectangle(80, 240, 16, 16), null);
arrow = new Sprite("Content/UI/uiIcons.png", new Rectangle(80, 240, 16, 16));
arrow.Origin = arrow.size / 2;
SpeechBubbleIcon = new Sprite("Content/UI/uiIcons.png", new Rectangle(0, 129, 65, 61), null);
SpeechBubbleIcon = new Sprite("Content/UI/uiIcons.png", new Rectangle(0, 129, 65, 61));
SpeechBubbleIcon.Origin = SpeechBubbleIcon.size / 2;
}

50
Barotrauma/BarotraumaShared/Source/Sprite/Sprite.cs
View File

@@ -26,7 +26,7 @@ namespace Barotrauma
public float rotation;
public SpriteEffects effects;
public SpriteEffects effects = SpriteEffects.None;
protected float depth;
@@ -61,6 +61,7 @@ namespace Barotrauma
partial void LoadTexture(ref Vector4 sourceVector, ref bool shouldReturn);
partial void CalculateSourceRect();
// TODO: use the Init method below?
public Sprite(XElement element, string path = "", string file = "")
{
if (file == "")
@@ -106,50 +107,39 @@ namespace Barotrauma
public Sprite(string newFile, Vector2 newOrigin)
{
file = newFile;
Vector4 sourceVector = Vector4.Zero;
bool shouldReturn = false;
LoadTexture(ref sourceVector, ref shouldReturn);
if (shouldReturn) return;
CalculateSourceRect();
size = new Vector2(sourceRect.Width, sourceRect.Height);
origin = new Vector2((float)sourceRect.Width * newOrigin.X, (float)sourceRect.Height * newOrigin.Y);
effects = SpriteEffects.None;
list.Add(this);
Init(newFile, newOrigin: newOrigin);
}
public Sprite(string newFile, Rectangle? sourceRectangle, Vector2? newOffset, float newRotation = 0.0f)
public Sprite(string newFile, Rectangle? sourceRectangle, Vector2? newOffset = null, float newRotation = 0)
{
Init(newFile, sourceRectangle: sourceRectangle, newOffset: newOffset, newRotation: newRotation);
}
private void Init(string newFile, Rectangle? sourceRectangle = null, Vector2? newOrigin = null, Vector2? newOffset = null, float newRotation = 0)
{
file = newFile;
Vector4 sourceVector = Vector4.Zero;
bool shouldReturn = false;
LoadTexture(ref sourceVector, ref shouldReturn);
if (shouldReturn) return;
if (sourceRectangle != null)
if (sourceRectangle.HasValue)
{
sourceRect = (Rectangle)sourceRectangle;
sourceRect = sourceRectangle.Value;
}
else
{
CalculateSourceRect();
}
offset = newOffset ?? Vector2.Zero;
size = new Vector2(sourceRect.Width, sourceRect.Height);
origin = Vector2.Zero;
offset = newOffset ?? Vector2.Zero;
if (newOrigin.HasValue)
{
origin = new Vector2(sourceRect.Width * newOrigin.Value.X, sourceRect.Height * newOrigin.Value.Y);
}
rotation = newRotation;
list.Add(this);
if (!list.Contains(this))
{
list.Add(this);
}
}
public void Remove()