chizui/SpineViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

增加default皮肤显示

Browse Source
This commit is contained in:
ww-rm
2025-04-19 12:05:04 +08:00
parent c612c01ac7
commit 027d3af619
9 changed files with 25 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
SpineViewer/Spine/Implementations/SpineObject/SpineObject21.cs
View File

@@ -105,7 +105,7 @@ namespace SpineViewer.Spine.Implementations.SpineObject
}
}
SlotAttachmentNames = slotAttachments.ToFrozenDictionary(item => item.Key, item => item.Value.Keys.ToImmutableArray());
SkinNames = skeletonData.Skins.Select(v => v.Name).Where(v => v != "default").ToImmutableArray();
SkinNames = skeletonData.Skins.Select(v => v.Name).ToImmutableArray();
AnimationNames = [EMPTY_ANIMATION, .. skeletonData.Animations.Select(v => v.Name)];
skeleton = new Skeleton(skeletonData) { Skin = new(Guid.NewGuid().ToString()) }; // 挂载一个空皮肤当作容器
@@ -199,7 +199,8 @@ namespace SpineViewer.Spine.Implementations.SpineObject
protected override void addSkin(string name)
{
if (skeletonData.FindSkin(name) is Skin sk)
// default 不需要加载
if (name != "default" && skeletonData.FindSkin(name) is Skin sk)
{
// XXX: 3.7 及以下不支持 AddSkin
foreach (var (k, v) in sk.Attachments)

5
SpineViewer/Spine/Implementations/SpineObject/SpineObject36.cs
View File

@@ -104,7 +104,7 @@ namespace SpineViewer.Spine.Implementations.SpineObject
}
}
SlotAttachmentNames = slotAttachments.ToFrozenDictionary(item => item.Key, item => item.Value.Keys.ToImmutableArray());
SkinNames = skeletonData.Skins.Select(v => v.Name).Where(v => v != "default").ToImmutableArray();
SkinNames = skeletonData.Skins.Select(v => v.Name).ToImmutableArray();
AnimationNames = [EMPTY_ANIMATION, .. skeletonData.Animations.Select(v => v.Name)];
skeleton = new Skeleton(skeletonData) { Skin = new(Guid.NewGuid().ToString()) }; // 挂载一个空皮肤当作容器
@@ -198,7 +198,8 @@ namespace SpineViewer.Spine.Implementations.SpineObject
protected override void addSkin(string name)
{
if (skeletonData.FindSkin(name) is Skin sk)
// default 不需要加载
if (name != "default" && skeletonData.FindSkin(name) is Skin sk)
{
// XXX: 3.7 及以下不支持 AddSkin
foreach (var (k, v) in sk.Attachments)

5
SpineViewer/Spine/Implementations/SpineObject/SpineObject37.cs
View File

@@ -101,7 +101,7 @@ namespace SpineViewer.Spine.Implementations.SpineObject
}
}
SlotAttachmentNames = slotAttachments.ToFrozenDictionary(item => item.Key, item => item.Value.Keys.ToImmutableArray());
SkinNames = skeletonData.Skins.Select(v => v.Name).Where(v => v != "default").ToImmutableArray();
SkinNames = skeletonData.Skins.Select(v => v.Name).ToImmutableArray();
AnimationNames = [EMPTY_ANIMATION, .. skeletonData.Animations.Select(v => v.Name)];
skeleton = new Skeleton(skeletonData) { Skin = new(Guid.NewGuid().ToString()) }; // 挂载一个空皮肤当作容器
@@ -169,7 +169,8 @@ namespace SpineViewer.Spine.Implementations.SpineObject
protected override void addSkin(string name)
{
if (skeletonData.FindSkin(name) is Skin sk)
// default 不需要加载
if (name != "default" && skeletonData.FindSkin(name) is Skin sk)
{
// XXX: 3.7 及以下不支持 AddSkin
foreach (var (k, v) in sk.Attachments)

5
SpineViewer/Spine/Implementations/SpineObject/SpineObject38.cs
View File

@@ -108,7 +108,7 @@ namespace SpineViewer.Spine.Implementations.SpineObject
}
}
SlotAttachmentNames = slotAttachments.ToFrozenDictionary(item => item.Key, item => item.Value.Keys.ToImmutableArray());
SkinNames = skeletonData.Skins.Select(v => v.Name).Where(v => v != "default").ToImmutableArray();
SkinNames = skeletonData.Skins.Select(v => v.Name).ToImmutableArray();
AnimationNames = [EMPTY_ANIMATION, .. skeletonData.Animations.Select(v => v.Name)];
skeleton = new Skeleton(skeletonData) { Skin = new(Guid.NewGuid().ToString()) }; // 挂载一个空皮肤当作容器
@@ -176,7 +176,8 @@ namespace SpineViewer.Spine.Implementations.SpineObject
protected override void addSkin(string name)
{
if (skeletonData.FindSkin(name) is Skin sk)
// default 不需要加载
if (name != "default" && skeletonData.FindSkin(name) is Skin sk)
{
skeleton.Skin.AddSkin(sk);
skeleton.SetSlotsToSetupPose();

5
SpineViewer/Spine/Implementations/SpineObject/SpineObject40.cs
View File

@@ -104,7 +104,7 @@ namespace SpineViewer.Spine.Implementations.SpineObject
}
}
SlotAttachmentNames = slotAttachments.ToFrozenDictionary(item => item.Key, item => item.Value.Keys.ToImmutableArray());
SkinNames = skeletonData.Skins.Select(v => v.Name).Where(v => v != "default").ToImmutableArray();
SkinNames = skeletonData.Skins.Select(v => v.Name).ToImmutableArray();
AnimationNames = [EMPTY_ANIMATION, .. skeletonData.Animations.Select(v => v.Name)];
skeleton = new Skeleton(skeletonData) { Skin = new(Guid.NewGuid().ToString()) }; // 挂载一个空皮肤当作容器
@@ -172,7 +172,8 @@ namespace SpineViewer.Spine.Implementations.SpineObject
protected override void addSkin(string name)
{
if (skeletonData.FindSkin(name) is Skin sk)
// default 不需要加载
if (name != "default" && skeletonData.FindSkin(name) is Skin sk)
{
skeleton.Skin.AddSkin(sk);
skeleton.SetSlotsToSetupPose();

5
SpineViewer/Spine/Implementations/SpineObject/SpineObject41.cs
View File

@@ -104,7 +104,7 @@ namespace SpineViewer.Spine.Implementations.SpineObject
}
}
SlotAttachmentNames = slotAttachments.ToFrozenDictionary(item => item.Key, item => item.Value.Keys.ToImmutableArray());
SkinNames = skeletonData.Skins.Select(v => v.Name).Where(v => v != "default").ToImmutableArray();
SkinNames = skeletonData.Skins.Select(v => v.Name).ToImmutableArray();
AnimationNames = [EMPTY_ANIMATION, .. skeletonData.Animations.Select(v => v.Name)];
skeleton = new Skeleton(skeletonData) { Skin = new(Guid.NewGuid().ToString()) }; // 挂载一个空皮肤当作容器
@@ -172,7 +172,8 @@ namespace SpineViewer.Spine.Implementations.SpineObject
protected override void addSkin(string name)
{
if (skeletonData.FindSkin(name) is Skin sk)
// default 不需要加载
if (name != "default" && skeletonData.FindSkin(name) is Skin sk)
{
skeleton.Skin.AddSkin(sk);
skeleton.SetSlotsToSetupPose();

5
SpineViewer/Spine/Implementations/SpineObject/SpineObject42.cs
View File

@@ -104,7 +104,7 @@ namespace SpineViewer.Spine.Implementations.SpineObject
}
}
SlotAttachmentNames = slotAttachments.ToFrozenDictionary(item => item.Key, item => item.Value.Keys.ToImmutableArray());
SkinNames = skeletonData.Skins.Select(v => v.Name).Where(v => v != "default").ToImmutableArray();
SkinNames = skeletonData.Skins.Select(v => v.Name).ToImmutableArray();
AnimationNames = [EMPTY_ANIMATION, .. skeletonData.Animations.Select(v => v.Name)];
skeleton = new Skeleton(skeletonData) { Skin = new(Guid.NewGuid().ToString()) }; // 挂载一个空皮肤当作容器
@@ -172,7 +172,8 @@ namespace SpineViewer.Spine.Implementations.SpineObject
protected override void addSkin(string name)
{
if (skeletonData.FindSkin(name) is Skin sk)
// default 不需要加载
if (name != "default" && skeletonData.FindSkin(name) is Skin sk)
{
skeleton.Skin.AddSkin(sk);
skeleton.SetSlotsToSetupPose();

6
SpineViewer/Spine/SpineObject.cs
View File

@@ -93,8 +93,8 @@ namespace SpineViewer.Spine
tex.Display();
Preview = tex.Texture.CopyToBitmap();
// 初始化皮肤加载情况
foreach (var n in SkinNames) skinLoadStatus[n] = false;
// 初始化皮肤加载情况, 不需要记录 default
foreach (var n in SkinNames.Where(v => v != "default")) skinLoadStatus[n] = false;
// 默认初始化10个动画空位
for (int i = 0; i < 10; i++) setAnimation(i, AnimationNames.First());
@@ -359,7 +359,7 @@ namespace SpineViewer.Spine
/// <summary>
/// 查询皮肤加载状态, 皮肤不存在时返回 false
/// </summary>
public bool GetSkinStatus(string name) { lock (_lock) return skinLoadStatus.TryGetValue(name, out var status) && status; }
public bool GetSkinStatus(string name) { lock (_lock) return name == "default" || skinLoadStatus.TryGetValue(name, out var status) && status; }
/// <summary>
/// 设置皮肤加载状态, 忽略不存在的皮肤

2
SpineViewer/Spine/SpineView/SpineSkinProperty.cs
View File

@@ -66,7 +66,7 @@ namespace SpineViewer.Spine.SpineView
private class SkinPropertyDescriptor(string name, Attribute[]? attributes) : PropertyDescriptor(name, attributes)
{
public override Type ComponentType => typeof(SpineSkinProperty);
public override bool IsReadOnly => false;
public override bool IsReadOnly => Name == "default";
public override Type PropertyType => typeof(bool);
public override bool CanResetValue(object component) => false;
public override void ResetValue(object component) { }