LegacyConsole/PCK-Studio
2
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/PCK-Studio.git synced 2026-05-24 03:36:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Animation - Rename 'FrameTextureCount' to 'TextureCount'

Browse Source
This commit is contained in:
miku-666
2023-04-02 17:40:12 +02:00
parent bc75726787
commit e2ff5a772d
2 changed files with 22 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
PCK-Studio/Forms/Editor/Animation.cs
View File

@@ -14,11 +14,11 @@ namespace PckStudio.Forms.Editor
public int FrameCount => frames.Count;
public int FrameTextureCount => frameTextures.Count;
public int TextureCount => frameTextures.Count;
public Frame this[int frameIndex] => frames[frameIndex];
// not implemented rn...
// TODO: implement this
public bool Interpolate { get; set; } = false;
private readonly List<Image> frameTextures;
@@ -51,39 +51,37 @@ namespace PckStudio.Forms.Editor
}
}
public void ParseAnim(string ANIM)
private void ParseAnim(string ANIM)
{
_ = ANIM ?? throw new ArgumentNullException(nameof(ANIM));
ANIM = (Interpolate = ANIM.StartsWith("#")) ? ANIM.Substring(1) : ANIM;
string[] animData = ANIM.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
int lastFrameTime = MinimumFrameTime;
if (animData.Length <= 0)
{
for (int i = 0; i < FrameTextureCount; i++)
for (int i = 0; i < TextureCount; i++)
{
AddFrame(i, MinimumFrameTime);
AddFrame(i);
}
}
else
foreach (string frameInfo in animData)
{
foreach (string frameInfo in animData)
{
string[] frameData = frameInfo.Split('*');
//if (frameData.Length < 2)
// continue; // shouldn't happen
int currentFrameIndex = int.TryParse(frameData[0], out currentFrameIndex) ? currentFrameIndex : 0;
string[] frameData = frameInfo.Split('*');
//if (frameData.Length < 2)
// continue; // shouldn't happen
int currentFrameIndex = 0;
int.TryParse(frameData[0], out currentFrameIndex);
// Some textures like the Halloween 2015's Lava texture don't have a
// frame time parameter for certain frames.
// This will detect that and place the last frame time in its place.
// This is accurate to console edition behavior.
// - MattNL
int currentFrameTime = string.IsNullOrEmpty(frameData[1]) ? lastFrameTime : int.Parse(frameData[1]);
AddFrame(currentFrameIndex, currentFrameTime);
lastFrameTime = currentFrameTime;
}
// Some textures like the Halloween 2015's Lava texture don't have a
// frame time parameter for certain frames.
// This will detect that and place the last frame time in its place.
// This is accurate to console edition behavior.
// - MattNL
int currentFrameTime = string.IsNullOrEmpty(frameData[1]) ? lastFrameTime : int.Parse(frameData[1]);
AddFrame(currentFrameIndex, currentFrameTime);
lastFrameTime = currentFrameTime;
}
}
public Frame AddFrame(int frameTextureIndex) => AddFrame(frameTextureIndex, MinimumFrameTime);
public Frame AddFrame(int frameTextureIndex, int frameTime)
{

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

@@ -332,7 +332,7 @@ namespace PckStudio.Forms.Editor
}
else
{
for (int i = 0; i < new_animation.FrameTextureCount; i++)
for (int i = 0; i < new_animation.TextureCount; i++)
{
new_animation.AddFrame(i, frameTime);
}