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

Fixed: MoveSprite Refactored: All Modifications now use Form1.DoModification

Browse Source
This commit is contained in:
quinnvoker
2018-12-31 08:56:41 -08:00
parent 70d7680cf0
commit 306a8ed808
2 changed files with 24 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
AnimationEditor/Form1.cs
+20 -41
View File
@@ -61,13 +61,18 @@ namespace AnimationEditor
animationPreview.SpriteDragCompleted += animationPreview_SpriteDragComplete; animationPreview.SpriteDragCompleted += animationPreview_SpriteDragComplete;
} }
private void DoModification(IModification mod)
{
ModHelper.DoModificationWithSelectionTracking(mod, animationBox, frameListBox, frameSpriteListBox);
undoHistory.Add(mod);
}
private void animationPreview_SpriteDragComplete(object sender, EventArgs e) private void animationPreview_SpriteDragComplete(object sender, EventArgs e)
{ {
var args = e as SpriteDragArgs; var args = e as SpriteDragArgs;
var mod = new MoveSprite(frameSprites, frameSpriteListBox, args.DragDistance); var mod = new MoveSprite(frameSprites, frameSpriteListBox, args.DragDistance);
mod.Undo(); mod.Undo();
ModHelper.DoModificationWithSelectionTracking(mod, animationBox, frameListBox, frameSpriteListBox); DoModification(mod);
undoHistory.Add(mod);
} }
private void frameListBox_SetSingleSelection(int index) private void frameListBox_SetSingleSelection(int index)
@@ -116,9 +121,7 @@ namespace AnimationEditor
private void AddFrame(Frame frameToAdd) private void AddFrame(Frame frameToAdd)
{ {
var modification = new AddFrame(frames, frameListBox, frameToAdd); DoModification(new AddFrame(frames, frameListBox, frameToAdd));
ModHelper.DoModificationWithSelectionTracking(modification, animationBox, frameListBox, frameSpriteListBox);
undoHistory.Add(modification);
UpdateAnimation(); UpdateAnimation();
} }
@@ -287,9 +290,7 @@ namespace AnimationEditor
{ {
if (reading || tracking) if (reading || tracking)
return; return;
var mod = new ChangeFrameDelay(frames, frameListBox, (float)delayInputBox.Value / frameRate); DoModification(new ChangeFrameDelay(frames, frameListBox, (float)delayInputBox.Value / frameRate));
ModHelper.DoModificationWithSelectionTracking(mod, animationBox, frameListBox, frameSpriteListBox);
undoHistory.Add(mod);
} }
private void loadSpriteSheetToolStripMenuItem_Click(object sender, EventArgs e) private void loadSpriteSheetToolStripMenuItem_Click(object sender, EventArgs e)
@@ -412,9 +413,7 @@ namespace AnimationEditor
private void MoveFrame(BindingList<Frame> frameList, ListBox frameBox, int dir) private void MoveFrame(BindingList<Frame> frameList, ListBox frameBox, int dir)
{ {
var mod = new ReorderFrame(frameList, frameBox, dir); DoModification(new ReorderFrame(frameList, frameBox, dir));
ModHelper.DoModificationWithSelectionTracking(mod, animationBox, frameListBox, frameSpriteListBox);
undoHistory.Add(mod);
UpdateAnimation(); UpdateAnimation();
} }
@@ -422,9 +421,7 @@ namespace AnimationEditor
{ {
if(frameListBox.SelectedIndices.Count == 1 && frameListBox.SelectedIndex > -1 && frameListBox.SelectedIndex < frames.Count) if(frameListBox.SelectedIndices.Count == 1 && frameListBox.SelectedIndex > -1 && frameListBox.SelectedIndex < frames.Count)
{ {
var mod = new RemoveFrame(frames, frameListBox, frameListBox.SelectedIndex); DoModification(new RemoveFrame(frames, frameListBox, frameListBox.SelectedIndex));
ModHelper.DoModificationWithSelectionTracking(mod, animationBox, frameListBox, spriteListBox);
undoHistory.Add(mod);
UpdateAnimation(); UpdateAnimation();
} }
} }
@@ -463,9 +460,7 @@ namespace AnimationEditor
private void AddAnimation(Animation anim) private void AddAnimation(Animation anim)
{ {
var mod = new AddAnimation(animations, animationBox, anim); DoModification(new AddAnimation(animations, animationBox, anim));
ModHelper.DoModificationWithSelectionTracking(mod, animationBox, frameListBox, frameSpriteListBox);
undoHistory.Add(mod);
} }
private void animationBox_SelectedIndexChanged(object sender, EventArgs e) private void animationBox_SelectedIndexChanged(object sender, EventArgs e)
@@ -484,9 +479,7 @@ namespace AnimationEditor
{ {
if (animationBox.SelectedIndex > -1 && animationBox.SelectedIndex < animations.Count) if (animationBox.SelectedIndex > -1 && animationBox.SelectedIndex < animations.Count)
{ {
var mod = new RemoveAnimation(animations, animationBox, animationBox.SelectedIndex); DoModification(new RemoveAnimation(animations, animationBox, animationBox.SelectedIndex));
ModHelper.DoModificationWithSelectionTracking(mod, animationBox, frameListBox, frameSpriteListBox);
undoHistory.Add(mod);
ReadAnimationInfo(); ReadAnimationInfo();
UpdateAnimation(); UpdateAnimation();
} }
@@ -664,18 +657,14 @@ namespace AnimationEditor
private void SetSpritePosition() private void SetSpritePosition()
{ {
var mod = new SetSpritePosition(frameSprites, frameSpriteListBox, new Vector2((float)spriteXPosBox.Value, (float)spriteYPosBox.Value)); DoModification(new SetSpritePosition(frameSprites, frameSpriteListBox, new Vector2((float)spriteXPosBox.Value, (float)spriteYPosBox.Value)));
ModHelper.DoModificationWithSelectionTracking(mod, animationBox, frameListBox, frameSpriteListBox);
undoHistory.Add(mod);
} }
private void addSpriteToFrameSpritesButton_Click(object sender, EventArgs e) private void addSpriteToFrameSpritesButton_Click(object sender, EventArgs e)
{ {
var spriteToAdd = spriteSet[spriteListBox.SelectedIndex].Clone(); var spriteToAdd = spriteSet[spriteListBox.SelectedIndex].Clone();
var mod = new AddSprite(frameSprites, frameSpriteListBox, currentFrame, spriteToAdd); DoModification(new AddSprite(frameSprites, frameSpriteListBox, currentFrame, spriteToAdd));
ModHelper.DoModificationWithSelectionTracking(mod, animationBox, frameListBox, frameSpriteListBox);
undoHistory.Add(mod);
} }
private void addEmptyFrameButton_Click(object sender, EventArgs e) private void addEmptyFrameButton_Click(object sender, EventArgs e)
@@ -698,9 +687,7 @@ namespace AnimationEditor
if (changed) if (changed)
{ {
var mod = new RenameFrame(frames, frameListBox, frameNameBox.Text); DoModification(new RenameFrame(frames, frameListBox, frameNameBox.Text));
ModHelper.DoModificationWithSelectionTracking(mod, animationBox, frameListBox, frameSpriteListBox);
undoHistory.Add(mod);
} }
} }
@@ -722,9 +709,7 @@ namespace AnimationEditor
private void MoveSprite(BindingList<Sprite> spriteList, ListBox spriteBox, int dir) private void MoveSprite(BindingList<Sprite> spriteList, ListBox spriteBox, int dir)
{ {
var mod = new ReorderSprite(spriteList, spriteBox, dir); DoModification(new ReorderSprite(spriteList, spriteBox, dir));
ModHelper.DoModificationWithSelectionTracking(mod, animationBox, frameListBox, frameSpriteListBox);
undoHistory.Add(mod);
UpdateAnimation(); UpdateAnimation();
} }
@@ -732,9 +717,7 @@ namespace AnimationEditor
{ {
if (frameSpriteListBox.SelectedIndex > -1 && frameSpriteListBox.SelectedIndex < frameSprites.Count) if (frameSpriteListBox.SelectedIndex > -1 && frameSpriteListBox.SelectedIndex < frameSprites.Count)
{ {
var mod = new RemoveSprite(frameSprites, frameSpriteListBox, frameSpriteListBox.SelectedIndex); DoModification(new RemoveSprite(frameSprites, frameSpriteListBox, frameSpriteListBox.SelectedIndex));
ModHelper.DoModificationWithSelectionTracking(mod, animationBox, frameListBox, frameSpriteListBox);
undoHistory.Add(mod);
UpdateAnimation(); UpdateAnimation();
} }
} }
@@ -752,9 +735,7 @@ namespace AnimationEditor
private void replaceSpriteButton_Click(object sender, EventArgs e) private void replaceSpriteButton_Click(object sender, EventArgs e)
{ {
var mod = new ReplaceSprite(frameSprites, frameSpriteListBox.SelectedIndex, spriteSet[spriteListBox.SelectedIndex]); DoModification(new ReplaceSprite(frameSprites, frameSpriteListBox.SelectedIndex, spriteSet[spriteListBox.SelectedIndex]));
ModHelper.DoModificationWithSelectionTracking(mod, animationBox, frameListBox, frameSpriteListBox);
undoHistory.Add(mod);
UpdateAnimation(); UpdateAnimation();
} }
@@ -772,9 +753,7 @@ namespace AnimationEditor
private void UpdateAnimationName() private void UpdateAnimationName()
{ {
var mod = new RenameAnimation(animations, animationBox.SelectedIndex, animationNameBox.Text); DoModification(new RenameAnimation(animations, animationBox.SelectedIndex, animationNameBox.Text));
ModHelper.DoModificationWithSelectionTracking(mod, animationBox, frameListBox, frameSpriteListBox);
undoHistory.Add(mod);
} }
private void animationNameBox_Leave(object sender, EventArgs e) private void animationNameBox_Leave(object sender, EventArgs e)
AnimationEditor/Modifications/MoveSprite.cs
+4
View File
@@ -26,6 +26,10 @@ namespace AnimationEditor.Modifications
sprites = spriteList; sprites = spriteList;
listBox = spriteListBox; listBox = spriteListBox;
indices = new List<int>(); indices = new List<int>();
foreach(int index in spriteListBox.SelectedIndices)
{
indices.Add(index);
}
dist = distance; dist = distance;
} }