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

Updated AnimatedSprite to support offsets and subsprites simultaneously

Browse Source
This commit is contained in:
quinnvoker
2018-12-09 15:52:41 -08:00
parent 0a02cde928
commit 06486e72fc
3 changed files with 88 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
AnimationEditor/Form1.cs
+43 -31
View File
@@ -31,17 +31,7 @@ namespace AnimationEditor
private Animation currentAnimation;
private Frame currentFrame;
private bool r;
private bool reading
{
get { return r; }
set
{
r = value;
Console.WriteLine("Reading: " + r);
}
}
private bool reading;
private float importDelay = 0;
public Form1()
@@ -92,29 +82,34 @@ namespace AnimationEditor
{
if (spriteListBox.SelectedItem != null)
{
int newSelectedIndex;
if (frames.Count == 1 && frames[0].Bounds == Microsoft.Xna.Framework.Rectangle.Empty)
{
frames.Clear();
}
if (frameListBox.SelectedItem == null || frameListBox.SelectedIndex == frames.Count - 1)
{
frames.Add(new Frame((SpriteMapRegion)spriteListBox.SelectedItem, importDelay));
frameTrackBar.Maximum = frames.Count - 1;
newSelectedIndex = frames.Count - 1;
}
else
{
frames.Insert(frameListBox.SelectedIndex + 1, new Frame((SpriteMapRegion)spriteListBox.SelectedItem, 0.25f));
newSelectedIndex = frameListBox.SelectedIndex + 1;
}
UpdateAnimation();
frameListBox_SetSingleSelection(newSelectedIndex);
AddFrame(new Frame((SpriteMapRegion)spriteListBox.SelectedItem, importDelay));
}
}
private void AddFrame(Frame frameToAdd)
{
int newSelectedIndex;
if (frames.Count == 1 && frames[0].Bounds == Microsoft.Xna.Framework.Rectangle.Empty)
{
frames.Clear();
}
if (frameListBox.SelectedItem == null || frameListBox.SelectedIndex == frames.Count - 1)
{
frames.Add(frameToAdd);
frameTrackBar.Maximum = frames.Count - 1;
newSelectedIndex = frames.Count - 1;
}
else
{
frames.Insert(frameListBox.SelectedIndex + 1, frameToAdd);
newSelectedIndex = frameListBox.SelectedIndex + 1;
}
UpdateAnimation();
frameListBox_SetSingleSelection(newSelectedIndex);
}
private void UpdateAnimation()
{
if(frames?.Count > 0)
@@ -510,6 +505,18 @@ namespace AnimationEditor
frame.Sprite = loadedSpriteMap[frame.Name];
updateCounter++;
}
if (frame.SubSprites != null)
{
for (int index = 0; index < frame.SubSprites.Count; index++)
{
var subSprite = frame.SubSprites[index];
if (loadedSpriteMap.ContainsKey(subSprite.Name))
{
frame.SubSprites[index] = loadedSpriteMap[subSprite.Name];
updateCounter++;
}
}
}
}
}
@@ -560,5 +567,10 @@ namespace AnimationEditor
currentFrame.SubSprites.Add(spriteToAdd);
subSprites.Add(spriteToAdd);
}
private void addEmptyFrameButton_Click(object sender, EventArgs e)
{
AddFrame(new Frame());
}
}
}