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

修复时长参数0值判断问题

Browse Source
This commit is contained in:
ww-rm
2025-07-25 22:09:24 +08:00
parent 04953d13b6
commit 1344b34d08
3 changed files with 36 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
SpineViewer/ViewModels/Exporters/CustomFFmpegExporterViewModel.cs
View File

@@ -92,7 +92,9 @@ namespace SpineViewer.ViewModels.Exporters
var output = Path.Combine(_outputDir!, filename);
if (_autoResolution) SetAutoResolutionAnimated(exporter, spines);
exporter.Duration = _duration >= 0 ? _duration : spines.Select(sp => sp.GetAnimationMaxDuration()).DefaultIfEmpty(0).Max();
// 如果时长是一个负数值则使用所有动画时长的最大值
exporter.Duration = _duration < 0 ? spines.Select(sp => sp.GetAnimationMaxDuration()).DefaultIfEmpty(0).Max() : _duration;
exporter.ProgressReporter = (total, done, text) =>
{
@@ -119,12 +121,7 @@ namespace SpineViewer.ViewModels.Exporters
{
// 统计总帧数
int totalFrameCount = 0;
if (_duration > 0)
{
exporter.Duration = _duration;
totalFrameCount = exporter.GetFrameCount() * spines.Length;
}
else
if (_duration < 0)
{
foreach (var sp in spines)
{
@@ -132,6 +129,11 @@ namespace SpineViewer.ViewModels.Exporters
totalFrameCount += exporter.GetFrameCount();
}
}
else
{
exporter.Duration = _duration;
totalFrameCount = exporter.GetFrameCount() * spines.Length;
}
pr.Total = totalFrameCount;
pr.Done = 0;
@@ -154,7 +156,9 @@ namespace SpineViewer.ViewModels.Exporters
}
if (_autoResolution) SetAutoResolutionAnimated(exporter, sp);
if (_duration <= 0) exporter.Duration = sp.GetAnimationMaxDuration();
// 如果时长是负数则需要每次都设置成动画的时长值, 否则前面统计帧数时已经设置过时长值
if (_duration < 0) exporter.Duration = sp.GetAnimationMaxDuration();
var filename = $"{sp.Name}_{timestamp}_{Guid.NewGuid().ToString()[..6]}_{_fps}{FormatSuffix}";
var output = Path.Combine(_outputDir ?? sp.AssetsDir, filename);

20
SpineViewer/ViewModels/Exporters/FFmpegVideoExporterViewModel.cs
View File

@@ -83,7 +83,9 @@ namespace SpineViewer.ViewModels.Exporters
var output = Path.Combine(_outputDir!, filename);
if (_autoResolution) SetAutoResolutionAnimated(exporter, spines);
exporter.Duration = _duration >= 0 ? _duration : spines.Select(sp => sp.GetAnimationMaxDuration()).DefaultIfEmpty(0).Max();
// 如果时长是一个负数值则使用所有动画时长的最大值
exporter.Duration = _duration < 0 ? spines.Select(sp => sp.GetAnimationMaxDuration()).DefaultIfEmpty(0).Max() : _duration;
exporter.ProgressReporter = (total, done, text) =>
{
@@ -110,12 +112,7 @@ namespace SpineViewer.ViewModels.Exporters
{
// 统计总帧数
int totalFrameCount = 0;
if (_duration > 0)
{
exporter.Duration = _duration;
totalFrameCount = exporter.GetFrameCount() * spines.Length;
}
else
if (_duration < 0)
{
foreach (var sp in spines)
{
@@ -123,6 +120,11 @@ namespace SpineViewer.ViewModels.Exporters
totalFrameCount += exporter.GetFrameCount();
}
}
else
{
exporter.Duration = _duration;
totalFrameCount = exporter.GetFrameCount() * spines.Length;
}
pr.Total = totalFrameCount;
pr.Done = 0;
@@ -145,7 +147,9 @@ namespace SpineViewer.ViewModels.Exporters
}
if (_autoResolution) SetAutoResolutionAnimated(exporter, sp);
if (_duration <= 0) exporter.Duration = sp.GetAnimationMaxDuration();
// 如果时长是负数则需要每次都设置成动画的时长值, 否则前面统计帧数时已经设置过时长值
if (_duration < 0) exporter.Duration = sp.GetAnimationMaxDuration();
var filename = $"{sp.Name}_{timestamp}_{Guid.NewGuid().ToString()[..6]}_{_fps}{FormatSuffix}";
var output = Path.Combine(_outputDir ?? sp.AssetsDir, filename);

20
SpineViewer/ViewModels/Exporters/FrameSequenceExporterViewModel.cs
View File

@@ -56,7 +56,9 @@ namespace SpineViewer.ViewModels.Exporters
var output = Path.Combine(_outputDir!, folderName);
if (_autoResolution) SetAutoResolutionAnimated(exporter, spines);
exporter.Duration = _duration >= 0 ? _duration : spines.Select(sp => sp.GetAnimationMaxDuration()).DefaultIfEmpty(0).Max();
// 如果时长是一个负数值则使用所有动画时长的最大值
exporter.Duration = _duration < 0 ? spines.Select(sp => sp.GetAnimationMaxDuration()).DefaultIfEmpty(0).Max() : _duration;
exporter.ProgressReporter = (total, done, text) =>
{
@@ -83,12 +85,7 @@ namespace SpineViewer.ViewModels.Exporters
{
// 统计总帧数
int totalFrameCount = 0;
if (_duration > 0)
{
exporter.Duration = _duration;
totalFrameCount = exporter.GetFrameCount() * spines.Length;
}
else
if (_duration < 0)
{
foreach (var sp in spines)
{
@@ -96,6 +93,11 @@ namespace SpineViewer.ViewModels.Exporters
totalFrameCount += exporter.GetFrameCount();
}
}
else
{
exporter.Duration = _duration;
totalFrameCount = exporter.GetFrameCount() * spines.Length;
}
pr.Total = totalFrameCount;
pr.Done = 0;
@@ -118,7 +120,9 @@ namespace SpineViewer.ViewModels.Exporters
}
if (_autoResolution) SetAutoResolutionAnimated(exporter, sp);
if (_duration <= 0) exporter.Duration = sp.GetAnimationMaxDuration();
// 如果时长是负数则需要每次都设置成动画的时长值, 否则前面统计帧数时已经设置过时长值
if (_duration < 0) exporter.Duration = sp.GetAnimationMaxDuration();
var folderName = $"{sp.Name}_{timestamp}_{Guid.NewGuid().ToString()[..6]}_{_fps}";
var output = Path.Combine(_outputDir ?? sp.AssetsDir, folderName);