LegacyConsole/PCK-Studio
4
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/PCK-Studio.git synced 2026-06-11 05:14:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updated Animation API and added AnimationHelper

Browse Source
This commit is contained in:
miku-666
2023-08-25 12:56:22 +02:00
parent 9faaf65601
commit 9c357d151a
7 changed files with 207 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

196
PCK-Studio/Forms/Editor/AnimationEditor.cs
View File

@@ -24,10 +24,9 @@ namespace PckStudio.Forms.Editor
{
public partial class AnimationEditor : MetroForm
{
private PckFile.FileData animationFile;
private Animation currentAnimation;
private Animation _animation;
private string TileName = string.Empty;
private string _tileName = string.Empty;
private bool IsSpecialTile(string tileName)
{
@@ -40,81 +39,56 @@ namespace PckStudio.Forms.Editor
toolStripSeparator1.Visible = saveToolStripMenuItem1.Visible = !Settings.Default.AutoSaveChanges;
}
internal AnimationEditor(Animation animation, string tileName)
internal AnimationEditor(Animation animation, string name)
: this()
{
currentAnimation = animation;
TileName = tileName;
_ = animation ?? throw new ArgumentNullException(nameof(animation));
_animation = animation;
_tileName = name;
}
public AnimationEditor(PckFile.FileData file)
: this()
internal AnimationEditor(Animation animation, string name, Color blendColor)
: this(animation, name)
{
animationFile = file;
TileName = Path.GetFileNameWithoutExtension(animationFile.Filename);
}
public AnimationEditor(PckFile.FileData file, Color blendColor)
: this(file)
{
animationPictureBox.UseBlendColor = true;
animationPictureBox.BlendColor = blendColor;
}
private void AnimationEditor_Load(object sender, EventArgs e)
{
bulkAnimationSpeedToolStripMenuItem.Enabled =
importToolStripMenuItem.Enabled =
exportAsToolStripMenuItem.Enabled =
InterpolationCheckbox.Visible = !IsSpecialTile(TileName);
InterpolationCheckbox.Visible = !IsSpecialTile(_tileName);
if (currentAnimation is null)
CreateAnimation();
SetTileLabel();
LoadAnimationTreeView();
}
private void CreateAnimation()
{
currentAnimation = new Animation(Array.Empty<Image>());
if (animationFile is not null && animationFile.Size > 0)
{
var texture = animationFile.GetTexture();
var frameTextures = texture.Split(ImageLayoutDirection.Vertical);
currentAnimation = animationFile.Properties.HasProperty("ANIM")
? new Animation(frameTextures, animationFile.Properties.GetPropertyValue("ANIM"))
: new Animation(frameTextures, string.Empty);
}
currentAnimation.Category = animationFile.Filename.Split('/').Contains("items")
? Animation.AnimationCategory.Items
: Animation.AnimationCategory.Blocks;
}
private void LoadAnimationTreeView()
{
if (currentAnimation is null)
if (_animation is null)
{
AnimationStartStopBtn.Enabled = false;
return;
}
AnimationStartStopBtn.Enabled = true;
InterpolationCheckbox.Checked = currentAnimation.Interpolate;
InterpolationCheckbox.Checked = _animation.Interpolate;
frameTreeView.Nodes.Clear();
TextureIcons.Images.Clear();
TextureIcons.Images.AddRange(currentAnimation.GetTextures().ToArray());
foreach (var frame in currentAnimation.GetFrames())
TextureIcons.Images.AddRange(_animation.GetTextures().ToArray());
foreach (var frame in _animation.GetFrames())
{
var imageIndex = currentAnimation.GetTextureIndex(frame.Texture);
var imageIndex = _animation.GetTextureIndex(frame.Texture);
frameTreeView.Nodes.Add(new TreeNode($"for {frame.Ticks} ticks")
{
ImageIndex = imageIndex,
SelectedImageIndex = imageIndex,
});
}
if (currentAnimation.FrameCount > 0)
if (_animation.FrameCount > 0)
{
animationPictureBox.SelectFrame(currentAnimation, 0);
animationPictureBox.SelectFrame(_animation, 0);
}
}
@@ -122,7 +96,7 @@ namespace PckStudio.Forms.Editor
{
if (animationPictureBox.IsPlaying)
AnimationStartStopBtn.Text = "Play Animation";
animationPictureBox.SelectFrame(currentAnimation, frameTreeView.SelectedNode.Index);
animationPictureBox.SelectFrame(_animation, frameTreeView.SelectedNode.Index);
}
private void AnimationStartStopBtn_Click(object sender, EventArgs e)
@@ -133,9 +107,9 @@ namespace PckStudio.Forms.Editor
AnimationStartStopBtn.Text = "Play Animation";
return;
}
if (currentAnimation.FrameCount > 1)
if (_animation.FrameCount > 1)
{
animationPictureBox.Start(currentAnimation);
animationPictureBox.Start(_animation);
AnimationStartStopBtn.Text = "Stop Animation";
}
}
@@ -158,13 +132,8 @@ namespace PckStudio.Forms.Editor
private void saveToolStripMenuItem1_Click(object sender, EventArgs e)
{
if (!IsSpecialTile(TileName) && currentAnimation is not null && animationFile is not null)
if (!IsSpecialTile(_tileName) && _animation is not null)
{
string anim = currentAnimation.BuildAnim();
animationFile.Properties.SetProperty("ANIM", anim);
var texture = currentAnimation.BuildTexture();
animationFile.SetData(texture, ImageFormat.Png);
animationFile.Filename = $"res/textures/{currentAnimation.CategoryString}/{TileName}.png";
DialogResult = DialogResult.OK;
return;
}
@@ -228,7 +197,7 @@ namespace PckStudio.Forms.Editor
{
int draggedIndex = draggedNode.Index;
int targetIndex = targetNode.Index;
currentAnimation.GetFrames().Swap(draggedIndex, targetIndex);
_animation.SwapFrames(draggedIndex, targetIndex);
LoadAnimationTreeView();
}
}
@@ -250,8 +219,8 @@ namespace PckStudio.Forms.Editor
private void treeView1_doubleClick(object sender, EventArgs e)
{
var frame = currentAnimation.GetFrame(frameTreeView.SelectedNode.Index);
using FrameEditor diag = new FrameEditor(frame.Ticks, currentAnimation.GetTextureIndex(frame.Texture), TextureIcons);
var frame = _animation.GetFrame(frameTreeView.SelectedNode.Index);
using FrameEditor diag = new FrameEditor(frame.Ticks, _animation.GetTextureIndex(frame.Texture), TextureIcons);
if (diag.ShowDialog(this) == DialogResult.OK)
{
/* Found a bug here. When passing the frame variable,
@@ -261,7 +230,7 @@ namespace PckStudio.Forms.Editor
* - Matt
*/
currentAnimation.SetFrame(frameTreeView.SelectedNode.Index, diag.FrameTextureIndex, diag.FrameTime);
_animation.SetFrame(frameTreeView.SelectedNode.Index, diag.FrameTextureIndex, diag.FrameTime);
LoadAnimationTreeView();
}
}
@@ -272,7 +241,7 @@ namespace PckStudio.Forms.Editor
diag.SaveBtn.Text = "Add";
if (diag.ShowDialog(this) == DialogResult.OK)
{
currentAnimation.AddFrame(diag.FrameTextureIndex, TileName == "clock" || TileName == "compass" ? 1 : diag.FrameTime);
_animation.AddFrame(diag.FrameTextureIndex, IsSpecialTile(_tileName) ? Animation.MinimumFrameTime : diag.FrameTime);
LoadAnimationTreeView();
}
}
@@ -280,7 +249,7 @@ namespace PckStudio.Forms.Editor
private void removeFrameToolStripMenuItem_Click(object sender, EventArgs e)
{
if (frameTreeView.SelectedNode is TreeNode t &&
currentAnimation.RemoveFrame(t.Index))
_animation.RemoveFrame(t.Index))
frameTreeView.SelectedNode.Remove();
}
@@ -290,7 +259,9 @@ namespace PckStudio.Forms.Editor
SetBulkSpeed diag = new SetBulkSpeed();
if (diag.ShowDialog(this) == DialogResult.OK)
{
currentAnimation.GetFrames().ForEach(frame => frame.Ticks = diag.Ticks);
if (animationPictureBox.IsPlaying)
animationPictureBox.Stop();
_animation.SetFrameTicks(diag.Ticks);
LoadAnimationTreeView();
}
diag.Dispose();
@@ -324,51 +295,13 @@ namespace PckStudio.Forms.Editor
MessageBox.Show(textureFile + " was not found", "Texture not found");
return;
}
var textures = Image.FromFile(textureFile).Split(ImageLayoutDirection.Vertical);
var new_animation = new Animation(textures);
new_animation.Category = currentAnimation.Category;
try
{
var img = Image.FromFile(textureFile);
JObject mcmeta = JObject.Parse(File.ReadAllText(fileDialog.FileName));
if (mcmeta["animation"] is JToken animation)
{
int frameTime = Animation.MinimumFrameTime;
// Some if statements to ensure that the animation is valid.
if (animation["frametime"] is JToken frametime_token && frametime_token.Type == JTokenType.Integer)
frameTime = (int)frametime_token;
if (animation["interpolate"] is JToken interpolate_token && interpolate_token.Type == JTokenType.Boolean)
new_animation.Interpolate = (bool)interpolate_token;
if (animation["frames"] is JToken frames_token &&
frames_token.Type == JTokenType.Array)
{
foreach (JToken frame in frames_token.Children())
{
if (frame.Type == JTokenType.Object)
{
if (frame["index"] is JToken frame_index && frame_index.Type == JTokenType.Integer &&
frame["time"] is JToken frame_time && frame_time.Type == JTokenType.Integer)
{
Debug.WriteLine("{0}*{1}", (int)frame["index"], (int)frame["time"]);
new_animation.AddFrame((int)frame["index"], (int)frame["time"]);
}
}
else if (frame.Type == JTokenType.Integer)
{
Debug.WriteLine("{0}*{1}", (int)frame, frameTime);
new_animation.AddFrame((int)frame, frameTime);
}
}
}
else
{
for (int i = 0; i < new_animation.TextureCount; i++)
{
new_animation.AddFrame(i, frameTime);
}
}
}
currentAnimation = new_animation;
Animation javaAnimation = AnimationHelper.GetAnimationFromJavaAnimation(mcmeta, img);
javaAnimation.Category = _animation.Category;
_animation = javaAnimation;
LoadAnimationTreeView();
}
catch (JsonException j_ex)
@@ -381,16 +314,18 @@ namespace PckStudio.Forms.Editor
private void changeTileToolStripMenuItem_Click(object sender, EventArgs e)
{
using (ChangeTile diag = new ChangeTile())
if (diag.ShowDialog(this) == DialogResult.OK)
{
if (diag.ShowDialog(this) != DialogResult.OK)
return;
Debug.WriteLine(diag.SelectedTile);
currentAnimation.Category = diag.Category;
TileName = diag.SelectedTile;
_animation.Category = diag.Category;
_tileName = diag.SelectedTile;
bulkAnimationSpeedToolStripMenuItem.Enabled =
importToolStripMenuItem.Enabled =
exportAsToolStripMenuItem.Enabled =
InterpolationCheckbox.Visible = !IsSpecialTile(TileName);
InterpolationCheckbox.Visible = !IsSpecialTile(_tileName);
SetTileLabel();
}
@@ -398,31 +333,26 @@ namespace PckStudio.Forms.Editor
private void SetTileLabel()
{
var textureInfos = currentAnimation.Category switch
var textureInfos = _animation.Category switch
{
Animation.AnimationCategory.Blocks => Tiles.BlockTileInfos,
Animation.AnimationCategory.Items => Tiles.ItemTileInfos,
_ => throw new ArgumentOutOfRangeException(currentAnimation.Category.ToString())
_ => throw new ArgumentOutOfRangeException(_animation.Category.ToString())
};
tileLabel.Text = textureInfos.FirstOrDefault(p => p.InternalName == _tileName)?.DisplayName ?? _tileName;
if (textureInfos.FirstOrDefault(p => p.InternalName == TileName) is JsonTileInfo textureInfo)
{
tileLabel.Text = textureInfo.DisplayName;
return;
}
switch (MessageBox.Show(this,
$"{TileName} is not a valid tile for animation, and will not play in game. Would you like to choose a new tile?",
"Not a valid tile",
MessageBoxButtons.YesNo))
{
case DialogResult.Yes:
changeTileToolStripMenuItem_Click(null, EventArgs.Empty);
break;
default:
DialogResult = DialogResult.Abort;
break;
}
//switch (MessageBox.Show(this,
// $"{TileName} is not a valid tile for animation, and will not play in game. Would you like to choose a new tile?",
// "Not a valid tile",
// MessageBoxButtons.YesNo))
//{
// case DialogResult.Yes:
// changeTileToolStripMenuItem_Click(null, EventArgs.Empty);
// break;
// default:
// DialogResult = DialogResult.Abort;
// break;
//}
}
private void exportJavaAnimationToolStripMenuItem_Click(object sender, EventArgs e)
@@ -432,13 +362,15 @@ namespace PckStudio.Forms.Editor
fileDialog.Filter = "Animation Scripts (*.mcmeta)|*.png.mcmeta";
if (fileDialog.ShowDialog(this) == DialogResult.OK)
{
JObject mcmeta = currentAnimation.ConvertToJavaAnimation();
JObject mcmeta = _animation.ConvertToJavaAnimation();
string jsondata = JsonConvert.SerializeObject(mcmeta, Formatting.Indented);
string filename = fileDialog.FileName;
File.WriteAllText(filename, jsondata);
var finalTexture = currentAnimation.BuildTexture();
finalTexture.Save(Path.Combine(Path.GetDirectoryName(filename), Path.GetFileNameWithoutExtension(filename))); // removes ".mcmeta" from filename!
MessageBox.Show("Animation was successfully exported to " + filename, "Export successful!");
var finalTexture = _animation.BuildTexture();
// removes ".mcmeta" from filename
string texturePath = Path.Combine(Path.GetDirectoryName(filename), Path.GetFileNameWithoutExtension(filename));
finalTexture.Save(texturePath);
MessageBox.Show("Animation was successfully exported as " + Path.GetFileName(filename), "Export successful!");
}
}
@@ -466,8 +398,8 @@ namespace PckStudio.Forms.Editor
private void InterpolationCheckbox_CheckedChanged(object sender, EventArgs e)
{
if (currentAnimation is not null)
currentAnimation.Interpolate = InterpolationCheckbox.Checked;
if (_animation is not null)
_animation.Interpolate = InterpolationCheckbox.Checked;
}
private void AnimationEditor_FormClosing(object sender, FormClosingEventArgs e)
@@ -508,7 +440,7 @@ namespace PckStudio.Forms.Editor
gif.SelectActiveFrame(dimension, i);
textures.Add(new Bitmap(gif));
}
currentAnimation = new Animation(textures, string.Empty);
_animation = new Animation(textures, string.Empty);
LoadAnimationTreeView();
}
@@ -523,7 +455,7 @@ namespace PckStudio.Forms.Editor
return;
Image img = Image.FromFile(ofd.FileName);
var textures = img.Split(ImageLayoutDirection.Vertical);
currentAnimation = new Animation(textures, string.Empty);
_animation = new Animation(textures, string.Empty);
LoadAnimationTreeView();
}

33
PCK-Studio/Forms/Editor/TextureAtlasEditor.cs
View File

@@ -137,7 +137,7 @@ namespace PckStudio.Forms.Editor
if (_tiles is null || !_tiles.IndexInRange(index) || (_selectedTile = _tiles[index]) is null)
return;
if(String.IsNullOrEmpty(_selectedTile.Tile.DisplayName))
if(string.IsNullOrEmpty(_selectedTile.Tile.DisplayName))
{
// changes the selected tile to the base flowing tile (carries all properties over) - Matt
_selectedTile = _tiles.Find(t => t.Tile.InternalName == _selectedTile.Tile.InternalName);
@@ -156,10 +156,7 @@ namespace PckStudio.Forms.Editor
hasAnimation &&
animationFile.Size > 0)
{
using var ms = new MemoryStream(animationFile.Data);
var img = Image.FromStream(ms);
var textures = img.Split(ImageLayoutDirection.Vertical);
var animation = new Internal.Animation(textures, animationFile.Properties.GetPropertyValue("ANIM"));
var animation = AnimationHelper.GetAnimationFromFile(animationFile);
selectTilePictureBox.Start(animation);
return;
}
@@ -292,15 +289,6 @@ namespace PckStudio.Forms.Editor
originalPictureBox.Invalidate();
}
private void ApplyBlend(string colorKey, Image image)
{
if (variantComboBox.Enabled = _selectedTile.Tile.ColourEntry.Variants.Length > 1)
{
selectTilePictureBox.BlendColor = FindBlendColorByKey(colorKey);
selectTilePictureBox.Image = image;
}
}
private Color GetBlendColor()
{
if (_selectedTile.Tile.HasColourEntry && _selectedTile.Tile.ColourEntry is not null)
@@ -415,8 +403,17 @@ namespace PckStudio.Forms.Editor
file = new PckFile.FileData($"res/textures/{_atlasType}/{_selectedTile.Tile.InternalName}.png", PckFile.FileData.FileType.TextureFile);
}
var animationEditor = new AnimationEditor(file, GetBlendColor());
if (animationEditor.ShowDialog() == DialogResult.OK && isNewFile)
var animation = AnimationHelper.GetAnimationFromFile(file);
var animationEditor = new AnimationEditor(animation, _selectedTile.Tile.InternalName, GetBlendColor());
if (animationEditor.ShowDialog() != DialogResult.OK)
{
return;
}
AnimationHelper.SaveAnimationToFile(file, animation);
if (isNewFile)
{
_pckFile.Files.Add(file);
}
@@ -440,7 +437,9 @@ namespace PckStudio.Forms.Editor
if (_selectedTile.Tile.ColourEntry is not null &&
_selectedTile.Tile.ColourEntry.Variants.IndexInRange(variantComboBox.SelectedIndex))
{
ApplyBlend(_selectedTile.Tile.ColourEntry.Variants[variantComboBox.SelectedIndex], _selectedTile.Texture);
string colorKey = _selectedTile.Tile.ColourEntry.Variants[variantComboBox.SelectedIndex];
selectTilePictureBox.BlendColor = FindBlendColorByKey(colorKey);
selectTilePictureBox.Image = _selectedTile.Texture;
}
}

3
PCK-Studio/Forms/Utilities/PckCenterBeta.cs
View File

@@ -11,9 +11,6 @@ using System.Threading.Tasks;
using System.Windows.Forms;
using System.Windows.Media.Imaging;
using MetroFramework.Forms;
using PckStudio.Classes.Misc;
using PckStudio.Classes.Networking;
using PckStudio.Classes.IO;
using PckStudio.API.PCKCenter.model;
using PckStudio.API.PCKCenter;

89
PCK-Studio/Helper/AnimationHelper.cs Normal file
View File

@@ -0,0 +1,89 @@
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Drawing;
using System.Drawing.Imaging;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Newtonsoft.Json.Linq;
using OMI.Formats.Pck;
using PckStudio.Extensions;
using PckStudio.Internal;
namespace PckStudio.Helper
{
internal static class AnimationHelper
{
internal static void SaveAnimationToFile(PckFile.FileData file, Animation animation)
{
string anim = animation.BuildAnim();
file.Properties.SetProperty("ANIM", anim);
var texture = animation.BuildTexture();
file.SetData(texture, ImageFormat.Png);
}
internal static Animation GetAnimationFromFile(PckFile.FileData file)
{
_ = file ?? throw new ArgumentNullException(nameof(file));
if (file.Size > 0)
{
var texture = file.GetTexture();
var frameTextures = texture.Split(ImageLayoutDirection.Vertical);
var _animation = new Animation(frameTextures, file.Properties.GetPropertyValue("ANIM"));
_animation.Category = file.Filename.Split('/').Contains("items")
? Animation.AnimationCategory.Items
: Animation.AnimationCategory.Blocks;
return _animation;
}
return Animation.Empty(file.Filename.Split('/').Contains("items")
? Animation.AnimationCategory.Items
: Animation.AnimationCategory.Blocks);
}
internal static Animation GetAnimationFromJavaAnimation(JObject jsonObject, Image texture)
{
var textures = texture.Split(ImageLayoutDirection.Vertical);
Animation result = new Animation(textures);
if (jsonObject["animation"] is not JToken animation)
return result;
int frameTime = Animation.MinimumFrameTime;
if (animation["frametime"] is JToken frametime_token && frametime_token.Type == JTokenType.Integer)
frameTime = (int)frametime_token;
if (animation["interpolate"] is JToken interpolate_token && interpolate_token.Type == JTokenType.Boolean)
result.Interpolate = (bool)interpolate_token;
if (animation["frames"] is JToken frames_token && frames_token.Type == JTokenType.Array)
{
foreach (JToken frame in frames_token.Children())
{
if (frame.Type == JTokenType.Object &&
frame["index"] is JToken frame_index &&
frame_index.Type == JTokenType.Integer &&
frame["time"] is JToken frame_time &&
frame_time.Type == JTokenType.Integer)
{
Debug.WriteLine("Index: {0}, Time: {1}", frame_index, frame_time);
result.AddFrame((int)frame_index, (int)frame_time);
}
else if (frame.Type == JTokenType.Integer)
{
Debug.WriteLine("Index: {0}, Time: {1}", frame, frameTime);
result.AddFrame((int)frame, frameTime);
}
}
return result;
}
for (int i = 0; i < result.TextureCount; i++)
{
result.AddFrame(i, frameTime);
}
return result;
}
}
}

32
PCK-Studio/Internal/Animation.cs
View File

@@ -20,6 +20,7 @@ using System.Collections.Generic;
using System.Drawing;
using PckStudio.Extensions;
using System.Text;
using System.Collections.ObjectModel;
namespace PckStudio.Internal
{
@@ -27,6 +28,13 @@ namespace PckStudio.Internal
{
public const int MinimumFrameTime = 1;
public static Animation Empty(AnimationCategory category)
{
var animation = new Animation(Array.Empty<Image>(), string.Empty);
animation.Category = category;
return animation;
}
public int FrameCount => frames.Count;
public int TextureCount => textures.Count;
@@ -55,8 +63,7 @@ namespace PckStudio.Internal
private readonly List<Image> textures;
private readonly List<Frame> frames = new List<Frame>();
private readonly IList<Frame> frames = new List<Frame>();
public Animation(IEnumerable<Image> textures)
{
@@ -149,12 +156,12 @@ namespace PckStudio.Internal
public Frame GetFrame(int index) => frames[index];
public List<Frame> GetFrames()
public IReadOnlyCollection<Frame> GetFrames()
{
return frames;
return new ReadOnlyCollection<Frame>(frames);
}
public List<Image> GetTextures()
public IReadOnlyCollection<Image> GetTextures()
{
return textures;
}
@@ -191,5 +198,18 @@ namespace PckStudio.Internal
return textures.Combine(ImageLayoutDirection.Vertical);
}
}
internal void SetFrameTicks(int ticks)
{
foreach (var frame in frames)
{
frame.Ticks = ticks;
}
}
internal void SwapFrames(int sourceIndex, int destinationIndex)
{
frames.Swap(sourceIndex, destinationIndex);
}
}
}

18
PCK-Studio/MainForm.cs
View File

@@ -383,18 +383,19 @@ namespace PckStudio
return;
}
if (file.Filename.StartsWith("res/textures/blocks/") || file.Filename.StartsWith("res/textures/items/"))
{
using (AnimationEditor animationEditor = new AnimationEditor(file))
if (!file.Filename.StartsWith("res/textures/blocks/") && !file.Filename.StartsWith("res/textures/items/"))
return;
var animation = AnimationHelper.GetAnimationFromFile(file);
using (AnimationEditor animationEditor = new AnimationEditor(animation, Path.GetFileNameWithoutExtension(file.Filename)))
{
if (animationEditor.ShowDialog(this) == DialogResult.OK)
{
wasModified = true;
AnimationHelper.SaveAnimationToFile(file, animation);
BuildMainTreeView();
}
}
}
}
private void HandleGameRuleFile(PckFile.FileData file)
{
@@ -565,7 +566,7 @@ namespace PckStudio
File.WriteAllBytes(extractFilePath, file.Data);
if (file.Properties.Count > 0)
{
using var fs = File.CreateText($"{extractFilePath}.txt");
using var fs = File.CreateText($"{extractFilePath}.txt");
file.Properties.ForEach(property => fs.WriteLine($"{property.Key}: {property.Value}"));
}
// Verification that file extraction path was successful
@@ -853,11 +854,14 @@ namespace PckStudio
$"res/textures/{Animation.GetCategoryName(diag.Category)}/{diag.SelectedTile}.png",
PckFile.FileData.FileType.TextureFile);
using AnimationEditor animationEditor = new AnimationEditor(file);
var animation = AnimationHelper.GetAnimationFromFile(file);
using AnimationEditor animationEditor = new AnimationEditor(animation, diag.SelectedTile);
if (animationEditor.ShowDialog() == DialogResult.OK)
{
wasModified = true;
currentPCK.Files.Add(file);
AnimationHelper.SaveAnimationToFile(file, animation);
currentPCK.Files.Add(file);
BuildMainTreeView();
ReloadMetaTreeView();
}

3
PCK-Studio/PckStudio.csproj
View File

@@ -133,6 +133,7 @@
</ItemGroup>
<ItemGroup>
<Compile Include="Extensions\PckFileDataExtensions.cs" />
<Compile Include="Helper\AnimationHelper.cs" />
<Compile Include="ToolboxItems\BlendPictureBox.cs">
<SubType>Component</SubType>
</Compile>
@@ -185,8 +186,6 @@
<Compile Include="Classes\IO\CSMB\CSMBFileWriter.cs" />
<Compile Include="Classes\IO\PckAudio\PckAudioFileReader.cs" />
<Compile Include="Classes\IO\PckAudio\PckAudioFileWriter.cs" />
<Compile Include="Classes\IO\Sounds\SoundIO.cs" />
<Compile Include="Classes\IO\Sounds\Sounds.cs" />
<Compile Include="Classes\Misc\FTPClient.cs" />
<Compile Include="Classes\Misc\FileCacher.cs" />
<Compile Include="Classes\Misc\OpenFolderDialog.cs" />