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

调整命名空间

Browse Source
This commit is contained in:
ww-rm
2025-03-25 00:53:32 +08:00
parent d32c824515
commit 63eb53fa06
6 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
SpineViewer/Dialogs/ExportDialog.cs
View File

@@ -1,4 +1,4 @@
using SpineViewer.ExportHelper;
using SpineViewer.Exporter;
using System;
using System.Collections.Generic;
using System.ComponentModel;

2
SpineViewer/ExportHelper/ExportArgs.cs → SpineViewer/Exporter/ExportArgs.cs
View File

@@ -7,7 +7,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace SpineViewer.ExportHelper
namespace SpineViewer.Exporter
{
/// <summary>
/// 导出参数基类

14
SpineViewer/ExportHelper/ExportHelper.cs → SpineViewer/Exporter/ExportHelper.cs
View File

@@ -6,7 +6,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace SpineViewer.ExportHelper
namespace SpineViewer.Exporter
{
/// <summary>
/// 为帧导出创建的辅助类
@@ -43,19 +43,19 @@ namespace SpineViewer.ExportHelper
/// 获取某个包围盒下合适的视图
/// </summary>
public static SFML.Graphics.View GetView(this RectangleF bounds, Size resolution, Padding padding)
=> GetView(bounds, (uint)resolution.Width, (uint)resolution.Height, (uint)padding.Left, (uint)padding.Right, (uint)padding.Top, (uint)padding.Bottom);
=> bounds.GetView((uint)resolution.Width, (uint)resolution.Height, (uint)padding.Left, (uint)padding.Right, (uint)padding.Top, (uint)padding.Bottom);
/// <summary>
/// 获取某个包围盒下合适的视图
/// </summary>
public static SFML.Graphics.View GetView(this RectangleF bounds, uint width, uint height, Padding padding)
=> GetView(bounds, width, height, (uint)padding.Left, (uint)padding.Right, (uint)padding.Top, (uint)padding.Bottom);
=> bounds.GetView(width, height, (uint)padding.Left, (uint)padding.Right, (uint)padding.Top, (uint)padding.Bottom);
/// <summary>
/// 获取某个包围盒下合适的视图
/// </summary>
public static SFML.Graphics.View GetView(this RectangleF bounds, Size resolution, uint paddingL = 1, uint paddingR = 1, uint paddingT = 1, uint paddingB = 1)
=> GetView(bounds, (uint)resolution.Width, (uint)resolution.Height, paddingL, paddingR, paddingT, paddingB);
=> bounds.GetView((uint)resolution.Width, (uint)resolution.Height, paddingL, paddingR, paddingT, paddingB);
/// <summary>
/// 获取某个包围盒下合适的视图
@@ -68,13 +68,13 @@ namespace SpineViewer.ExportHelper
float innerH = height - paddingT - paddingB;
float scale = 1;
if ((sizeY / sizeX) < (innerH / innerW))
if (sizeY / sizeX < innerH / innerW)
scale = sizeX / innerW; // 相同的 X, 视窗 Y 更大
else
scale = sizeY / innerH; // 相同的 Y, 视窗 X 更大
var x = bounds.X + bounds.Width / 2 + ((float)paddingL - (float)paddingR) * scale;
var y = bounds.Y + bounds.Height / 2 + ((float)paddingT - (float)paddingB) * scale;
var x = bounds.X + bounds.Width / 2 + (paddingL - (float)paddingR) * scale;
var y = bounds.Y + bounds.Height / 2 + (paddingT - (float)paddingB) * scale;
var viewX = width * scale;
var viewY = height * scale;

2
SpineViewer/ExportHelper/SFMLImageVideoFrame.cs → SpineViewer/Exporter/SFMLImageVideoFrame.cs
View File

@@ -5,7 +5,7 @@ using System.Text;
using System.Threading.Tasks;
using FFMpegCore.Pipes;
namespace SpineViewer.ExportHelper
namespace SpineViewer.Exporter
{
/// <summary>
/// SFML.Graphics.Image 帧对象包装类

3
SpineViewer/MainForm.cs
View File

@@ -8,7 +8,7 @@ using System.Diagnostics;
using System.Text.Json;
using System.Text.Json.Nodes;
using FFMpegCore.Enums;
using SpineViewer.ExportHelper;
using SpineViewer.Exporter;
namespace SpineViewer
{
@@ -296,6 +296,7 @@ namespace SpineViewer
spinePreviewer.StartRender();
}
// TODO: 转移到 Exporter 里面
private void ExportFrame_Work(object? sender, DoWorkEventArgs e)
{
var worker = (BackgroundWorker)sender;

2
SpineViewer/Spine/Spine.cs
View File

@@ -14,7 +14,7 @@ using System.Diagnostics.CodeAnalysis;
using System.Globalization;
using System.Text.Json.Nodes;
using System.Collections.Immutable;
using SpineViewer.ExportHelper;
using SpineViewer.Exporter;
namespace SpineViewer.Spine
{