mirror/AssetStudio
1
0
Fork 0
mirror of https://github.com/aelurum/AssetStudio.git synced 2025-05-25 05:40:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

Update dependencies

Browse Source
This commit is contained in:
VaDiM 2023-12-16 04:16:27 +03:00
parent 4747687bec
commit 5333757843
3 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
AssetStudioGUI/AssetStudioGUI.csproj
View File

@ -54,14 +54,14 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft-WindowsAPICodePack-Core-6.0" Version="1.1.6-preview.2.24bd88f" /> <PackageReference Include="Microsoft-WindowsAPICodePack-Core-6.0" Version="1.1.6" />
<PackageReference Include="Microsoft-WindowsAPICodePack-Shell-6.0" Version="1.1.6-preview.2.24bd88f" /> <PackageReference Include="Microsoft-WindowsAPICodePack-Shell-6.0" Version="1.1.6" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" /> <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
</ItemGroup> </ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' != 'net472' "> <ItemGroup Condition=" '$(TargetFramework)' != 'net472' ">
<PackageReference Include="OpenTK.Graphics" Version="4.8.0" /> <PackageReference Include="OpenTK.Graphics" Version="4.8.2" />
<PackageReference Include="OpenTK.Windowing.Desktop" Version="4.8.0" /> <PackageReference Include="OpenTK.Windowing.Desktop" Version="4.8.2" />
<Reference Include="OpenTK.WinForms"> <Reference Include="OpenTK.WinForms">
<HintPath>Libraries\OpenTK.WinForms.dll</HintPath> <HintPath>Libraries\OpenTK.WinForms.dll</HintPath>
</Reference> </Reference>

2
AssetStudioUtility/AssetStudioUtility.csproj
View File

@ -22,7 +22,7 @@
<PackageReference Include="Kyaru.Texture2DDecoder"> <PackageReference Include="Kyaru.Texture2DDecoder">
<Version>0.17.0</Version> <Version>0.17.0</Version>
</PackageReference> </PackageReference>
<PackageReference Include="SixLabors.ImageSharp.Drawing" Version="1.0.0" /> <PackageReference Include="SixLabors.ImageSharp.Drawing" Version="2.1.0" />
</ItemGroup> </ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'net472' "> <ItemGroup Condition=" '$(TargetFramework)' == 'net472' ">

17
AssetStudioUtility/SpriteHelper.cs
View File

@ -154,9 +154,16 @@ namespace AssetStudio
if (triangles.Length < 1024) if (triangles.Length < 1024)
{ {
var rectP = new RectangularPolygon(0, 0, rect.Width, rect.Height); var rectP = new RectangularPolygon(0, 0, rect.Width, rect.Height);
spriteImage.Mutate(x => x.Fill(options, SixLabors.ImageSharp.Color.Red, rectP.Clip(path))); try
spriteImage.Mutate(x => x.Flip(FlipMode.Vertical)); {
return spriteImage; spriteImage.Mutate(x => x.Fill(options, SixLabors.ImageSharp.Color.Red, rectP.Clip(path)));
spriteImage.Mutate(x => x.Flip(FlipMode.Vertical));
return spriteImage;
}
catch (ArgumentOutOfRangeException)
{
// ignored
}
} }
using (var mask = new Image<Bgra32>(rect.Width, rect.Height, SixLabors.ImageSharp.Color.Black)) using (var mask = new Image<Bgra32>(rect.Width, rect.Height, SixLabors.ImageSharp.Color.Black))
{ {
@ -167,9 +174,9 @@ namespace AssetStudio
return spriteImage; return spriteImage;
} }
} }
catch catch (Exception e)
{ {
// ignored Logger.Warning($"{m_Sprite.m_Name} Unable to render the packed sprite correctly.\n{e}");
} }
} }