diff --git a/PCK-Studio/Forms/Editor/AnimationEditor.cs b/PCK-Studio/Forms/Editor/AnimationEditor.cs index a0f6cd02..ba281ae3 100644 --- a/PCK-Studio/Forms/Editor/AnimationEditor.cs +++ b/PCK-Studio/Forms/Editor/AnimationEditor.cs @@ -270,7 +270,7 @@ namespace PckStudio.Forms.Editor diag.SaveBtn.Text = "Add"; if (diag.ShowDialog(this) == DialogResult.OK) { - EditorValue.AddFrame(diag.FrameTextureIndex, _editable ? diag.FrameTime : Animation.MinimumFrameTime); + EditorValue.AddFrame(diag.FrameTextureIndex, _editable ? diag.FrameTime : Animation.MINIMUM_FRAME_TIME); UpdateTreeView(); } } diff --git a/PckStudio.Core/Animation.cs b/PckStudio.Core/Animation.cs index f5917486..ec297c8c 100644 --- a/PckStudio.Core/Animation.cs +++ b/PckStudio.Core/Animation.cs @@ -27,7 +27,7 @@ namespace PckStudio.Core { public sealed class Animation { - public const int MinimumFrameTime = 1; + public const int MINIMUM_FRAME_TIME = 1; public int FrameCount => _frames.Count; @@ -41,7 +41,7 @@ namespace PckStudio.Core private object _syncLock = new object(); - public Animation(IEnumerable textures, bool initFramesFromTextures = false, int frameTime = MinimumFrameTime) + public Animation(IEnumerable textures, bool initFramesFromTextures = false, int frameTime = MINIMUM_FRAME_TIME) { _textures = new List(textures); if (initFramesFromTextures) @@ -69,7 +69,7 @@ namespace PckStudio.Core private int _ticks; private object _syncObject = new object(); - public Frame(Image texture) : this(texture, MinimumFrameTime) + public Frame(Image texture) : this(texture, MINIMUM_FRAME_TIME) { } public Frame(Image texture, int frameTime) @@ -160,7 +160,7 @@ namespace PckStudio.Core } } - public void SetFrame(int frameIndex, int textureIndex, int frameTime = MinimumFrameTime) + public void SetFrame(int frameIndex, int textureIndex, int frameTime = MINIMUM_FRAME_TIME) { CheckTextureIndex(textureIndex); SetFrame(frameIndex, new Frame(_textures[textureIndex], frameTime)); diff --git a/PckStudio.Core/AtlasGroupAnimation.cs b/PckStudio.Core/AtlasGroupAnimation.cs index aa3e6883..aa662f2f 100644 --- a/PckStudio.Core/AtlasGroupAnimation.cs +++ b/PckStudio.Core/AtlasGroupAnimation.cs @@ -31,7 +31,7 @@ namespace PckStudio.Core public override Size GetSize(Size tileSize) => new Size(tileSize.Width * (Direction == ImageLayoutDirection.Horizontal ? Count : 1), tileSize.Height * (Direction == ImageLayoutDirection.Vertical ? Count : 1)); - public AtlasGroupAnimation(string name, int row, int column, int frameCount, ImageLayoutDirection direction, int frameTime = Animation.MinimumFrameTime) + public AtlasGroupAnimation(string name, int row, int column, int frameCount, ImageLayoutDirection direction, int frameTime = Animation.MINIMUM_FRAME_TIME) : base(name, row, column) { Count = frameCount; diff --git a/PckStudio.Core/AtlasGroupLargeTileAnimation.cs b/PckStudio.Core/AtlasGroupLargeTileAnimation.cs index 4efdb43e..e0537197 100644 --- a/PckStudio.Core/AtlasGroupLargeTileAnimation.cs +++ b/PckStudio.Core/AtlasGroupLargeTileAnimation.cs @@ -41,7 +41,7 @@ namespace PckStudio.Core public override Size GetSize(Size tileSize) => new Size(RowSpan * tileSize.Width * (Direction == ImageLayoutDirection.Horizontal ? _frameCount : 1), ColumnSpan * tileSize.Height * (Direction == ImageLayoutDirection.Vertical ? _frameCount : 1)); - public AtlasGroupLargeTileAnimation(string name, int row, int column, int rowSpan, int columnSpan, int frameCount, ImageLayoutDirection direction, int frameTime = Animation.MinimumFrameTime) + public AtlasGroupLargeTileAnimation(string name, int row, int column, int rowSpan, int columnSpan, int frameCount, ImageLayoutDirection direction, int frameTime = Animation.MINIMUM_FRAME_TIME) : base(name, row, column) { _frameCount = Math.Abs(frameCount); diff --git a/PckStudio.Core/Deserializer/AnimationDeserializer.cs b/PckStudio.Core/Deserializer/AnimationDeserializer.cs index 3d112032..f9f7ce5a 100644 --- a/PckStudio.Core/Deserializer/AnimationDeserializer.cs +++ b/PckStudio.Core/Deserializer/AnimationDeserializer.cs @@ -48,7 +48,7 @@ namespace PckStudio.Core.Deserializer return false; } - int lastFrameTime = Animation.MinimumFrameTime; + int lastFrameTime = Animation.MINIMUM_FRAME_TIME; foreach (string frameInfo in animData) { string[] frameData = frameInfo.Split('*'); @@ -74,7 +74,7 @@ namespace PckStudio.Core.Deserializer if (jsonObject["animation"] is not JToken animation) return result; - int frameTime = Animation.MinimumFrameTime; + int frameTime = Animation.MINIMUM_FRAME_TIME; if (animation["frametime"] is JToken frametime_token && frametime_token.Type == JTokenType.Integer) frameTime = (int)frametime_token;