merlin/quro-animation-tools
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Patched bug that caused Undoing MoveBounds operations to sometimes move sprite bounds out of range

Browse Source
This commit is contained in:
quinnvoker
2018-12-02 15:13:01 -08:00
parent 07669c2ccb
commit c0c757650c
6 changed files with 96 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SpriteMapEditor/SpriteMapModifications/MoveBounds.cs
+20 -7
View File
@@ -4,6 +4,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
using QURO;
using Microsoft.Xna.Framework;
namespace SpriteMapEditor.SpriteMapModifications
{
@@ -13,15 +14,17 @@ namespace SpriteMapEditor.SpriteMapModifications
private readonly int xDiff;
private readonly int yDiff;
private readonly List<Rectangle> oldBoundsList;
private List<int> preChangeSelection;
private List<int> postChangeSelection;
public MoveBounds(List<SpriteMapRegion> spritesToMove, int xDifference, int yDifference)
public MoveBounds(List<SpriteMapRegion> spritesToMove, int xDifference, int yDifference, List<Rectangle> preDragBounds = null)
{
sprites = spritesToMove.ToList();
xDiff = xDifference;
yDiff = yDifference;
oldBoundsList = preDragBounds.ToList();
}
public void Do()
@@ -36,12 +39,22 @@ namespace SpriteMapEditor.SpriteMapModifications
}
public void Undo()
{
foreach (SpriteMapRegion sprite in sprites)
if (oldBoundsList != null)
{
var newBounds = sprite.Bounds;
newBounds.X -= xDiff;
newBounds.Y -= yDiff;
sprite.Bounds = newBounds;
for(int index = 0; index < sprites.Count; index++)
{
sprites[index].Bounds = oldBoundsList[index];
}
}
else
{
foreach (SpriteMapRegion sprite in sprites)
{
var newBounds = sprite.Bounds;
newBounds.X -= xDiff;
newBounds.Y -= yDiff;
sprite.Bounds = newBounds;
}
}
}
@@ -64,7 +77,7 @@ namespace SpriteMapEditor.SpriteMapModifications
public override string ToString()
{
return "Move Sprite Bounds";
return "Move Sprite Bounds: (" + xDiff + ", " + yDiff + "), New Position of "+ sprites[0].Name +": (" + (sprites[0].Bounds.X) + ", " + (sprites[0].Bounds.Y) + ")";
}
}
}