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

Restruct: QURO << QURO.Animation; SpriteMapRegion -> Sprite: Now can draw itself

Browse Source
This commit is contained in:
quinnvoker
2018-12-19 09:16:17 -08:00
parent 06486e72fc
commit b8173d688d
19 changed files with 63 additions and 275 deletions
Download Patch File Download Diff File Expand all files Collapse all files
AnimationEditor/AnimationEditor.csproj
-4
View File
@@ -152,10 +152,6 @@
<None Include="App.config" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\QURO.AnimationLibrary\QURO.AnimationLibrary.csproj">
<Project>{69dadc27-fbeb-4625-9212-6eb5bed5102a}</Project>
<Name>QURO.AnimationLibrary</Name>
</ProjectReference>
<ProjectReference Include="..\QURO\QURO.csproj">
<Project>{4581e0c8-b14a-454d-9a7b-52d37535e7e9}</Project>
<Name>QURO</Name>
AnimationEditor/AnimationPreview.cs
+1 -1
View File
@@ -7,7 +7,7 @@ using System.Threading.Tasks;
using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework.Graphics;
using MonoGame.Forms.Controls;
using QURO.AnimationLibrary;
using QURO.Animation;
namespace AnimationEditor
{
AnimationEditor/Form1.cs
+14 -14
View File
@@ -11,7 +11,7 @@ using System.IO;
using System.Xml.Serialization;
using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework.Graphics;
using QURO.AnimationLibrary;
using QURO.Animation;
using QURO;
using System.Xml;
using Microsoft.Xna.Framework.Content.Pipeline.Serialization.Intermediate;
@@ -23,9 +23,9 @@ namespace AnimationEditor
private Texture2D spriteSheet;
private int frameRate;
private BindingList<SpriteMapRegion> sprites;
private BindingList<Sprite> sprites;
private BindingList<Frame> frames;
private BindingList<SpriteMapRegion> subSprites;
private BindingList<Sprite> subSprites;
private BindingList<Animation> animations;
private Animation currentAnimation;
@@ -82,7 +82,7 @@ namespace AnimationEditor
{
if (spriteListBox.SelectedItem != null)
{
AddFrame(new Frame((SpriteMapRegion)spriteListBox.SelectedItem, importDelay));
AddFrame(new Frame((Sprite)spriteListBox.SelectedItem, importDelay));
}
}
@@ -156,7 +156,7 @@ namespace AnimationEditor
{
if (spriteListBox.SelectedItem != null)
{
var currentSprite = (SpriteMapRegion)spriteListBox.SelectedItem;
var currentSprite = (Sprite)spriteListBox.SelectedItem;
Stream texture2DToImageStream = new MemoryStream();
Texture2DRegionExtractor.GetTexture2DFromRegion(spriteSheet, spriteSheet.GraphicsDevice, currentSprite.Bounds)
.SaveAsPng(texture2DToImageStream, currentSprite.Bounds.Width, currentSprite.Bounds.Height);
@@ -177,9 +177,9 @@ namespace AnimationEditor
}
subSpritePanel.Enabled = true;
if (currentFrame.SubSprites != null)
subSprites = new BindingList<SpriteMapRegion>(currentFrame.SubSprites);
subSprites = new BindingList<Sprite>(currentFrame.SubSprites);
else
subSprites = new BindingList<SpriteMapRegion>();
subSprites = new BindingList<Sprite>();
subSpriteListBox.DataSource = subSprites;
subSpriteListBox.DisplayMember = "Name";
UpdateFrameInformation();
@@ -221,18 +221,18 @@ namespace AnimationEditor
LoadSpriteMapFromFile();
}
private Dictionary<string, SpriteMapRegion> LoadSpriteMapFromFile()
private Dictionary<string, Sprite> LoadSpriteMapFromFile()
{
if (loadSpriteMapDialog.ShowDialog() == DialogResult.OK)
{
Dictionary<string, SpriteMapRegion> loadedSpriteMap;
Dictionary<string, Sprite> loadedSpriteMap;
using (XmlReader xmlRead = XmlReader.Create(loadSpriteMapDialog.FileName))
{
loadedSpriteMap = IntermediateSerializer.Deserialize<Dictionary<string, SpriteMapRegion>>(xmlRead, null);
loadedSpriteMap = IntermediateSerializer.Deserialize<Dictionary<string, Sprite>>(xmlRead, null);
}
sprites = new BindingList<SpriteMapRegion>();
foreach (KeyValuePair<string, SpriteMapRegion> sprite in loadedSpriteMap)
sprites = new BindingList<Sprite>();
foreach (KeyValuePair<string, Sprite> sprite in loadedSpriteMap)
{
sprites.Add(sprite.Value);
}
@@ -491,7 +491,7 @@ namespace AnimationEditor
using(XmlReader xmlRead = XmlReader.Create(loadSpriteMapDialog.FileName))
{
loadedSpriteMap = IntermediateSerializer.Deserialize<Dictionary<string, SpriteMapRegion>>(xmlRead, null);
loadedSpriteMap = IntermediateSerializer.Deserialize<Dictionary<string, Sprite>>(xmlRead, null);
}
int updateCounter = 0;
@@ -563,7 +563,7 @@ namespace AnimationEditor
currentFrame.SubSpritePositions = new List<Vector2>();
currentFrame.SubSpritePositions.Add(Vector2.Zero);
if (currentFrame.SubSprites == null)
currentFrame.SubSprites = new List<SpriteMapRegion>();
currentFrame.SubSprites = new List<Sprite>();
currentFrame.SubSprites.Add(spriteToAdd);
subSprites.Add(spriteToAdd);
}