diff --git a/Spine/Interfaces/SpineExtension.cs b/Spine/SpineExtension.cs similarity index 97% rename from Spine/Interfaces/SpineExtension.cs rename to Spine/SpineExtension.cs index 218c8fc..efecba4 100644 --- a/Spine/Interfaces/SpineExtension.cs +++ b/Spine/SpineExtension.cs @@ -1,4 +1,5 @@ using NLog; +using Spine.Interfaces; using Spine.Interfaces.Attachments; using System; using System.Collections.Generic; @@ -6,7 +7,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Spine.Interfaces +namespace Spine { /// /// 命中测试等级枚举值 @@ -136,7 +137,7 @@ namespace Spine.Interfaces if (HitTestLevel == HitTestLevel.None || HitTestLevel == HitTestLevel.Bounds) { self.GetBounds(out var bx, out var by, out var bw, out var bh); - return x >= bx && x <= (bx + bw) && y >= by && y <= (by + bh); + return x >= bx && x <= bx + bw && y >= by && y <= by + bh; } else if (HitTestLevel == HitTestLevel.Meshes || HitTestLevel == HitTestLevel.Pixels) { @@ -179,7 +180,7 @@ namespace Spine.Interfaces float c2 = Cross(x2, y2, x0, y0); // 判断是否全部同号 (或为 0, 点在边上) - if ((c0 >= 0 && c1 >= 0 && c2 >= 0) || (c0 <= 0 && c1 <= 0 && c2 <= 0)) + if (c0 >= 0 && c1 >= 0 && c2 >= 0 || c0 <= 0 && c1 <= 0 && c2 <= 0) { if (HitTestLevel == HitTestLevel.Meshes) return true; @@ -229,7 +230,7 @@ namespace Spine.Interfaces if (HitTestLevel == HitTestLevel.None) { self.GetBounds(out var bx, out var by, out var bw, out var bh); - return x >= bx && x <= (bx + bw) && y >= by && y <= (by + bh); + return x >= bx && x <= bx + bw && y >= by && y <= by + bh; } bool hit = false; diff --git a/SpineViewer/Extensions/SpineObjectExtension.cs b/SpineViewer/Extensions/SpineObjectExtension.cs index ca24299..9d8d703 100644 --- a/SpineViewer/Extensions/SpineObjectExtension.cs +++ b/SpineViewer/Extensions/SpineObjectExtension.cs @@ -1,5 +1,4 @@ using Spine; -using Spine.Interfaces; using System; using System.Collections.Generic; using System.Linq; diff --git a/SpineViewer/Models/PreferenceModel.cs b/SpineViewer/Models/PreferenceModel.cs index a4336b2..2ae88ec 100644 --- a/SpineViewer/Models/PreferenceModel.cs +++ b/SpineViewer/Models/PreferenceModel.cs @@ -1,6 +1,6 @@ using CommunityToolkit.Mvvm.ComponentModel; using CommunityToolkit.Mvvm.Input; -using Spine.Interfaces; +using Spine; using SpineViewer.Services; using System; using System.Collections.Generic; diff --git a/SpineViewer/ViewModels/MainWindow/ExplorerListViewModel.cs b/SpineViewer/ViewModels/MainWindow/ExplorerListViewModel.cs index a4860de..0f85b90 100644 --- a/SpineViewer/ViewModels/MainWindow/ExplorerListViewModel.cs +++ b/SpineViewer/ViewModels/MainWindow/ExplorerListViewModel.cs @@ -20,7 +20,6 @@ using System.Windows; using System.Windows.Media; using System.Windows.Media.Imaging; using System.Windows.Shell; -using Spine.Interfaces; namespace SpineViewer.ViewModels.MainWindow { diff --git a/SpineViewer/ViewModels/MainWindow/PreferenceViewModel.cs b/SpineViewer/ViewModels/MainWindow/PreferenceViewModel.cs index fa461c4..b2f5530 100644 --- a/SpineViewer/ViewModels/MainWindow/PreferenceViewModel.cs +++ b/SpineViewer/ViewModels/MainWindow/PreferenceViewModel.cs @@ -2,8 +2,8 @@ using CommunityToolkit.Mvvm.Input; using Microsoft.Win32; using NLog; +using Spine; using Spine.Implementations; -using Spine.Interfaces; using SpineViewer.Models; using SpineViewer.Natives; using SpineViewer.Services; diff --git a/SpineViewerCLI/SpineViewerCLI.cs b/SpineViewerCLI/SpineViewerCLI.cs index 6397632..2c91c5e 100644 --- a/SpineViewerCLI/SpineViewerCLI.cs +++ b/SpineViewerCLI/SpineViewerCLI.cs @@ -4,7 +4,6 @@ using SFML.Graphics; using SFML.System; using Spine; using Spine.Exporters; -using Spine.Interfaces; namespace SpineViewerCLI {