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

Added: Tooltips; Changed: Cleaned up Button Layout, Made AnimationPreview's background match Control value;

Browse Source
This commit is contained in:
quinnvoker
2018-12-31 10:25:51 -08:00
parent 47a78bc9c1
commit 296e261135
4 changed files with 97 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
AnimationEditor/Form1.cs
+13 -13
View File
@@ -36,7 +36,7 @@ namespace AnimationEditor
}
private int frameRate;
private BindingList<Sprite> spriteSet;
private BindingList<Sprite> spriteMap;
private BindingList<Frame> frames;
private BindingList<Sprite> frameSprites;
private BindingList<Animation> animations;
@@ -112,9 +112,9 @@ namespace AnimationEditor
private void addSpriteToFrameListButton_Click(object sender, EventArgs e)
{
if (spriteListBox.SelectedItem != null)
if (spriteMapListBox.SelectedItem != null)
{
var spriteToAdd = spriteSet[spriteListBox.SelectedIndex].Clone();
var spriteToAdd = spriteMap[spriteMapListBox.SelectedIndex].Clone();
AddFrame(new Frame(spriteToAdd, importDelay));
}
}
@@ -178,7 +178,7 @@ namespace AnimationEditor
//update per-sprite controls
spritePosPanel.Enabled = singleSpriteSelected;
replaceSpriteButton.Enabled = singleSpriteSelected && spriteSet != null;
replaceSpriteButton.Enabled = singleSpriteSelected && spriteMap != null;
moveSpriteDownButton.Enabled = singleSpriteSelected;
moveSpriteUpButton.Enabled = singleSpriteSelected;
removeSpriteButton.Enabled = singleSpriteSelected;
@@ -211,9 +211,9 @@ namespace AnimationEditor
private void spriteListBox_SelectedIndexChanged(object sender, EventArgs e)
{
if (spriteListBox.SelectedItem != null)
if (spriteMapListBox.SelectedItem != null)
{
var currentSprite = (Sprite)spriteListBox.SelectedItem;
var currentSprite = (Sprite)spriteMapListBox.SelectedItem;
Stream texture2DToImageStream = new MemoryStream();
Texture2DRegionExtractor.GetTexture2DFromRegion(spriteSheet, spriteSheet.GraphicsDevice, currentSprite.Bounds)
.SaveAsPng(texture2DToImageStream, currentSprite.Bounds.Width, currentSprite.Bounds.Height);
@@ -319,15 +319,15 @@ namespace AnimationEditor
loadedSpriteMap = IntermediateSerializer.Deserialize<Dictionary<string, Sprite>>(xmlRead, null);
}
spriteSet = new BindingList<Sprite>();
spriteMap = new BindingList<Sprite>();
foreach (KeyValuePair<string, Sprite> sprite in loadedSpriteMap)
{
spriteSet.Add(sprite.Value);
spriteMap.Add(sprite.Value);
}
spriteListBox.DataSource = spriteSet;
spriteListBox.DisplayMember = "Name";
spriteListBox.ValueMember = "Bounds";
spriteMapListBox.DataSource = spriteMap;
spriteMapListBox.DisplayMember = "Name";
spriteMapListBox.ValueMember = "Bounds";
//enable spriteMap-required controls
addSpriteToFrameListButton.Enabled = true;
@@ -662,7 +662,7 @@ namespace AnimationEditor
private void addSpriteToFrameSpritesButton_Click(object sender, EventArgs e)
{
var spriteToAdd = spriteSet[spriteListBox.SelectedIndex].Clone();
var spriteToAdd = spriteMap[spriteMapListBox.SelectedIndex].Clone();
DoModification(new AddSprite(frameSprites, frameSpriteListBox, currentFrame, spriteToAdd));
}
@@ -735,7 +735,7 @@ namespace AnimationEditor
private void replaceSpriteButton_Click(object sender, EventArgs e)
{
DoModification(new ReplaceSprite(frameSprites, frameSpriteListBox.SelectedIndex, spriteSet[spriteListBox.SelectedIndex]));
DoModification(new ReplaceSprite(frameSprites, frameSpriteListBox.SelectedIndex, spriteMap[spriteMapListBox.SelectedIndex]));
UpdateAnimation();
}