From 01a924a0cef07c2df54d52e6aee950e49a0bee38 Mon Sep 17 00:00:00 2001 From: Venomalia <87765258+Venomalia@users.noreply.github.com> Date: Wed, 13 Dec 2023 22:03:03 +0100 Subject: [PATCH] bump --- README.md | 8 +++----- .../DolphinTextureExtraction tool.csproj | 6 +++--- lib/AuroraLip/AuroraLib.csproj | 6 +++--- lib/AuroraLip/Texture/BlockFormats/CMPRBlock.cs | 3 ++- lib/AuroraLip/Texture/BlockFormats/IA4Block.cs | 1 + lib/AuroraLip/Texture/BlockFormats/RGBA32Block.cs | 4 +++- lib/AuroraLip/Texture/DolphinTextureHashInfo.cs | 1 + lib/AuroraLip/Texture/Formats/LFXT.cs | 1 + lib/AuroraLip/Texture/Formats/PIL.cs | 1 + lib/AuroraLip/Texture/Formats/PIM.cs | 1 + lib/AuroraLip/Texture/Formats/TGA.cs | 5 +++-- lib/AuroraLip/Texture/IBlock{TPixel}.cs | 3 ++- lib/AuroraLip/Texture/ImageEX.cs | 3 +++ lib/AuroraLip/Texture/PixelFormats/I16.cs | 3 ++- lib/AuroraLip/Texture/PixelFormats/I8.cs | 3 ++- lib/AuroraLip/Texture/PixelFormats/IA4.cs | 3 ++- lib/AuroraLip/Texture/PixelFormats/IA8.cs | 3 ++- lib/AuroraLip/Texture/PixelFormats/RGB565.cs | 3 ++- lib/AuroraLip/Texture/PixelFormats/RGB5A3.cs | 3 ++- lib/AuroraLip/Texture/TexEntry.cs | 2 ++ 20 files changed, 41 insertions(+), 22 deletions(-) diff --git a/README.md b/README.md index 5e6597f1..eac29ca4 100644 --- a/README.md +++ b/README.md @@ -46,11 +46,13 @@ List of all [commands](https://github.com/Venomalia/DolphinTextureExtraction-too ## Credits +- [AuroraLib.Compression](https://github.com/Venomalia/AuroraLib.Compression) used as Compression library. + - [ImageSharp](https://github.com/SixLabors/ImageSharp) used as graphics API. - [Hack.io](https://github.com/SuperHackio/Hack.io) to read RARC, U8, YAZ, YAY, BTI, TPL, TEX1, BMD and BDL Format -- [Puyo Tools](https://github.com/nickworonekin/puyotools) Code reference for ONE GVMH, GBIX, GCIX, GVRT, Format and to read PRS, CNX, Lz00, lz01 Lz10, Lz11 Compressing. +- [Puyo Tools](https://github.com/nickworonekin/puyotools) Code reference for ONE GVMH, GBIX, GCIX, GVRT, Format. - [HashDepot](https://github.com/ssg/HashDepot) used for xxHash generation @@ -58,14 +60,10 @@ List of all [commands](https://github.com/Venomalia/DolphinTextureExtraction-too - [SevenZip](https://github.com/adoconnection/SevenZipExtractor) to read formats supported by 7Zip -- [SharpZipLib](https://github.com/icsharpcode/SharpZipLib) to read ZLib Compressing - - [AFSLib](https://github.com/MaikelChan/AFSLib) to read AFS archive format - [cpk-tools](https://github.com/ConnorKrammer/cpk-tools) to read CRIWARE's CPK archive format -- [CLZ-Compression](https://github.com/sukharah/CLZ-Compression) Code reference for CLZ Compressing - - [Switch-Toolbox](https://github.com/KillzXGaming/Switch-Toolbox/blob/12dfbaadafb1ebcd2e07d239361039a8d05df3f7/File_Format_Library/FileFormats/NLG/MarioStrikers/StrikersRLT.cs) Code reference for PTLG Format - [Rune Factory Frontier Tools](https://github.com/master801/Rune-Factory-Frontier-Tools) Code reference for NLCM Archives diff --git a/TextureExtraction tool/DolphinTextureExtraction tool.csproj b/TextureExtraction tool/DolphinTextureExtraction tool.csproj index 4c592b79..856718da 100644 --- a/TextureExtraction tool/DolphinTextureExtraction tool.csproj +++ b/TextureExtraction tool/DolphinTextureExtraction tool.csproj @@ -7,7 +7,7 @@ enable disable False - 1.7.16.$([System.DateTime]::Now.ToString(`MMdd`)) + 1.7.26.$([System.DateTime]::Now.ToString(`MMdd`)) $(Version) $(Version) MIT @@ -36,11 +36,11 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/lib/AuroraLip/AuroraLib.csproj b/lib/AuroraLip/AuroraLib.csproj index 95dc7a16..822769ca 100644 --- a/lib/AuroraLip/AuroraLib.csproj +++ b/lib/AuroraLip/AuroraLib.csproj @@ -24,11 +24,11 @@ - + - + - + diff --git a/lib/AuroraLip/Texture/BlockFormats/CMPRBlock.cs b/lib/AuroraLip/Texture/BlockFormats/CMPRBlock.cs index cc1ca539..cfbde7b1 100644 --- a/lib/AuroraLip/Texture/BlockFormats/CMPRBlock.cs +++ b/lib/AuroraLip/Texture/BlockFormats/CMPRBlock.cs @@ -1,6 +1,7 @@ using AuroraLib.Texture.PixelFormats; using System.Numerics; using System.Runtime.InteropServices; +using SixLabors.ImageSharp.PixelFormats; namespace AuroraLib.Texture.BlockFormats { @@ -159,7 +160,7 @@ private static void GetDominantColors(Span pixels, out RGB565 color0, ou /// The RGBA color value of the pixel. /// The span of colors to compare against. /// The index of the closest color in the set of colors. - private static int GetColorIndex(in Rgba32 pixel, Span colors) + private static int GetColorIndex(Rgba32 pixel, Span colors) { float minDistance = float.MaxValue; int colorIndex = 0; diff --git a/lib/AuroraLip/Texture/BlockFormats/IA4Block.cs b/lib/AuroraLip/Texture/BlockFormats/IA4Block.cs index 38315421..202ef193 100644 --- a/lib/AuroraLip/Texture/BlockFormats/IA4Block.cs +++ b/lib/AuroraLip/Texture/BlockFormats/IA4Block.cs @@ -1,5 +1,6 @@ using AuroraLib.Texture.PixelFormats; using System.Runtime.InteropServices; +using SixLabors.ImageSharp.PixelFormats; namespace AuroraLib.Texture.BlockFormats { diff --git a/lib/AuroraLip/Texture/BlockFormats/RGBA32Block.cs b/lib/AuroraLip/Texture/BlockFormats/RGBA32Block.cs index dbb56151..f53cd069 100644 --- a/lib/AuroraLip/Texture/BlockFormats/RGBA32Block.cs +++ b/lib/AuroraLip/Texture/BlockFormats/RGBA32Block.cs @@ -1,4 +1,6 @@ -namespace AuroraLib.Texture.BlockFormats +using SixLabors.ImageSharp.PixelFormats; + +namespace AuroraLib.Texture.BlockFormats { /// /// Represents a block of RGBA32 pixels. Each block has a size of 4x4 pixels. diff --git a/lib/AuroraLip/Texture/DolphinTextureHashInfo.cs b/lib/AuroraLip/Texture/DolphinTextureHashInfo.cs index 0e094825..7e0da584 100644 --- a/lib/AuroraLip/Texture/DolphinTextureHashInfo.cs +++ b/lib/AuroraLip/Texture/DolphinTextureHashInfo.cs @@ -1,6 +1,7 @@ using AuroraLib.Core.Text; using AuroraLib.Texture.Interfaces; using System.Text.RegularExpressions; +using SixLabors.ImageSharp; namespace AuroraLib.Texture { diff --git a/lib/AuroraLip/Texture/Formats/LFXT.cs b/lib/AuroraLip/Texture/Formats/LFXT.cs index 00ebc772..937d8ed1 100644 --- a/lib/AuroraLip/Texture/Formats/LFXT.cs +++ b/lib/AuroraLip/Texture/Formats/LFXT.cs @@ -2,6 +2,7 @@ using AuroraLib.Core.Interfaces; using AuroraLib.Texture.BlockFormats; using System.Runtime.InteropServices; +using SixLabors.ImageSharp.PixelFormats; namespace AuroraLib.Texture.Formats { diff --git a/lib/AuroraLip/Texture/Formats/PIL.cs b/lib/AuroraLip/Texture/Formats/PIL.cs index 07fe5b0e..13a96a53 100644 --- a/lib/AuroraLip/Texture/Formats/PIL.cs +++ b/lib/AuroraLip/Texture/Formats/PIL.cs @@ -1,6 +1,7 @@ using AuroraLib.Common; using AuroraLib.Texture.PixelFormats; using System.Runtime.InteropServices; +using SixLabors.ImageSharp.PixelFormats; namespace AuroraLib.Texture.Formats { diff --git a/lib/AuroraLip/Texture/Formats/PIM.cs b/lib/AuroraLip/Texture/Formats/PIM.cs index d4a45ff2..0eb27ec6 100644 --- a/lib/AuroraLip/Texture/Formats/PIM.cs +++ b/lib/AuroraLip/Texture/Formats/PIM.cs @@ -1,6 +1,7 @@ using AuroraLib.Common; using AuroraLib.Texture.PixelFormats; using System.Runtime.InteropServices; +using SixLabors.ImageSharp.PixelFormats; namespace AuroraLib.Texture { diff --git a/lib/AuroraLip/Texture/Formats/TGA.cs b/lib/AuroraLip/Texture/Formats/TGA.cs index 6abc8321..e5f51432 100644 --- a/lib/AuroraLip/Texture/Formats/TGA.cs +++ b/lib/AuroraLip/Texture/Formats/TGA.cs @@ -1,8 +1,9 @@ using AuroraLib.Common; using AuroraLib.Texture.PixelFormats; -using RenderWareNET.Plugins; +using SixLabors.ImageSharp; using SixLabors.ImageSharp.Formats; using SixLabors.ImageSharp.Formats.Tga; +using SixLabors.ImageSharp.PixelFormats; using System.Runtime.InteropServices; namespace AuroraLib.Texture.Formats @@ -14,7 +15,7 @@ public class TGA : JUTTexture, IFileAccess public bool CanWrite => false; - public static readonly string[] Extensions = new string[]{ ".tga", ".vda", ".icb", ".vst" }; + public static readonly string[] Extensions = new string[] { ".tga", ".vda", ".icb", ".vst" }; public bool IsMatch(Stream stream, ReadOnlySpan extension = default) { diff --git a/lib/AuroraLip/Texture/IBlock{TPixel}.cs b/lib/AuroraLip/Texture/IBlock{TPixel}.cs index acdaae49..8e132514 100644 --- a/lib/AuroraLip/Texture/IBlock{TPixel}.cs +++ b/lib/AuroraLip/Texture/IBlock{TPixel}.cs @@ -1,7 +1,8 @@ using AuroraLib.Core.Buffers; -using SixLabors.ImageSharp.Advanced; using System.Numerics; using System.Runtime.InteropServices; +using SixLabors.ImageSharp.PixelFormats; +using SixLabors.ImageSharp; namespace AuroraLib.Texture { diff --git a/lib/AuroraLip/Texture/ImageEX.cs b/lib/AuroraLip/Texture/ImageEX.cs index 4581ada0..c632dd3b 100644 --- a/lib/AuroraLip/Texture/ImageEX.cs +++ b/lib/AuroraLip/Texture/ImageEX.cs @@ -1,8 +1,11 @@ using AuroraLib.Common; using AuroraLib.Texture.BlockFormats; using AuroraLib.Texture.PixelFormats; +using SixLabors.ImageSharp; using SixLabors.ImageSharp.Advanced; using SixLabors.ImageSharp.Memory; +using SixLabors.ImageSharp.PixelFormats; +using SixLabors.ImageSharp.Processing; using SixLabors.ImageSharp.Processing.Processors.Transforms; using System.Drawing; using System.Numerics; diff --git a/lib/AuroraLip/Texture/PixelFormats/I16.cs b/lib/AuroraLip/Texture/PixelFormats/I16.cs index c59fd2ff..f1e0decd 100644 --- a/lib/AuroraLip/Texture/PixelFormats/I16.cs +++ b/lib/AuroraLip/Texture/PixelFormats/I16.cs @@ -1,4 +1,5 @@ -using System.Numerics; +using SixLabors.ImageSharp.PixelFormats; +using System.Numerics; using System.Runtime.CompilerServices; namespace AuroraLib.Texture.PixelFormats diff --git a/lib/AuroraLip/Texture/PixelFormats/I8.cs b/lib/AuroraLip/Texture/PixelFormats/I8.cs index 104cddab..56269fba 100644 --- a/lib/AuroraLip/Texture/PixelFormats/I8.cs +++ b/lib/AuroraLip/Texture/PixelFormats/I8.cs @@ -1,4 +1,5 @@ -using System.Numerics; +using SixLabors.ImageSharp.PixelFormats; +using System.Numerics; using System.Runtime.CompilerServices; namespace AuroraLib.Texture.PixelFormats diff --git a/lib/AuroraLip/Texture/PixelFormats/IA4.cs b/lib/AuroraLip/Texture/PixelFormats/IA4.cs index 903203fa..779954d3 100644 --- a/lib/AuroraLip/Texture/PixelFormats/IA4.cs +++ b/lib/AuroraLip/Texture/PixelFormats/IA4.cs @@ -1,4 +1,5 @@ -using System.Numerics; +using SixLabors.ImageSharp.PixelFormats; +using System.Numerics; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; diff --git a/lib/AuroraLip/Texture/PixelFormats/IA8.cs b/lib/AuroraLip/Texture/PixelFormats/IA8.cs index 6dd2633a..35dda858 100644 --- a/lib/AuroraLip/Texture/PixelFormats/IA8.cs +++ b/lib/AuroraLip/Texture/PixelFormats/IA8.cs @@ -1,4 +1,5 @@ -using System.Numerics; +using SixLabors.ImageSharp.PixelFormats; +using System.Numerics; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; diff --git a/lib/AuroraLip/Texture/PixelFormats/RGB565.cs b/lib/AuroraLip/Texture/PixelFormats/RGB565.cs index 5660b4a4..28ac58a9 100644 --- a/lib/AuroraLip/Texture/PixelFormats/RGB565.cs +++ b/lib/AuroraLip/Texture/PixelFormats/RGB565.cs @@ -1,4 +1,5 @@ -using System.Numerics; +using SixLabors.ImageSharp.PixelFormats; +using System.Numerics; using System.Runtime.CompilerServices; namespace AuroraLib.Texture.PixelFormats diff --git a/lib/AuroraLip/Texture/PixelFormats/RGB5A3.cs b/lib/AuroraLip/Texture/PixelFormats/RGB5A3.cs index 8ad09552..e86a038a 100644 --- a/lib/AuroraLip/Texture/PixelFormats/RGB5A3.cs +++ b/lib/AuroraLip/Texture/PixelFormats/RGB5A3.cs @@ -1,4 +1,5 @@ -using System.Numerics; +using SixLabors.ImageSharp.PixelFormats; +using System.Numerics; using System.Runtime.CompilerServices; namespace AuroraLib.Texture.PixelFormats diff --git a/lib/AuroraLip/Texture/TexEntry.cs b/lib/AuroraLip/Texture/TexEntry.cs index d9d94c5d..2ba4e2e2 100644 --- a/lib/AuroraLip/Texture/TexEntry.cs +++ b/lib/AuroraLip/Texture/TexEntry.cs @@ -4,6 +4,8 @@ using AuroraLib.Texture.Interfaces; using AuroraLib.Texture.PixelFormats; using System.Runtime.InteropServices; +using SixLabors.ImageSharp; +using SixLabors.ImageSharp.PixelFormats; namespace AuroraLib.Texture {