mirror of
https://github.com/Ellpeck/MLEM.git
synced 2024-12-24 17:29:23 +01:00
allow data texture atlases to have an underlying texture region
This commit is contained in:
parent
9895be2250
commit
47cc589042
1 changed files with 15 additions and 12 deletions
|
@ -19,7 +19,7 @@ namespace MLEM.Data {
|
|||
/// <summary>
|
||||
/// The texture to use for this atlas
|
||||
/// </summary>
|
||||
public readonly Texture2D Texture;
|
||||
public readonly TextureRegion Texture;
|
||||
/// <summary>
|
||||
/// Returns the texture region with the given name, or null if it does not exist.
|
||||
/// </summary>
|
||||
|
@ -37,21 +37,23 @@ namespace MLEM.Data {
|
|||
|
||||
private readonly Dictionary<string, TextureRegion> regions = new Dictionary<string, TextureRegion>();
|
||||
|
||||
/// <summary>
|
||||
/// Creates a new data texture atlas with the given texture and region amount.
|
||||
/// </summary>
|
||||
/// <param name="texture">The texture to use for this atlas</param>
|
||||
public DataTextureAtlas(Texture2D texture) {
|
||||
private DataTextureAtlas(TextureRegion texture) {
|
||||
this.Texture = texture;
|
||||
}
|
||||
|
||||
internal static DataTextureAtlas Load(ContentManager content, string texturePath, string infoPath, bool pivotRelative) {
|
||||
var info = new FileInfo(Path.Combine(content.RootDirectory, infoPath ?? $"{texturePath}.atlas"));
|
||||
/// <summary>
|
||||
/// Loads a <see cref="DataTextureAtlas"/> from the given loaded texture and texture data file.
|
||||
/// </summary>
|
||||
/// <param name="texture">The texture to use for this data texture atlas</param>
|
||||
/// <param name="content">The content manager to use for loading</param>
|
||||
/// <param name="infoPath">The path, including extension, to the atlas info file</param>
|
||||
/// <param name="pivotRelative">If this value is true, then the pivot points passed in the info file will be relative to the coordinates of the texture region, not relative to the entire texture's origin.</param>
|
||||
/// <returns>A new data texture atlas with the given settings</returns>
|
||||
public static DataTextureAtlas LoadAtlasData(TextureRegion texture, ContentManager content, string infoPath, bool pivotRelative = false) {
|
||||
var info = new FileInfo(Path.Combine(content.RootDirectory, infoPath));
|
||||
string text;
|
||||
using (var reader = info.OpenText())
|
||||
text = reader.ReadToEnd();
|
||||
|
||||
var texture = content.Load<Texture2D>(texturePath);
|
||||
var atlas = new DataTextureAtlas(texture);
|
||||
|
||||
// parse each texture region: "<name> loc <u> <v> <w> <h> piv <px> <py>"
|
||||
|
@ -59,7 +61,7 @@ namespace MLEM.Data {
|
|||
foreach (Match match in Regex.Matches(text, regex)) {
|
||||
var name = match.Groups[1].Value.Trim();
|
||||
var loc = new Rectangle(
|
||||
int.Parse(match.Groups[2].Value), int.Parse(match.Groups[3].Value),
|
||||
int.Parse(match.Groups[2].Value) + texture.U, int.Parse(match.Groups[3].Value) + texture.V,
|
||||
int.Parse(match.Groups[4].Value), int.Parse(match.Groups[5].Value));
|
||||
var piv = Vector2.Zero;
|
||||
if (match.Groups[6].Success) {
|
||||
|
@ -92,7 +94,8 @@ namespace MLEM.Data {
|
|||
/// <param name="pivotRelative">If this value is true, then the pivot points passed in the info file will be relative to the coordinates of the texture region, not relative to the entire texture's origin.</param>
|
||||
/// <returns>A new data texture atlas with the given settings</returns>
|
||||
public static DataTextureAtlas LoadTextureAtlas(this ContentManager content, string texturePath, string infoPath = null, bool pivotRelative = false) {
|
||||
return DataTextureAtlas.Load(content, texturePath, infoPath, pivotRelative);
|
||||
var texture = new TextureRegion(content.Load<Texture2D>(texturePath));
|
||||
return DataTextureAtlas.LoadAtlasData(texture, content, infoPath ?? $"{texturePath}.atlas", pivotRelative);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue