Merge pull request #69 from ww-rm/dev/wpf

CHANGELOG.md

@@ -1,5 +1,10 @@
 # CHANGELOG
 
+## v0.15.6
+
+- 修复导出单个的时长错误
+- 修改默认导出背景色为不透明黑色
+
 ## v0.15.5
 
 - 修复自定义导出时的画面错误

README.md

@@ -25,7 +25,7 @@
 - 支持自动分辨率批量导出
 - 支持 FFmpeg 自定义导出
 - 支持程序参数保存
-- ...
+- ......
 
 ### Spine 版本支持
 

Spine/Exporters/BaseExporter.cs

@@ -82,12 +82,12 @@ namespace Spine.Exporters
                 _backgroundColorPma = bcPma;
             }
         }
-        protected Color _backgroundColor = Color.Transparent;
+        protected Color _backgroundColor = Color.Black;
 
         /// <summary>
         /// 预乘后的背景颜色
         /// </summary>
-        protected Color _backgroundColorPma = Color.Transparent;
+        protected Color _backgroundColorPma = Color.Black;
 
         /// <summary>
         /// 画面分辨率

Spine/Spine.csproj

@@ -7,7 +7,7 @@
         <TargetFramework>net8.0-windows</TargetFramework>
         <BaseOutputPath>$(SolutionDir)out</BaseOutputPath>
         <IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
-        <Version>0.15.5</Version>
+        <Version>0.15.6</Version>
     </PropertyGroup>
 
     <PropertyGroup>

SpineViewer/SpineViewer.csproj

@@ -7,7 +7,7 @@
         <TargetFramework>net8.0-windows</TargetFramework>
         <BaseOutputPath>$(SolutionDir)out</BaseOutputPath>
         <IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
-        <Version>0.15.5</Version>
+        <Version>0.15.6</Version>
         <OutputType>WinExe</OutputType>
         <UseWPF>true</UseWPF>
     </PropertyGroup>

SpineViewer/ViewModels/Exporters/BaseExporterViewModel.cs

@@ -54,7 +54,7 @@ namespace SpineViewer.ViewModels.Exporters
         /// 背景颜色
         /// </summary>
         public Color BackgroundColor { get => _backgroundColor; set => SetProperty(ref _backgroundColor, value); }
-        protected Color _backgroundColor = Color.FromArgb(0, 0, 0, 0);
+        protected Color _backgroundColor = Color.FromArgb(255, 0, 0, 0);
 
         /// <summary>
         /// 四周边缘距离

SpineViewer/ViewModels/Exporters/CustomFFmpegExporterViewModel.cs

@@ -92,7 +92,7 @@ namespace SpineViewer.ViewModels.Exporters
                 var output = Path.Combine(_outputDir!, filename);
 
                 if (_autoResolution) SetAutoResolutionAnimated(exporter, spines);
-                if (_duration < 0) exporter.Duration = spines.Select(sp => sp.GetAnimationMaxDuration()).DefaultIfEmpty(0).Max();
+                exporter.Duration = _duration >= 0 ? _duration : spines.Select(sp => sp.GetAnimationMaxDuration()).DefaultIfEmpty(0).Max();
 
                 exporter.ProgressReporter = (total, done, text) =>
                 {

SpineViewer/ViewModels/Exporters/FFmpegVideoExporterViewModel.cs

@@ -83,7 +83,7 @@ namespace SpineViewer.ViewModels.Exporters
                 var output = Path.Combine(_outputDir!, filename);
 
                 if (_autoResolution) SetAutoResolutionAnimated(exporter, spines);
-                if (_duration < 0) exporter.Duration = spines.Select(sp => sp.GetAnimationMaxDuration()).DefaultIfEmpty(0).Max();
+                exporter.Duration = _duration >= 0 ? _duration : spines.Select(sp => sp.GetAnimationMaxDuration()).DefaultIfEmpty(0).Max();
 
                 exporter.ProgressReporter = (total, done, text) =>
                 {

SpineViewer/ViewModels/Exporters/FrameSequenceExporterViewModel.cs

@@ -56,12 +56,12 @@ namespace SpineViewer.ViewModels.Exporters
                 var output = Path.Combine(_outputDir!, folderName);
 
                 if (_autoResolution) SetAutoResolutionAnimated(exporter, spines);
-                if (_duration < 0) exporter.Duration = spines.Select(sp => sp.GetAnimationMaxDuration()).DefaultIfEmpty(0).Max();
+                exporter.Duration = _duration >= 0 ? _duration : spines.Select(sp => sp.GetAnimationMaxDuration()).DefaultIfEmpty(0).Max();
 
                 exporter.ProgressReporter = (total, done, text) =>
                 {
-                    pr.Total = total; 
-                    pr.Done = done; 
+                    pr.Total = total;
+                    pr.Done = done;
                     pr.ProgressText = text;
                     _vmMain.ProgressValue = pr.Done / pr.Total;
                 };