tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

upgrades SixLabors.ImageSharp

Browse Source
This commit is contained in:
Tyler Young
2020-06-12 18:58:28 -04:00
parent ca1d255b6c
commit 48c1bef091
3 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Client/Content.Client.csproj
View File

@@ -12,8 +12,8 @@
<Import Project="..\RobustToolbox\MSBuild\Robust.DefineConstants.targets" /> <Import Project="..\RobustToolbox\MSBuild\Robust.DefineConstants.targets" />
<ItemGroup> <ItemGroup>
<PackageReference Include="Nett" Version="0.13.0" /> <PackageReference Include="Nett" Version="0.13.0" />
<PackageReference Include="SixLabors.Core" Version="1.0.0-beta0007" /> <PackageReference Include="SixLabors.ImageSharp" Version="1.0.0-rc0002" />
<PackageReference Include="SixLabors.ImageSharp" Version="1.0.0-beta0006" /> <PackageReference Include="SixLabors.ImageSharp.Drawing" Version="1.0.0-beta0009" />
<PackageReference Include="System.ValueTuple" Version="4.5.0" /> <PackageReference Include="System.ValueTuple" Version="4.5.0" />
<PackageReference Include="YamlDotNet" Version="8.1.0" /> <PackageReference Include="YamlDotNet" Version="8.1.0" />
<PackageReference Include="SharpZipLib" Version="1.2.0" /> <PackageReference Include="SharpZipLib" Version="1.2.0" />

6
Content.Client/Parallax/ParallaxGenerator.cs
View File

@@ -11,7 +11,7 @@ using Robust.Shared.Random;
using SixLabors.ImageSharp; using SixLabors.ImageSharp;
using SixLabors.ImageSharp.Advanced; using SixLabors.ImageSharp.Advanced;
using SixLabors.ImageSharp.PixelFormats; using SixLabors.ImageSharp.PixelFormats;
using SixLabors.Primitives; using Color = Robust.Shared.Maths.Color;
namespace Content.Client.Parallax namespace Content.Client.Parallax
{ {
@@ -28,7 +28,7 @@ namespace Content.Client.Parallax
sawmill.Debug("Timing start!"); sawmill.Debug("Timing start!");
var sw = new Stopwatch(); var sw = new Stopwatch();
sw.Start(); sw.Start();
var image = new Image<Rgba32>(Configuration.Default, size.Width, size.Height, Rgba32.Black); var image = new Image<Rgba32>(Configuration.Default, size.Width, size.Height, new Rgba32(0,0,0,0));
var count = 0; var count = 0;
foreach (var layer in generator.Layers) foreach (var layer in generator.Layers)
{ {
@@ -320,7 +320,7 @@ namespace Content.Client.Parallax
public override void Apply(Image<Rgba32> bitmap) public override void Apply(Image<Rgba32> bitmap)
{ {
// Temporary buffer so we don't mess up blending. // Temporary buffer so we don't mess up blending.
using (var buffer = new Image<Rgba32>(Configuration.Default, bitmap.Width, bitmap.Height, Rgba32.Black)) using (var buffer = new Image<Rgba32>(Configuration.Default, bitmap.Width, bitmap.Height, new Rgba32(0,0,0,0)))
{ {
if (Masked) if (Masked)
{ {

1
Content.Client/Parallax/ParallaxManager.cs
View File

@@ -13,7 +13,6 @@ using Robust.Shared.Log;
using Robust.Shared.Utility; using Robust.Shared.Utility;
using SixLabors.ImageSharp; using SixLabors.ImageSharp;
using SixLabors.ImageSharp.PixelFormats; using SixLabors.ImageSharp.PixelFormats;
using SixLabors.Primitives;
namespace Content.Client.Parallax namespace Content.Client.Parallax
{ {