Merge main into '3dSkinRenderer'

This commit is contained in:
miku-666
2024-07-21 12:15:57 +02:00
12 changed files with 13 additions and 64 deletions

View File

@@ -1,13 +1,5 @@
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
using System.Drawing;
using AnimatedGif;
using Newtonsoft.Json.Linq;
using PckStudio.Internal;
namespace PckStudio.Extensions

View File

@@ -1,5 +1,4 @@
using System;
using System.Drawing;
using System.Drawing;
using System.Numerics;
namespace PckStudio.Extensions

View File

@@ -1,9 +1,5 @@
using System;
using System.Collections.Generic;
using System.Drawing;
using System.Drawing;
using System.Drawing.Drawing2D;
using System.Linq;
using System.Text;
namespace PckStudio.Extensions
{

View File

@@ -23,7 +23,6 @@ using System.Drawing.Drawing2D;
using System.Collections.Generic;
using System.Runtime.InteropServices;
using System.Linq;
using PckStudio.Internal;
using System.Runtime.CompilerServices;
using System.Threading.Tasks;
using PckStudio.Internal.App;
@@ -113,8 +112,6 @@ namespace PckStudio.Extensions
private static Size CalculateImageSize(IEnumerable<Image> sources, ImageLayoutDirection layoutDirection)
{
Size size = sources.First().Size;
int width = size.Width;
int height = size.Height;
int count = sources.Count();
if (count < 2)
@@ -122,15 +119,15 @@ namespace PckStudio.Extensions
var horizontal = layoutDirection == ImageLayoutDirection.Horizontal;
if (!sources.All(img => img.Width.Equals(width) && img.Height.Equals(height)))
if (!sources.All(img => img.Size == size))
throw new InvalidOperationException("Images must have the same width and height.");
if (horizontal)
width *= count;
size.Width *= count;
else
height *= count;
size.Height *= count;
return new Size(width, height);
return size;
}
internal static Image Resize(this Image image, Size size, GraphicsConfig graphicsConfig)

View File

@@ -1,9 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using OMI.Formats.Languages;
using OMI.Formats.Languages;
namespace PckStudio.Extensions
{

View File

@@ -1,9 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using OMI.Formats.Material;
using OMI.Formats.Material;
namespace PckStudio.Extensions
{

View File

@@ -1,8 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace PckStudio.Extensions
{

View File

@@ -1,20 +1,17 @@
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Drawing;
using System.Drawing.Imaging;
using System.IO;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using OMI.Formats.Languages;
using OMI.Formats.Pck;
using OMI.Workers;
using PckStudio.Internal;
using PckStudio.Interfaces;
using PckStudio.Internal.Deserializer;
using PckStudio.Internal.Serializer;
using PckStudio.Internal.Skin;
using System.Linq;
using System.Diagnostics;
namespace PckStudio.Extensions
{

View File

@@ -1,10 +1,4 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using OMI.Formats.Pck;
using OMI.Formats.Pck;
using OMI.Workers;
namespace PckStudio.Extensions

View File

@@ -1,9 +1,5 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Reflection;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
namespace PckStudio.Extensions

View File

@@ -1,8 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Collections.Generic;
using System.Windows.Forms;
namespace PckStudio.Extensions

View File

@@ -1,10 +1,6 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
using PckStudio.Internal.App;
namespace PckStudio.Extensions
{