From 11d56af848d38728d6d07c48355cf1abbd0dcd28 Mon Sep 17 00:00:00 2001 From: miku-666 <74728189+NessieHax@users.noreply.github.com> Date: Fri, 12 May 2023 17:22:11 +0200 Subject: [PATCH] Animation.cs - Removed index operator --- PCK-Studio/Forms/Editor/Animation.cs | 2 -- PCK-Studio/Forms/Editor/AnimationPictureBox.cs | 10 ++++------ 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/PCK-Studio/Forms/Editor/Animation.cs b/PCK-Studio/Forms/Editor/Animation.cs index 92d7b0b3..01586b0d 100644 --- a/PCK-Studio/Forms/Editor/Animation.cs +++ b/PCK-Studio/Forms/Editor/Animation.cs @@ -16,8 +16,6 @@ namespace PckStudio.Forms.Editor public int TextureCount => textures.Count; - public Frame this[int frameIndex] => frames[frameIndex]; - public bool Interpolate { get; set; } = false; private readonly List textures; diff --git a/PCK-Studio/Forms/Editor/AnimationPictureBox.cs b/PCK-Studio/Forms/Editor/AnimationPictureBox.cs index 6b40cc2b..4985525f 100644 --- a/PCK-Studio/Forms/Editor/AnimationPictureBox.cs +++ b/PCK-Studio/Forms/Editor/AnimationPictureBox.cs @@ -27,8 +27,6 @@ namespace PckStudio.Forms.Editor cts.Cancel(); } - public Animation.Frame GetCurrentFrame() => _animation[currentAnimationFrameIndex]; - public void SelectFrame(Animation animation, int index) { if (IsPlaying) @@ -67,14 +65,14 @@ namespace PckStudio.Forms.Editor if (currentAnimationFrameIndex + 1 >= _animation.FrameCount) { - nextFrame = _animation[0]; + nextFrame = _animation.GetFrame(0); } else { - nextFrame = _animation[currentAnimationFrameIndex + 1]; + nextFrame = _animation.GetFrame(currentAnimationFrameIndex + 1); } - currentFrame = _animation[currentAnimationFrameIndex++]; + currentFrame = _animation.GetFrame(currentAnimationFrameIndex++); if (_animation.Interpolate) { await InterpolateFrame(currentFrame, nextFrame); @@ -103,7 +101,7 @@ namespace PckStudio.Forms.Editor private Animation.Frame SetAnimationFrame(int frameIndex) { - var frame = _animation[frameIndex]; + var frame = _animation.GetFrame(frameIndex); SetAnimationFrame(frame); return frame; }