From 2ae175abd0e99ab880da57782313830072dd2c06 Mon Sep 17 00:00:00 2001 From: ww-rm Date: Fri, 11 Apr 2025 13:55:19 +0800 Subject: [PATCH] small change --- SpineViewer/Controls/SpineListView.cs | 2 +- SpineViewer/Controls/SpinePropertyGrid.cs | 2 +- .../Spine/Implementations/SpineObject/SpineObject21.cs | 4 ++-- .../Spine/Implementations/SpineObject/SpineObject36.cs | 4 ++-- .../Spine/Implementations/SpineObject/SpineObject37.cs | 4 ++-- .../Spine/Implementations/SpineObject/SpineObject38.cs | 4 ++-- .../Spine/Implementations/SpineObject/SpineObject40.cs | 4 ++-- .../Spine/Implementations/SpineObject/SpineObject41.cs | 4 ++-- .../Spine/Implementations/SpineObject/Spineobject42.cs | 4 ++-- .../Spine => Spine/SpineView}/SpineAnimationWrapper.cs | 2 +- .../Spine => Spine/SpineView}/SpineBaseInfoWrapper.cs | 2 +- .../Spine => Spine/SpineView}/SpineDebugWrapper.cs | 2 +- .../Spine => Spine/SpineView}/SpineRenderWrapper.cs | 2 +- .../Spine => Spine/SpineView}/SpineSkinWrapper.cs | 2 +- .../Spine => Spine/SpineView}/SpineTransformWrapper.cs | 2 +- .../Spine => Spine/SpineView}/SpineWrapper.cs | 2 +- SpineViewer/Utils/TypeConverter.cs | 4 ++-- SpineViewer/Utils/UITypeEditor.cs | 4 +--- 18 files changed, 26 insertions(+), 28 deletions(-) rename SpineViewer/{PropertyGridWrappers/Spine => Spine/SpineView}/SpineAnimationWrapper.cs (99%) rename SpineViewer/{PropertyGridWrappers/Spine => Spine/SpineView}/SpineBaseInfoWrapper.cs (96%) rename SpineViewer/{PropertyGridWrappers/Spine => Spine/SpineView}/SpineDebugWrapper.cs (95%) rename SpineViewer/{PropertyGridWrappers/Spine => Spine/SpineView}/SpineRenderWrapper.cs (94%) rename SpineViewer/{PropertyGridWrappers/Spine => Spine/SpineView}/SpineSkinWrapper.cs (99%) rename SpineViewer/{PropertyGridWrappers/Spine => Spine/SpineView}/SpineTransformWrapper.cs (96%) rename SpineViewer/{PropertyGridWrappers/Spine => Spine/SpineView}/SpineWrapper.cs (95%) diff --git a/SpineViewer/Controls/SpineListView.cs b/SpineViewer/Controls/SpineListView.cs index bb2ee10..430e875 100644 --- a/SpineViewer/Controls/SpineListView.cs +++ b/SpineViewer/Controls/SpineListView.cs @@ -14,8 +14,8 @@ using System.Diagnostics; using System.Collections.Specialized; using NLog; using SpineViewer.Extensions; -using SpineViewer.PropertyGridWrappers.Spine; using SpineViewer.Utils; +using SpineViewer.Spine.SpineView; namespace SpineViewer.Controls { diff --git a/SpineViewer/Controls/SpinePropertyGrid.cs b/SpineViewer/Controls/SpinePropertyGrid.cs index 3bb5d4b..1302635 100644 --- a/SpineViewer/Controls/SpinePropertyGrid.cs +++ b/SpineViewer/Controls/SpinePropertyGrid.cs @@ -7,8 +7,8 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using System.Windows.Forms; -using SpineViewer.PropertyGridWrappers.Spine; using SpineViewer.Utils; +using SpineViewer.Spine.SpineView; namespace SpineViewer.Controls { diff --git a/SpineViewer/Spine/Implementations/SpineObject/SpineObject21.cs b/SpineViewer/Spine/Implementations/SpineObject/SpineObject21.cs index 1239b6a..0a8d6ce 100644 --- a/SpineViewer/Spine/Implementations/SpineObject/SpineObject21.cs +++ b/SpineViewer/Spine/Implementations/SpineObject/SpineObject21.cs @@ -9,10 +9,10 @@ using System.Threading.Tasks; using SpineRuntime21; using SpineViewer.Utils; -namespace SpineViewer.Spine.Implementations.Spine +namespace SpineViewer.Spine.Implementations.SpineObject { [SpineImplementation(SpineVersion.V21)] - internal class SpineObject21 : SpineObject + internal class SpineObject21 : Spine.SpineObject { private static readonly Animation EmptyAnimation = new(EMPTY_ANIMATION, [], 0); diff --git a/SpineViewer/Spine/Implementations/SpineObject/SpineObject36.cs b/SpineViewer/Spine/Implementations/SpineObject/SpineObject36.cs index c4e6ee9..477a532 100644 --- a/SpineViewer/Spine/Implementations/SpineObject/SpineObject36.cs +++ b/SpineViewer/Spine/Implementations/SpineObject/SpineObject36.cs @@ -9,10 +9,10 @@ using System.Threading.Tasks; using SpineRuntime36; using SpineViewer.Utils; -namespace SpineViewer.Spine.Implementations.Spine +namespace SpineViewer.Spine.Implementations.SpineObject { [SpineImplementation(SpineVersion.V36)] - internal class SpineObject36 : SpineObject + internal class SpineObject36 : Spine.SpineObject { private static readonly Animation EmptyAnimation = new(EMPTY_ANIMATION, [], 0); diff --git a/SpineViewer/Spine/Implementations/SpineObject/SpineObject37.cs b/SpineViewer/Spine/Implementations/SpineObject/SpineObject37.cs index 6fc9318..4f1dff7 100644 --- a/SpineViewer/Spine/Implementations/SpineObject/SpineObject37.cs +++ b/SpineViewer/Spine/Implementations/SpineObject/SpineObject37.cs @@ -6,10 +6,10 @@ using System.Threading.Tasks; using SpineRuntime37; using SpineViewer.Utils; -namespace SpineViewer.Spine.Implementations.Spine +namespace SpineViewer.Spine.Implementations.SpineObject { [SpineImplementation(SpineVersion.V37)] - internal class SpineObject37 : SpineObject + internal class SpineObject37 : Spine.SpineObject { private static readonly Animation EmptyAnimation = new(EMPTY_ANIMATION, [], 0); diff --git a/SpineViewer/Spine/Implementations/SpineObject/SpineObject38.cs b/SpineViewer/Spine/Implementations/SpineObject/SpineObject38.cs index 0143f4a..d20dbe0 100644 --- a/SpineViewer/Spine/Implementations/SpineObject/SpineObject38.cs +++ b/SpineViewer/Spine/Implementations/SpineObject/SpineObject38.cs @@ -9,10 +9,10 @@ using SpineRuntime38; using SpineRuntime38.Attachments; using SpineViewer.Utils; -namespace SpineViewer.Spine.Implementations.Spine +namespace SpineViewer.Spine.Implementations.SpineObject { [SpineImplementation(SpineVersion.V38)] - internal class SpineObject38 : SpineObject + internal class SpineObject38 : Spine.SpineObject { private static readonly Animation EmptyAnimation = new(EMPTY_ANIMATION, [], 0); diff --git a/SpineViewer/Spine/Implementations/SpineObject/SpineObject40.cs b/SpineViewer/Spine/Implementations/SpineObject/SpineObject40.cs index 58756c6..dadb71f 100644 --- a/SpineViewer/Spine/Implementations/SpineObject/SpineObject40.cs +++ b/SpineViewer/Spine/Implementations/SpineObject/SpineObject40.cs @@ -8,10 +8,10 @@ using System.Threading.Tasks; using SpineRuntime40; using SpineViewer.Utils; -namespace SpineViewer.Spine.Implementations.Spine +namespace SpineViewer.Spine.Implementations.SpineObject { [SpineImplementation(SpineVersion.V40)] - internal class SpineObject40 : SpineObject + internal class SpineObject40 : Spine.SpineObject { private static readonly Animation EmptyAnimation = new(EMPTY_ANIMATION, [], 0); diff --git a/SpineViewer/Spine/Implementations/SpineObject/SpineObject41.cs b/SpineViewer/Spine/Implementations/SpineObject/SpineObject41.cs index 5675f40..dc51404 100644 --- a/SpineViewer/Spine/Implementations/SpineObject/SpineObject41.cs +++ b/SpineViewer/Spine/Implementations/SpineObject/SpineObject41.cs @@ -8,10 +8,10 @@ using System.Threading.Tasks; using SpineRuntime41; using SpineViewer.Utils; -namespace SpineViewer.Spine.Implementations.Spine +namespace SpineViewer.Spine.Implementations.SpineObject { [SpineImplementation(SpineVersion.V41)] - internal class SpineObject41 : SpineObject + internal class SpineObject41 : Spine.SpineObject { private static readonly Animation EmptyAnimation = new(EMPTY_ANIMATION, [], 0); diff --git a/SpineViewer/Spine/Implementations/SpineObject/Spineobject42.cs b/SpineViewer/Spine/Implementations/SpineObject/Spineobject42.cs index 61fcbf3..d6431c1 100644 --- a/SpineViewer/Spine/Implementations/SpineObject/Spineobject42.cs +++ b/SpineViewer/Spine/Implementations/SpineObject/Spineobject42.cs @@ -8,10 +8,10 @@ using System.Threading.Tasks; using SpineRuntime42; using SpineViewer.Utils; -namespace SpineViewer.Spine.Implementations.Spine +namespace SpineViewer.Spine.Implementations.SpineObject { [SpineImplementation(SpineVersion.V42)] - internal class Spineobject42 : SpineObject + internal class Spineobject42 : Spine.SpineObject { private static readonly Animation EmptyAnimation = new(EMPTY_ANIMATION, [], 0); diff --git a/SpineViewer/PropertyGridWrappers/Spine/SpineAnimationWrapper.cs b/SpineViewer/Spine/SpineView/SpineAnimationWrapper.cs similarity index 99% rename from SpineViewer/PropertyGridWrappers/Spine/SpineAnimationWrapper.cs rename to SpineViewer/Spine/SpineView/SpineAnimationWrapper.cs index 19bc04d..66616aa 100644 --- a/SpineViewer/PropertyGridWrappers/Spine/SpineAnimationWrapper.cs +++ b/SpineViewer/Spine/SpineView/SpineAnimationWrapper.cs @@ -7,7 +7,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace SpineViewer.PropertyGridWrappers.Spine +namespace SpineViewer.Spine.SpineView { /// /// 对轨道索引属性的包装类, 能够在面板上显示例如时长的属性, 但是处理该属性时按字符串去处理, 例如 ToString 和判断对象相等都是用动画名称实现逻辑 diff --git a/SpineViewer/PropertyGridWrappers/Spine/SpineBaseInfoWrapper.cs b/SpineViewer/Spine/SpineView/SpineBaseInfoWrapper.cs similarity index 96% rename from SpineViewer/PropertyGridWrappers/Spine/SpineBaseInfoWrapper.cs rename to SpineViewer/Spine/SpineView/SpineBaseInfoWrapper.cs index d10ef20..8ce37ab 100644 --- a/SpineViewer/PropertyGridWrappers/Spine/SpineBaseInfoWrapper.cs +++ b/SpineViewer/Spine/SpineView/SpineBaseInfoWrapper.cs @@ -7,7 +7,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace SpineViewer.PropertyGridWrappers.Spine +namespace SpineViewer.Spine.SpineView { /// /// 用于在 PropertyGrid 上显示 Spine 基本信息的包装类 diff --git a/SpineViewer/PropertyGridWrappers/Spine/SpineDebugWrapper.cs b/SpineViewer/Spine/SpineView/SpineDebugWrapper.cs similarity index 95% rename from SpineViewer/PropertyGridWrappers/Spine/SpineDebugWrapper.cs rename to SpineViewer/Spine/SpineView/SpineDebugWrapper.cs index 4e6a170..848a43e 100644 --- a/SpineViewer/PropertyGridWrappers/Spine/SpineDebugWrapper.cs +++ b/SpineViewer/Spine/SpineView/SpineDebugWrapper.cs @@ -6,7 +6,7 @@ using System.Text; using System.Threading.Tasks; using SpineViewer.Spine; -namespace SpineViewer.PropertyGridWrappers.Spine +namespace SpineViewer.Spine.SpineView { /// /// 用于在 PropertyGrid 上显示 Spine 调试属性的包装类 diff --git a/SpineViewer/PropertyGridWrappers/Spine/SpineRenderWrapper.cs b/SpineViewer/Spine/SpineView/SpineRenderWrapper.cs similarity index 94% rename from SpineViewer/PropertyGridWrappers/Spine/SpineRenderWrapper.cs rename to SpineViewer/Spine/SpineView/SpineRenderWrapper.cs index f7068ab..f378e4f 100644 --- a/SpineViewer/PropertyGridWrappers/Spine/SpineRenderWrapper.cs +++ b/SpineViewer/Spine/SpineView/SpineRenderWrapper.cs @@ -6,7 +6,7 @@ using System.Text; using System.Threading.Tasks; using SpineViewer.Spine; -namespace SpineViewer.PropertyGridWrappers.Spine +namespace SpineViewer.Spine.SpineView { /// /// 用于在 PropertyGrid 上显示 Spine 渲染设置的包装类 diff --git a/SpineViewer/PropertyGridWrappers/Spine/SpineSkinWrapper.cs b/SpineViewer/Spine/SpineView/SpineSkinWrapper.cs similarity index 99% rename from SpineViewer/PropertyGridWrappers/Spine/SpineSkinWrapper.cs rename to SpineViewer/Spine/SpineView/SpineSkinWrapper.cs index c0da519..02d47a7 100644 --- a/SpineViewer/PropertyGridWrappers/Spine/SpineSkinWrapper.cs +++ b/SpineViewer/Spine/SpineView/SpineSkinWrapper.cs @@ -7,7 +7,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace SpineViewer.PropertyGridWrappers.Spine +namespace SpineViewer.Spine.SpineView { /// /// 对皮肤属性的包装类 diff --git a/SpineViewer/PropertyGridWrappers/Spine/SpineTransformWrapper.cs b/SpineViewer/Spine/SpineView/SpineTransformWrapper.cs similarity index 96% rename from SpineViewer/PropertyGridWrappers/Spine/SpineTransformWrapper.cs rename to SpineViewer/Spine/SpineView/SpineTransformWrapper.cs index 8930984..d93898f 100644 --- a/SpineViewer/PropertyGridWrappers/Spine/SpineTransformWrapper.cs +++ b/SpineViewer/Spine/SpineView/SpineTransformWrapper.cs @@ -7,7 +7,7 @@ using System.Threading.Tasks; using SpineViewer.Spine; using SpineViewer.Utils; -namespace SpineViewer.PropertyGridWrappers.Spine +namespace SpineViewer.Spine.SpineView { /// /// 用于在 PropertyGrid 上显示 Spine 空间变换的包装类 diff --git a/SpineViewer/PropertyGridWrappers/Spine/SpineWrapper.cs b/SpineViewer/Spine/SpineView/SpineWrapper.cs similarity index 95% rename from SpineViewer/PropertyGridWrappers/Spine/SpineWrapper.cs rename to SpineViewer/Spine/SpineView/SpineWrapper.cs index 592c205..7128c61 100644 --- a/SpineViewer/PropertyGridWrappers/Spine/SpineWrapper.cs +++ b/SpineViewer/Spine/SpineView/SpineWrapper.cs @@ -7,7 +7,7 @@ using System.Text; using System.Threading.Tasks; using SpineViewer.Spine; -namespace SpineViewer.PropertyGridWrappers.Spine +namespace SpineViewer.Spine.SpineView { public class SpineWrapper(SpineObject spine) { diff --git a/SpineViewer/Utils/TypeConverter.cs b/SpineViewer/Utils/TypeConverter.cs index 6a5a577..98994bb 100644 --- a/SpineViewer/Utils/TypeConverter.cs +++ b/SpineViewer/Utils/TypeConverter.cs @@ -1,5 +1,5 @@ -using SpineViewer.PropertyGridWrappers.Spine; -using SpineViewer.Spine; +using SpineViewer.Spine; +using SpineViewer.Spine.SpineView; using System; using System.Collections.Generic; using System.Collections.ObjectModel; diff --git a/SpineViewer/Utils/UITypeEditor.cs b/SpineViewer/Utils/UITypeEditor.cs index 94f9720..c4eb140 100644 --- a/SpineViewer/Utils/UITypeEditor.cs +++ b/SpineViewer/Utils/UITypeEditor.cs @@ -1,6 +1,4 @@ -using SpineViewer.Dialogs; -using SpineViewer.PropertyGridWrappers.Spine; -using System; +using System; using System.Collections.Generic; using System.ComponentModel; using System.Drawing.Design;