38f1ddb...178a853: v0.8.9.1, removed content folder

This commit is contained in:
Joonas Rikkonen
2019-03-18 19:46:58 +02:00
parent 38f1ddb6fe
commit 6c0679c297
1054 changed files with 151673 additions and 144931 deletions
@@ -2,18 +2,31 @@
using Microsoft.Xna.Framework.Graphics;
using System.Collections.Generic;
using System.Xml.Linq;
using System.Linq;
using Barotrauma.Extensions;
namespace Barotrauma
{
public partial class Sprite
{
static List<Sprite> list = new List<Sprite>();
public static IEnumerable<Sprite> LoadedSprites
{
get { return list; }
}
private static HashSet<Sprite> list = new HashSet<Sprite>();
//the file from which the texture is loaded
//if two sprites use the same file, they share the same texture
string file;
private string file;
/// <summary>
/// Reference to the xml element from where the sprite was created. Can be null if the sprite was not defined in xml!
/// </summary>
public XElement SourceElement { get; private set; }
//the area in the texture that is supposed to be drawn
Rectangle sourceRect;
private Rectangle sourceRect;
//the offset used when drawing the sprite
protected Vector2 offset;
@@ -39,13 +52,34 @@ namespace Barotrauma
public float Depth
{
get { return depth; }
set { depth = MathHelper.Clamp(value, 0.0f, 1.0f); }
set { depth = MathHelper.Clamp(value, 0.001f, 0.999f); }
}
/// <summary>
/// In pixels
/// </summary>
public Vector2 Origin
{
get { return origin; }
set { origin = value; }
set
{
origin = value;
_relativeOrigin = new Vector2(origin.X / sourceRect.Width, origin.Y / sourceRect.Height);
}
}
private Vector2 _relativeOrigin;
/// <summary>
/// 0 - 1
/// </summary>
public Vector2 RelativeOrigin
{
get => _relativeOrigin;
set
{
_relativeOrigin = value;
origin = new Vector2(_relativeOrigin.X * sourceRect.Width, _relativeOrigin.Y * sourceRect.Height);
}
}
public string FilePath
@@ -58,69 +92,80 @@ namespace Barotrauma
return FilePath + ": " + sourceRect;
}
partial void LoadTexture(ref Vector4 sourceVector, ref bool shouldReturn);
public string ID { get; private set; }
/// <summary>
/// ID of the Map Entity so that we can link the sprite to it's owner.
/// </summary>
public string EntityID { get; set; }
public string Name { get; set; }
partial void LoadTexture(ref Vector4 sourceVector, ref bool shouldReturn, bool premultiplyAlpha = true);
partial void CalculateSourceRect();
// TODO: use the Init method below?
public Sprite(XElement element, string path = "", string file = "")
{
SourceElement = element;
if (file == "")
{
file = element.GetAttributeString("texture", "");
file = SourceElement.GetAttributeString("texture", "");
}
if (file == "")
{
DebugConsole.ThrowError("Sprite " + element + " doesn't have a texture specified!");
DebugConsole.ThrowError("Sprite " + SourceElement + " doesn't have a texture specified!");
return;
}
if (!string.IsNullOrEmpty(path))
{
if (!path.EndsWith("/")) path += "/";
}
this.file = path + file;
Vector4 sourceVector = element.GetAttributeVector4("sourcerect", Vector4.Zero);
Name = SourceElement.GetAttributeString("name", null);
Vector4 sourceVector = SourceElement.GetAttributeVector4("sourcerect", Vector4.Zero);
bool shouldReturn = false;
LoadTexture(ref sourceVector, ref shouldReturn);
LoadTexture(ref sourceVector, ref shouldReturn, SourceElement.GetAttributeBool("premultiplyalpha", false));
if (shouldReturn) return;
sourceRect = new Rectangle(
(int)sourceVector.X, (int)sourceVector.Y,
(int)sourceVector.Z, (int)sourceVector.W);
origin = element.GetAttributeVector2("origin", new Vector2(0.5f, 0.5f));
origin.X = origin.X * sourceRect.Width;
origin.Y = origin.Y * sourceRect.Height;
size = element.GetAttributeVector2("size", Vector2.One);
sourceRect = new Rectangle((int)sourceVector.X, (int)sourceVector.Y, (int)sourceVector.Z, (int)sourceVector.W);
size = SourceElement.GetAttributeVector2("size", Vector2.One);
size.X *= sourceRect.Width;
size.Y *= sourceRect.Height;
Depth = element.GetAttributeFloat("depth", 0.0f);
RelativeOrigin = SourceElement.GetAttributeVector2("origin", new Vector2(0.5f, 0.5f));
Depth = SourceElement.GetAttributeFloat("depth", 0.001f);
ID = GetID(SourceElement);
list.Add(this);
}
public Sprite(string newFile, Vector2 newOrigin)
internal void LoadParams(SpriteParams spriteParams, bool isFlipped)
{
Init(newFile, newOrigin: newOrigin);
SourceElement = spriteParams.Element;
sourceRect = spriteParams.SourceRect;
RelativeOrigin = spriteParams.Origin;
if (isFlipped)
{
Origin = new Vector2(sourceRect.Width - origin.X, origin.Y);
}
depth = spriteParams.Depth;
// TODO: size?
}
public Sprite(string newFile, Vector2 newOrigin, bool preMultiplyAlpha = true)
{
Init(newFile, newOrigin: newOrigin, preMultiplyAlpha: preMultiplyAlpha);
list.Add(this);
}
public Sprite(string newFile, Rectangle? sourceRectangle, Vector2? newOffset = null, float newRotation = 0)
public Sprite(string newFile, Rectangle? sourceRectangle, Vector2? origin = null, float rotation = 0, bool preMultiplyAlpha = true)
{
Init(newFile, sourceRectangle: sourceRectangle, newOffset: newOffset, newRotation: newRotation);
Init(newFile, sourceRectangle: sourceRectangle, newOrigin: origin, newRotation: rotation, preMultiplyAlpha: preMultiplyAlpha);
list.Add(this);
}
private void Init(string newFile, Rectangle? sourceRectangle = null, Vector2? newOrigin = null, Vector2? newOffset = null, float newRotation = 0)
private void Init(string newFile, Rectangle? sourceRectangle = null, Vector2? newOrigin = null, Vector2? newOffset = null, float newRotation = 0,
bool preMultiplyAlpha = true)
{
file = newFile;
Vector4 sourceVector = Vector4.Zero;
bool shouldReturn = false;
LoadTexture(ref sourceVector, ref shouldReturn);
LoadTexture(ref sourceVector, ref shouldReturn, preMultiplyAlpha);
if (shouldReturn) return;
if (sourceRectangle.HasValue)
{
@@ -133,16 +178,23 @@ namespace Barotrauma
offset = newOffset ?? Vector2.Zero;
if (newOrigin.HasValue)
{
origin = new Vector2(sourceRect.Width * newOrigin.Value.X, sourceRect.Height * newOrigin.Value.Y);
RelativeOrigin = newOrigin.Value;
}
size = new Vector2(sourceRect.Width, sourceRect.Height);
rotation = newRotation;
if (!list.Contains(this))
{
list.Add(this);
}
}
/// <summary>
/// Creates a supposedly unique id from the parent element. If the parent element is not found, uses the sprite element.
/// TODO: If there are multiple elements with exactly the same data, the ids will fail. -> Is there a better way to identify the sprites?
/// </summary>
public static string GetID(XElement sourceElement)
{
if (sourceElement == null) { return string.Empty; }
var parentElement = sourceElement.Parent;
return parentElement != null ? sourceElement.ToString() + parentElement.ToString() : sourceElement.ToString();
}
public void Remove()
{
list.Remove(this);
@@ -151,6 +203,54 @@ namespace Barotrauma
}
partial void DisposeTexture();
/// <summary>
/// Works only if there is a name attribute defined for the sprite. For items and structures, the entity id or name is used if the sprite's name attribute is not defined.
/// </summary>
public void ReloadXML()
{
if (SourceElement == null) { return; }
string path = SourceElement.ParseContentPathFromUri();
if (string.IsNullOrWhiteSpace(path))
{
DebugConsole.NewMessage($"[Sprite] Could not parse the content path from the source element ({SourceElement}) uri: {SourceElement.BaseUri}", Color.Yellow);
return;
}
var doc = XMLExtensions.TryLoadXml(path);
if (doc == null || doc.Root == null) { return; }
if (string.IsNullOrWhiteSpace(Name) && string.IsNullOrWhiteSpace(EntityID)) { return; }
var spriteElements = doc.Descendants("sprite").Concat(doc.Descendants("Sprite"));
var sourceElements = spriteElements.Where(e => e.GetAttributeString("name", null) == Name);
if (sourceElements.None())
{
// Try parents by first comparing the entity id and then the name, if no match was found.
sourceElements = spriteElements.Where(e => e.Parent?.GetAttributeString("identifier", null) == EntityID);
if (sourceElements.None())
{
sourceElements = spriteElements.Where(e => e.Parent?.GetAttributeString("name", null) == Name);
}
}
if (sourceElements.Multiple())
{
DebugConsole.NewMessage($"[Sprite] Multiple matching elements found by name ({Name}) or identifier ({EntityID})! Cannot reload the xml for sprite element \"{SourceElement.ToString()}\"!", Color.Yellow);
}
else if (sourceElements.None())
{
DebugConsole.NewMessage($"[Sprite] Cannot find matching source element by comparing the name attribute ({Name}) or identifier ({EntityID})! Cannot reload the xml for sprite element \"{SourceElement.ToString()}\"!", Color.Yellow);
}
else
{
SourceElement = sourceElements.Single();
Vector4 sourceVector = SourceElement.GetAttributeVector4("sourcerect", Vector4.Zero);
sourceRect = new Rectangle((int)sourceVector.X, (int)sourceVector.Y, (int)sourceVector.Z, (int)sourceVector.W);
size = SourceElement.GetAttributeVector2("size", Vector2.One);
size.X *= sourceRect.Width;
size.Y *= sourceRect.Height;
RelativeOrigin = SourceElement.GetAttributeVector2("origin", new Vector2(0.5f, 0.5f));
Depth = SourceElement.GetAttributeFloat("depth", 0.001f);
ID = GetID(SourceElement);
}
}
}
}