LegacyConsole/PCK-Studio
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/PCK-Studio.git synced 2026-06-26 03:35:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

AnimationPictureBox - Fixed multiple bugs when exiting playing interpolated animation

Browse Source
This commit is contained in:
miku-666
2023-05-10 20:15:40 +02:00
parent 6d86f495cf
commit ae1d1147a5
2 changed files with 41 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
PCK-Studio/Forms/Editor/AnimationPlayer.cs → PCK-Studio/Forms/Editor/AnimationPictureBox.cs
View File

@@ -12,9 +12,35 @@ namespace PckStudio.Forms.Editor
{
internal class AnimationPictureBox : PictureBox
{
private const int TickInMillisecond = 50; // 1 InGame tick
public bool IsPlaying { get; private set; } = false;
public bool IsPlaying => _isPlaying;
public void Start(Animation animation)
{
_animation = animation;
cts = new CancellationTokenSource();
Task.Run(DoAnimate, cts.Token);
}
public void Stop([CallerMemberName] string callerName = default!)
{
Debug.WriteLine($"{nameof(AnimationPictureBox.Stop)} called from {callerName}!");
cts.Cancel();
}
public Animation.Frame GetCurrentFrame() => _animation[currentAnimationFrameIndex];
public void SelectFrame(Animation animation, int index)
{
if (IsPlaying)
Stop();
_animation = animation;
currentAnimationFrameIndex = index;
currentFrame = SetAnimationFrame(index);
}
private const int TickInMillisecond = 50; // 1 InGame tick
private bool _isPlaying = false;
private int currentAnimationFrameIndex = 0;
private Animation.Frame currentFrame;
private Animation _animation;
@@ -30,7 +56,7 @@ namespace PckStudio.Forms.Editor
private async void DoAnimate()
{
_ = _animation ?? throw new ArgumentNullException(nameof(_animation));
IsPlaying = true;
_isPlaying = true;
Animation.Frame nextFrame;
while (!cts.IsCancellationRequested)
{
@@ -57,43 +83,24 @@ namespace PckStudio.Forms.Editor
SetAnimationFrame(currentFrame);
await Task.Delay(TickInMillisecond * currentFrame.Ticks);
}
IsPlaying = false;
_isPlaying = false;
}
private async Task InterpolateFrame(Animation.Frame currentFrame, Animation.Frame nextFrame)
{
for (int i = 0; i < currentFrame.Ticks; i++)
for (int tick = 0; tick < currentFrame.Ticks && !cts.IsCancellationRequested; tick++)
{
double delta = 1.0f - i / (double)currentFrame.Ticks;
Image = currentFrame.Texture.Interpolate(nextFrame.Texture, delta);
double delta = 1.0f - tick / (double)currentFrame.Ticks;
if (!IsDisposed)
Invoke(() =>
{
if (!IsDisposed)
Image = currentFrame.Texture.Interpolate(nextFrame.Texture, delta);
});
await Task.Delay(TickInMillisecond);
}
}
public void Start(Animation animation)
{
_animation = animation;
cts = new CancellationTokenSource();
Task.Run(DoAnimate, cts.Token);
}
public void Stop([CallerMemberName] string callerName = default!)
{
Debug.WriteLine($"{nameof(AnimationPictureBox.Stop)} called from {callerName}!");
cts.Cancel();
}
public Animation.Frame GetCurrentFrame() => _animation[currentAnimationFrameIndex];
public void SelectFrame(Animation animation, int index)
{
if (IsPlaying)
Stop();
_animation = animation;
currentAnimationFrameIndex = index;
currentFrame = SetAnimationFrame(index);
}
private Animation.Frame SetAnimationFrame(int frameIndex)
{
var frame = _animation[frameIndex];
@@ -103,7 +110,7 @@ namespace PckStudio.Forms.Editor
private void SetAnimationFrame(Animation.Frame frame)
{
Image = frame.Texture;
}
Invoke(() => Image = frame.Texture);
}
}
}

2
PCK-Studio/PckStudio.csproj
View File

@@ -281,7 +281,7 @@
<DependentUpon>TextPrompt.cs</DependentUpon>
</Compile>
<Compile Include="Forms\Editor\Animation.cs" />
<Compile Include="Forms\Editor\AnimationPlayer.cs">
<Compile Include="Forms\Editor\AnimationPictureBox.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="Forms\Editor\MaterialsEditor.cs">