Ellpeck/MLEM
1
0
Fork 0
mirror of https://github.com/Ellpeck/MLEM.git synced 2024-11-26 14:38:34 +01:00
Code Issues Projects Releases Wiki Activity

fixed pivot calculation being incorrect for data texture atlases with an offset

Browse source
This commit is contained in:
Ell 2020-12-19 23:09:26 +01:00
parent 47cc589042
commit c7430dd7ed
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
MLEM.Data/DataTextureAtlas.cs
View file

@ -5,6 +5,7 @@ using System.Text.RegularExpressions;
using Microsoft.Xna.Framework; using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework.Content; using Microsoft.Xna.Framework.Content;
using Microsoft.Xna.Framework.Graphics; using Microsoft.Xna.Framework.Graphics;
using MLEM.Extensions;
using MLEM.Textures; using MLEM.Textures;
namespace MLEM.Data { namespace MLEM.Data {
@ -61,7 +62,7 @@ namespace MLEM.Data {
foreach (Match match in Regex.Matches(text, regex)) { foreach (Match match in Regex.Matches(text, regex)) {
var name = match.Groups[1].Value.Trim(); var name = match.Groups[1].Value.Trim();
var loc = new Rectangle( var loc = new Rectangle(
int.Parse(match.Groups[2].Value) + texture.U, int.Parse(match.Groups[3].Value) + texture.V, int.Parse(match.Groups[2].Value), int.Parse(match.Groups[3].Value),
int.Parse(match.Groups[4].Value), int.Parse(match.Groups[5].Value)); int.Parse(match.Groups[4].Value), int.Parse(match.Groups[5].Value));
var piv = Vector2.Zero; var piv = Vector2.Zero;
if (match.Groups[6].Success) { if (match.Groups[6].Success) {
@ -69,7 +70,7 @@ namespace MLEM.Data {
float.Parse(match.Groups[6].Value, CultureInfo.InvariantCulture) - (pivotRelative ? 0 : loc.X), float.Parse(match.Groups[6].Value, CultureInfo.InvariantCulture) - (pivotRelative ? 0 : loc.X),
float.Parse(match.Groups[7].Value, CultureInfo.InvariantCulture) - (pivotRelative ? 0 : loc.Y)); float.Parse(match.Groups[7].Value, CultureInfo.InvariantCulture) - (pivotRelative ? 0 : loc.Y));
} }
atlas.regions.Add(name, new TextureRegion(texture, loc) { atlas.regions.Add(name, new TextureRegion(texture, loc.OffsetCopy(texture.Position)) {
PivotPixels = piv, PivotPixels = piv,
Name = name Name = name
}); });