diff --git a/PCK-Studio/Extensions/PckFileDataExtensions.cs b/PCK-Studio/Extensions/PckFileDataExtensions.cs index 97e8df1d..6a691d9c 100644 --- a/PCK-Studio/Extensions/PckFileDataExtensions.cs +++ b/PCK-Studio/Extensions/PckFileDataExtensions.cs @@ -42,16 +42,16 @@ namespace PckStudio.Extensions return formatReader.FromStream(ms); } - internal static void SetData(this PckFileData file, T obj, IPckFileSerializer serializer) + internal static void SetSerializedData(this PckFileData file, T obj, IPckFileSerializer serializer) { serializer.Serialize(obj, ref file); } - internal static void SetData(this PckFileData file, IDataFormatWriter writer) + internal static void SetData(this PckFileData file, IDataFormatWriter formatWriter) { using (var stream = new MemoryStream()) { - writer.WriteToStream(stream); + formatWriter.WriteToStream(stream); file.SetData(stream.ToArray()); } } @@ -64,7 +64,7 @@ namespace PckStudio.Extensions { throw new Exception("File is not suitable to contain image data."); } - file.SetData(image, ImageSerializer.DefaultSerializer); + file.SetSerializedData(image, ImageSerializer.DefaultSerializer); } internal static bool IsMipmappedFile(this PckFileData file) diff --git a/PCK-Studio/Forms/Editor/TextureAtlasEditor.cs b/PCK-Studio/Forms/Editor/TextureAtlasEditor.cs index e0f04d62..5c6ad3e6 100644 --- a/PCK-Studio/Forms/Editor/TextureAtlasEditor.cs +++ b/PCK-Studio/Forms/Editor/TextureAtlasEditor.cs @@ -546,7 +546,7 @@ namespace PckStudio.Forms.Editor return; } - file.SetData(animationEditor.Result, AnimationSerializer.DefaultSerializer); + file.SetSerializedData(animationEditor.Result, AnimationSerializer.DefaultSerializer); // so animations can automatically update upon saving SelectedIndex = _selectedTile.Index; } diff --git a/PCK-Studio/MainForm.cs b/PCK-Studio/MainForm.cs index 53ad1913..5466687a 100644 --- a/PCK-Studio/MainForm.cs +++ b/PCK-Studio/MainForm.cs @@ -537,7 +537,7 @@ namespace PckStudio if (animationEditor.ShowDialog(this) == DialogResult.OK) { wasModified = true; - file.SetData(animationEditor.Result, AnimationSerializer.DefaultSerializer); + file.SetSerializedData(animationEditor.Result, AnimationSerializer.DefaultSerializer); BuildMainTreeView(); } } @@ -1081,7 +1081,7 @@ namespace PckStudio { wasModified = true; PckFileData file = currentPCK.CreateNewFile(animationFilepath, PckFileType.TextureFile); - file.SetData(animationEditor.Result, AnimationSerializer.DefaultSerializer); + file.SetSerializedData(animationEditor.Result, AnimationSerializer.DefaultSerializer); BuildMainTreeView(); ReloadMetaTreeView(); }