From 18abd1731b18cc60665bc43449f70ffd948778ad Mon Sep 17 00:00:00 2001 From: Jeremy Pritts Date: Mon, 7 Nov 2022 09:58:53 -0500 Subject: [PATCH] Standardize naming for floating point rgb formats --- .../Program.cs | 16 ++--- .../Program.cs | 20 +++--- ...RHalfTests.g.cs => ColorR16HalfTests.g.cs} | 70 +++++++++---------- ...gleTests.g.cs => ColorR32SingleTests.g.cs} | 38 +++++----- ...HalfTests.g.cs => ColorRG32HalfTests.g.cs} | 54 +++++++------- ...leTests.g.cs => ColorRG64SingleTests.g.cs} | 30 ++++---- .../Formats/ColorRGB32HalfTests.g.cs | 24 +++---- ...alfTests.g.cs => ColorRGB48HalfTests.g.cs} | 38 +++++----- ...eTests.g.cs => ColorRGB96SingleTests.g.cs} | 22 +++--- ...ests.g.cs => ColorRGBA128SingleTests.g.cs} | 14 ++-- ...lfTests.g.cs => ColorRGBA64HalfTests.g.cs} | 22 +++--- .../NewRgbTests.cs | 12 ++-- AssetRipper.TextureDecoder/Bc/BcDecoder.cs | 6 +- .../{ColorRHalf.g.cs => ColorR16Half.g.cs} | 2 +- ...{ColorRSingle.g.cs => ColorR32Single.g.cs} | 2 +- .../{ColorRGHalf.g.cs => ColorRG32Half.g.cs} | 2 +- ...olorRGSingle.g.cs => ColorRG64Single.g.cs} | 2 +- ...{ColorRGBHalf.g.cs => ColorRGB48Half.g.cs} | 2 +- ...orRGBSingle.g.cs => ColorRGB96Single.g.cs} | 2 +- ...GBASingle.g.cs => ColorRGBA128Single.g.cs} | 2 +- ...olorRGBAHalf.g.cs => ColorRGBA64Half.g.cs} | 2 +- 21 files changed, 191 insertions(+), 191 deletions(-) rename AssetRipper.TextureDecoder.Tests/Formats/{ColorRHalfTests.g.cs => ColorR16HalfTests.g.cs} (59%) rename AssetRipper.TextureDecoder.Tests/Formats/{ColorRSingleTests.g.cs => ColorR32SingleTests.g.cs} (70%) rename AssetRipper.TextureDecoder.Tests/Formats/{ColorRGHalfTests.g.cs => ColorRG32HalfTests.g.cs} (64%) rename AssetRipper.TextureDecoder.Tests/Formats/{ColorRGSingleTests.g.cs => ColorRG64SingleTests.g.cs} (74%) rename AssetRipper.TextureDecoder.Tests/Formats/{ColorRGBHalfTests.g.cs => ColorRGB48HalfTests.g.cs} (71%) rename AssetRipper.TextureDecoder.Tests/Formats/{ColorRGBSingleTests.g.cs => ColorRGB96SingleTests.g.cs} (80%) rename AssetRipper.TextureDecoder.Tests/Formats/{ColorRGBASingleTests.g.cs => ColorRGBA128SingleTests.g.cs} (86%) rename AssetRipper.TextureDecoder.Tests/Formats/{ColorRGBAHalfTests.g.cs => ColorRGBA64HalfTests.g.cs} (80%) rename AssetRipper.TextureDecoder/Rgb/Formats/{ColorRHalf.g.cs => ColorR16Half.g.cs} (93%) rename AssetRipper.TextureDecoder/Rgb/Formats/{ColorRSingle.g.cs => ColorR32Single.g.cs} (93%) rename AssetRipper.TextureDecoder/Rgb/Formats/{ColorRGHalf.g.cs => ColorRG32Half.g.cs} (93%) rename AssetRipper.TextureDecoder/Rgb/Formats/{ColorRGSingle.g.cs => ColorRG64Single.g.cs} (93%) rename AssetRipper.TextureDecoder/Rgb/Formats/{ColorRGBHalf.g.cs => ColorRGB48Half.g.cs} (93%) rename AssetRipper.TextureDecoder/Rgb/Formats/{ColorRGBSingle.g.cs => ColorRGB96Single.g.cs} (92%) rename AssetRipper.TextureDecoder/Rgb/Formats/{ColorRGBASingle.g.cs => ColorRGBA128Single.g.cs} (92%) rename AssetRipper.TextureDecoder/Rgb/Formats/{ColorRGBAHalf.g.cs => ColorRGBA64Half.g.cs} (92%) diff --git a/AssetRipper.TextureDecoder.ColorGenerator/Program.cs b/AssetRipper.TextureDecoder.ColorGenerator/Program.cs index a9d0b6a..34ed674 100644 --- a/AssetRipper.TextureDecoder.ColorGenerator/Program.cs +++ b/AssetRipper.TextureDecoder.ColorGenerator/Program.cs @@ -68,15 +68,15 @@ internal static class Program ( "ColorRGB48Signed", typeof(short), true, true, true, false ), ( "ColorRGBA64Signed", typeof(short), true, true, true, true ), - ( "ColorRHalf", typeof(Half), true, false, false, false ), - ( "ColorRGHalf", typeof(Half), true, true, false, false ), - ( "ColorRGBHalf", typeof(Half), true, true, true, false ), - ( "ColorRGBAHalf", typeof(Half), true, true, true, true ), + ( "ColorR16Half", typeof(Half), true, false, false, false ), + ( "ColorRG32Half", typeof(Half), true, true, false, false ), + ( "ColorRGB48Half", typeof(Half), true, true, true, false ), + ( "ColorRGBA64Half", typeof(Half), true, true, true, true ), - ( "ColorRSingle", typeof(float), true, false, false, false ), - ( "ColorRGSingle", typeof(float), true, true, false, false ), - ( "ColorRGBSingle", typeof(float), true, true, true, false ), - ( "ColorRGBASingle", typeof(float), true, true, true, true ), + ( "ColorR32Single", typeof(float), true, false, false, false ), + ( "ColorRG64Single", typeof(float), true, true, false, false ), + ( "ColorRGB96Single", typeof(float), true, true, true, false ), + ( "ColorRGBA128Single", typeof(float), true, true, true, true ), }; /// diff --git a/AssetRipper.TextureDecoder.TestGenerator/Program.cs b/AssetRipper.TextureDecoder.TestGenerator/Program.cs index 17edfb4..bc63dde 100644 --- a/AssetRipper.TextureDecoder.TestGenerator/Program.cs +++ b/AssetRipper.TextureDecoder.TestGenerator/Program.cs @@ -18,33 +18,33 @@ namespace AssetRipper.TextureDecoder.TestGenerator new GenerationData(typeof(ColorARGB32), 4), new GenerationData(typeof(ColorBGRA32), 4), new GenerationData(typeof(ColorR16), 2), + new GenerationData(typeof(ColorR16Half), 2), new GenerationData(typeof(ColorR16Signed), 2), + new GenerationData(typeof(ColorR32Single), 4), new GenerationData(typeof(ColorR8), 1), new GenerationData(typeof(ColorR8Signed), 1), new GenerationData(typeof(ColorRG16), 2), + new GenerationData(typeof(ColorRG32Half), 4), new GenerationData(typeof(ColorRG16Signed), 2), new GenerationData(typeof(ColorRG32), 4), new GenerationData(typeof(ColorRG32Signed), 4), + new GenerationData(typeof(ColorRG64Single), 8), new GenerationData(typeof(ColorRGB16), 2), new GenerationData(typeof(ColorRGB24), 3), new GenerationData(typeof(ColorRGB24Signed), 3), + new GenerationData(typeof(ColorRGB32Half), 4), new GenerationData(typeof(ColorRGB48), 6), + new GenerationData(typeof(ColorRGB48Half), 6), new GenerationData(typeof(ColorRGB48Signed), 6), + new GenerationData(typeof(ColorRGB96Single), 12), new GenerationData(typeof(ColorRGB9e5), 4), + new GenerationData(typeof(ColorRGBA128Single), 16), new GenerationData(typeof(ColorRGBA16), 2), new GenerationData(typeof(ColorRGBA32), 4), new GenerationData(typeof(ColorRGBA32Signed), 4), - new GenerationData(typeof(ColorRGB32Half), 4), new GenerationData(typeof(ColorRGBA64), 8), + new GenerationData(typeof(ColorRGBA64Half), 8), new GenerationData(typeof(ColorRGBA64Signed), 8), - new GenerationData(typeof(ColorRGBAHalf), 8), - new GenerationData(typeof(ColorRGBASingle), 16), - new GenerationData(typeof(ColorRGBHalf), 6), - new GenerationData(typeof(ColorRGBSingle), 12), - new GenerationData(typeof(ColorRGHalf), 4), - new GenerationData(typeof(ColorRGSingle), 8), - new GenerationData(typeof(ColorRHalf), 2), - new GenerationData(typeof(ColorRSingle), 4), }; private static readonly Dictionary randomValueDictionary = new() @@ -102,7 +102,7 @@ namespace AssetRipper.TextureDecoder.TestGenerator string outputFilePath = $"{OutputFolder}{data.ColorType.Name}Tests.g.cs"; File.WriteAllBytes(outputFilePath, memoryStream.ToArray()); - Console.WriteLine(outputFilePath); + Console.WriteLine(data.ColorType.Name); } Console.WriteLine("Done!"); diff --git a/AssetRipper.TextureDecoder.Tests/Formats/ColorRHalfTests.g.cs b/AssetRipper.TextureDecoder.Tests/Formats/ColorR16HalfTests.g.cs similarity index 59% rename from AssetRipper.TextureDecoder.Tests/Formats/ColorRHalfTests.g.cs rename to AssetRipper.TextureDecoder.Tests/Formats/ColorR16HalfTests.g.cs index c77cce3..54491fc 100644 --- a/AssetRipper.TextureDecoder.Tests/Formats/ColorRHalfTests.g.cs +++ b/AssetRipper.TextureDecoder.Tests/Formats/ColorR16HalfTests.g.cs @@ -6,12 +6,12 @@ using System.Runtime.CompilerServices; namespace AssetRipper.TextureDecoder.Tests.Formats; -public partial class ColorRHalfTests +public partial class ColorR16HalfTests { [Test] public void CorrectSizeTest() { - Assert.That(Unsafe.SizeOf(), Is.EqualTo(2)); + Assert.That(Unsafe.SizeOf(), Is.EqualTo(2)); } [Test] @@ -143,7 +143,7 @@ public partial class ColorRHalfTests }); } - public static ColorRHalf MakeRandomColor() + public static ColorR16Half MakeRandomColor() { return new() { @@ -155,74 +155,74 @@ public partial class ColorRHalfTests } [Test] - public void ConversionToColorRGBAHalfIsLossless() + public void ConversionToColorR16HalfIsLossless() { - ColorRHalf original = MakeRandomColor(); - ColorRGBAHalf converted = original.Convert(); - ColorRHalf convertedBack = converted.Convert(); + ColorR16Half original = MakeRandomColor(); + ColorR16Half converted = original.Convert(); + ColorR16Half convertedBack = converted.Convert(); Assert.That(convertedBack, Is.EqualTo(original)); } [Test] - public void ConversionToColorRGBASingleIsLossless() + public void ConversionToColorR32SingleIsLossless() { - ColorRHalf original = MakeRandomColor(); - ColorRGBASingle converted = original.Convert(); - ColorRHalf convertedBack = converted.Convert(); + ColorR16Half original = MakeRandomColor(); + ColorR32Single converted = original.Convert(); + ColorR16Half convertedBack = converted.Convert(); Assert.That(convertedBack, Is.EqualTo(original)); } [Test] - public void ConversionToColorRGBHalfIsLossless() + public void ConversionToColorRG32HalfIsLossless() { - ColorRHalf original = MakeRandomColor(); - ColorRGBHalf converted = original.Convert(); - ColorRHalf convertedBack = converted.Convert(); + ColorR16Half original = MakeRandomColor(); + ColorRG32Half converted = original.Convert(); + ColorR16Half convertedBack = converted.Convert(); Assert.That(convertedBack, Is.EqualTo(original)); } [Test] - public void ConversionToColorRGBSingleIsLossless() + public void ConversionToColorRG64SingleIsLossless() { - ColorRHalf original = MakeRandomColor(); - ColorRGBSingle converted = original.Convert(); - ColorRHalf convertedBack = converted.Convert(); + ColorR16Half original = MakeRandomColor(); + ColorRG64Single converted = original.Convert(); + ColorR16Half convertedBack = converted.Convert(); Assert.That(convertedBack, Is.EqualTo(original)); } [Test] - public void ConversionToColorRGHalfIsLossless() + public void ConversionToColorRGB48HalfIsLossless() { - ColorRHalf original = MakeRandomColor(); - ColorRGHalf converted = original.Convert(); - ColorRHalf convertedBack = converted.Convert(); + ColorR16Half original = MakeRandomColor(); + ColorRGB48Half converted = original.Convert(); + ColorR16Half convertedBack = converted.Convert(); Assert.That(convertedBack, Is.EqualTo(original)); } [Test] - public void ConversionToColorRGSingleIsLossless() + public void ConversionToColorRGB96SingleIsLossless() { - ColorRHalf original = MakeRandomColor(); - ColorRGSingle converted = original.Convert(); - ColorRHalf convertedBack = converted.Convert(); + ColorR16Half original = MakeRandomColor(); + ColorRGB96Single converted = original.Convert(); + ColorR16Half convertedBack = converted.Convert(); Assert.That(convertedBack, Is.EqualTo(original)); } [Test] - public void ConversionToColorRHalfIsLossless() + public void ConversionToColorRGBA128SingleIsLossless() { - ColorRHalf original = MakeRandomColor(); - ColorRHalf converted = original.Convert(); - ColorRHalf convertedBack = converted.Convert(); + ColorR16Half original = MakeRandomColor(); + ColorRGBA128Single converted = original.Convert(); + ColorR16Half convertedBack = converted.Convert(); Assert.That(convertedBack, Is.EqualTo(original)); } [Test] - public void ConversionToColorRSingleIsLossless() + public void ConversionToColorRGBA64HalfIsLossless() { - ColorRHalf original = MakeRandomColor(); - ColorRSingle converted = original.Convert(); - ColorRHalf convertedBack = converted.Convert(); + ColorR16Half original = MakeRandomColor(); + ColorRGBA64Half converted = original.Convert(); + ColorR16Half convertedBack = converted.Convert(); Assert.That(convertedBack, Is.EqualTo(original)); } } diff --git a/AssetRipper.TextureDecoder.Tests/Formats/ColorRSingleTests.g.cs b/AssetRipper.TextureDecoder.Tests/Formats/ColorR32SingleTests.g.cs similarity index 70% rename from AssetRipper.TextureDecoder.Tests/Formats/ColorRSingleTests.g.cs rename to AssetRipper.TextureDecoder.Tests/Formats/ColorR32SingleTests.g.cs index fc95744..8e05a27 100644 --- a/AssetRipper.TextureDecoder.Tests/Formats/ColorRSingleTests.g.cs +++ b/AssetRipper.TextureDecoder.Tests/Formats/ColorR32SingleTests.g.cs @@ -6,12 +6,12 @@ using System.Runtime.CompilerServices; namespace AssetRipper.TextureDecoder.Tests.Formats; -public partial class ColorRSingleTests +public partial class ColorR32SingleTests { [Test] public void CorrectSizeTest() { - Assert.That(Unsafe.SizeOf(), Is.EqualTo(4)); + Assert.That(Unsafe.SizeOf(), Is.EqualTo(4)); } [Test] @@ -143,7 +143,7 @@ public partial class ColorRSingleTests }); } - public static ColorRSingle MakeRandomColor() + public static ColorR32Single MakeRandomColor() { return new() { @@ -155,38 +155,38 @@ public partial class ColorRSingleTests } [Test] - public void ConversionToColorRGBASingleIsLossless() + public void ConversionToColorR32SingleIsLossless() { - ColorRSingle original = MakeRandomColor(); - ColorRGBASingle converted = original.Convert(); - ColorRSingle convertedBack = converted.Convert(); + ColorR32Single original = MakeRandomColor(); + ColorR32Single converted = original.Convert(); + ColorR32Single convertedBack = converted.Convert(); Assert.That(convertedBack, Is.EqualTo(original)); } [Test] - public void ConversionToColorRGBSingleIsLossless() + public void ConversionToColorRG64SingleIsLossless() { - ColorRSingle original = MakeRandomColor(); - ColorRGBSingle converted = original.Convert(); - ColorRSingle convertedBack = converted.Convert(); + ColorR32Single original = MakeRandomColor(); + ColorRG64Single converted = original.Convert(); + ColorR32Single convertedBack = converted.Convert(); Assert.That(convertedBack, Is.EqualTo(original)); } [Test] - public void ConversionToColorRGSingleIsLossless() + public void ConversionToColorRGB96SingleIsLossless() { - ColorRSingle original = MakeRandomColor(); - ColorRGSingle converted = original.Convert(); - ColorRSingle convertedBack = converted.Convert(); + ColorR32Single original = MakeRandomColor(); + ColorRGB96Single converted = original.Convert(); + ColorR32Single convertedBack = converted.Convert(); Assert.That(convertedBack, Is.EqualTo(original)); } [Test] - public void ConversionToColorRSingleIsLossless() + public void ConversionToColorRGBA128SingleIsLossless() { - ColorRSingle original = MakeRandomColor(); - ColorRSingle converted = original.Convert(); - ColorRSingle convertedBack = converted.Convert(); + ColorR32Single original = MakeRandomColor(); + ColorRGBA128Single converted = original.Convert(); + ColorR32Single convertedBack = converted.Convert(); Assert.That(convertedBack, Is.EqualTo(original)); } } diff --git a/AssetRipper.TextureDecoder.Tests/Formats/ColorRGHalfTests.g.cs b/AssetRipper.TextureDecoder.Tests/Formats/ColorRG32HalfTests.g.cs similarity index 64% rename from AssetRipper.TextureDecoder.Tests/Formats/ColorRGHalfTests.g.cs rename to AssetRipper.TextureDecoder.Tests/Formats/ColorRG32HalfTests.g.cs index 013743a..0fab2a2 100644 --- a/AssetRipper.TextureDecoder.Tests/Formats/ColorRGHalfTests.g.cs +++ b/AssetRipper.TextureDecoder.Tests/Formats/ColorRG32HalfTests.g.cs @@ -6,12 +6,12 @@ using System.Runtime.CompilerServices; namespace AssetRipper.TextureDecoder.Tests.Formats; -public partial class ColorRGHalfTests +public partial class ColorRG32HalfTests { [Test] public void CorrectSizeTest() { - Assert.That(Unsafe.SizeOf(), Is.EqualTo(4)); + Assert.That(Unsafe.SizeOf(), Is.EqualTo(4)); } [Test] @@ -143,7 +143,7 @@ public partial class ColorRGHalfTests }); } - public static ColorRGHalf MakeRandomColor() + public static ColorRG32Half MakeRandomColor() { return new() { @@ -155,56 +155,56 @@ public partial class ColorRGHalfTests } [Test] - public void ConversionToColorRGBAHalfIsLossless() + public void ConversionToColorRG32HalfIsLossless() { - ColorRGHalf original = MakeRandomColor(); - ColorRGBAHalf converted = original.Convert(); - ColorRGHalf convertedBack = converted.Convert(); + ColorRG32Half original = MakeRandomColor(); + ColorRG32Half converted = original.Convert(); + ColorRG32Half convertedBack = converted.Convert(); Assert.That(convertedBack, Is.EqualTo(original)); } [Test] - public void ConversionToColorRGBASingleIsLossless() + public void ConversionToColorRG64SingleIsLossless() { - ColorRGHalf original = MakeRandomColor(); - ColorRGBASingle converted = original.Convert(); - ColorRGHalf convertedBack = converted.Convert(); + ColorRG32Half original = MakeRandomColor(); + ColorRG64Single converted = original.Convert(); + ColorRG32Half convertedBack = converted.Convert(); Assert.That(convertedBack, Is.EqualTo(original)); } [Test] - public void ConversionToColorRGBHalfIsLossless() + public void ConversionToColorRGB48HalfIsLossless() { - ColorRGHalf original = MakeRandomColor(); - ColorRGBHalf converted = original.Convert(); - ColorRGHalf convertedBack = converted.Convert(); + ColorRG32Half original = MakeRandomColor(); + ColorRGB48Half converted = original.Convert(); + ColorRG32Half convertedBack = converted.Convert(); Assert.That(convertedBack, Is.EqualTo(original)); } [Test] - public void ConversionToColorRGBSingleIsLossless() + public void ConversionToColorRGB96SingleIsLossless() { - ColorRGHalf original = MakeRandomColor(); - ColorRGBSingle converted = original.Convert(); - ColorRGHalf convertedBack = converted.Convert(); + ColorRG32Half original = MakeRandomColor(); + ColorRGB96Single converted = original.Convert(); + ColorRG32Half convertedBack = converted.Convert(); Assert.That(convertedBack, Is.EqualTo(original)); } [Test] - public void ConversionToColorRGHalfIsLossless() + public void ConversionToColorRGBA128SingleIsLossless() { - ColorRGHalf original = MakeRandomColor(); - ColorRGHalf converted = original.Convert(); - ColorRGHalf convertedBack = converted.Convert(); + ColorRG32Half original = MakeRandomColor(); + ColorRGBA128Single converted = original.Convert(); + ColorRG32Half convertedBack = converted.Convert(); Assert.That(convertedBack, Is.EqualTo(original)); } [Test] - public void ConversionToColorRGSingleIsLossless() + public void ConversionToColorRGBA64HalfIsLossless() { - ColorRGHalf original = MakeRandomColor(); - ColorRGSingle converted = original.Convert(); - ColorRGHalf convertedBack = converted.Convert(); + ColorRG32Half original = MakeRandomColor(); + ColorRGBA64Half converted = original.Convert(); + ColorRG32Half convertedBack = converted.Convert(); Assert.That(convertedBack, Is.EqualTo(original)); } } diff --git a/AssetRipper.TextureDecoder.Tests/Formats/ColorRGSingleTests.g.cs b/AssetRipper.TextureDecoder.Tests/Formats/ColorRG64SingleTests.g.cs similarity index 74% rename from AssetRipper.TextureDecoder.Tests/Formats/ColorRGSingleTests.g.cs rename to AssetRipper.TextureDecoder.Tests/Formats/ColorRG64SingleTests.g.cs index 72219ab..d7bca9e 100644 --- a/AssetRipper.TextureDecoder.Tests/Formats/ColorRGSingleTests.g.cs +++ b/AssetRipper.TextureDecoder.Tests/Formats/ColorRG64SingleTests.g.cs @@ -6,12 +6,12 @@ using System.Runtime.CompilerServices; namespace AssetRipper.TextureDecoder.Tests.Formats; -public partial class ColorRGSingleTests +public partial class ColorRG64SingleTests { [Test] public void CorrectSizeTest() { - Assert.That(Unsafe.SizeOf(), Is.EqualTo(8)); + Assert.That(Unsafe.SizeOf(), Is.EqualTo(8)); } [Test] @@ -143,7 +143,7 @@ public partial class ColorRGSingleTests }); } - public static ColorRGSingle MakeRandomColor() + public static ColorRG64Single MakeRandomColor() { return new() { @@ -155,29 +155,29 @@ public partial class ColorRGSingleTests } [Test] - public void ConversionToColorRGBASingleIsLossless() + public void ConversionToColorRG64SingleIsLossless() { - ColorRGSingle original = MakeRandomColor(); - ColorRGBASingle converted = original.Convert(); - ColorRGSingle convertedBack = converted.Convert(); + ColorRG64Single original = MakeRandomColor(); + ColorRG64Single converted = original.Convert(); + ColorRG64Single convertedBack = converted.Convert(); Assert.That(convertedBack, Is.EqualTo(original)); } [Test] - public void ConversionToColorRGBSingleIsLossless() + public void ConversionToColorRGB96SingleIsLossless() { - ColorRGSingle original = MakeRandomColor(); - ColorRGBSingle converted = original.Convert(); - ColorRGSingle convertedBack = converted.Convert(); + ColorRG64Single original = MakeRandomColor(); + ColorRGB96Single converted = original.Convert(); + ColorRG64Single convertedBack = converted.Convert(); Assert.That(convertedBack, Is.EqualTo(original)); } [Test] - public void ConversionToColorRGSingleIsLossless() + public void ConversionToColorRGBA128SingleIsLossless() { - ColorRGSingle original = MakeRandomColor(); - ColorRGSingle converted = original.Convert(); - ColorRGSingle convertedBack = converted.Convert(); + ColorRG64Single original = MakeRandomColor(); + ColorRGBA128Single converted = original.Convert(); + ColorRG64Single convertedBack = converted.Convert(); Assert.That(convertedBack, Is.EqualTo(original)); } } diff --git a/AssetRipper.TextureDecoder.Tests/Formats/ColorRGB32HalfTests.g.cs b/AssetRipper.TextureDecoder.Tests/Formats/ColorRGB32HalfTests.g.cs index 78bc7b6..5a66495 100644 --- a/AssetRipper.TextureDecoder.Tests/Formats/ColorRGB32HalfTests.g.cs +++ b/AssetRipper.TextureDecoder.Tests/Formats/ColorRGB32HalfTests.g.cs @@ -155,38 +155,38 @@ public partial class ColorRGB32HalfTests } [Test] - public void ConversionToColorRGBAHalfIsLossless() + public void ConversionToColorRGB48HalfIsLossless() { ColorRGB32Half original = MakeRandomColor(); - ColorRGBAHalf converted = original.Convert(); - ColorRGB32Half convertedBack = converted.Convert(); + ColorRGB48Half converted = original.Convert(); + ColorRGB32Half convertedBack = converted.Convert(); Assert.That(convertedBack, Is.EqualTo(original)); } [Test] - public void ConversionToColorRGBASingleIsLossless() + public void ConversionToColorRGB96SingleIsLossless() { ColorRGB32Half original = MakeRandomColor(); - ColorRGBASingle converted = original.Convert(); - ColorRGB32Half convertedBack = converted.Convert(); + ColorRGB96Single converted = original.Convert(); + ColorRGB32Half convertedBack = converted.Convert(); Assert.That(convertedBack, Is.EqualTo(original)); } [Test] - public void ConversionToColorRGBHalfIsLossless() + public void ConversionToColorRGBA128SingleIsLossless() { ColorRGB32Half original = MakeRandomColor(); - ColorRGBHalf converted = original.Convert(); - ColorRGB32Half convertedBack = converted.Convert(); + ColorRGBA128Single converted = original.Convert(); + ColorRGB32Half convertedBack = converted.Convert(); Assert.That(convertedBack, Is.EqualTo(original)); } [Test] - public void ConversionToColorRGBSingleIsLossless() + public void ConversionToColorRGBA64HalfIsLossless() { ColorRGB32Half original = MakeRandomColor(); - ColorRGBSingle converted = original.Convert(); - ColorRGB32Half convertedBack = converted.Convert(); + ColorRGBA64Half converted = original.Convert(); + ColorRGB32Half convertedBack = converted.Convert(); Assert.That(convertedBack, Is.EqualTo(original)); } } diff --git a/AssetRipper.TextureDecoder.Tests/Formats/ColorRGBHalfTests.g.cs b/AssetRipper.TextureDecoder.Tests/Formats/ColorRGB48HalfTests.g.cs similarity index 71% rename from AssetRipper.TextureDecoder.Tests/Formats/ColorRGBHalfTests.g.cs rename to AssetRipper.TextureDecoder.Tests/Formats/ColorRGB48HalfTests.g.cs index 0b70740..adec001 100644 --- a/AssetRipper.TextureDecoder.Tests/Formats/ColorRGBHalfTests.g.cs +++ b/AssetRipper.TextureDecoder.Tests/Formats/ColorRGB48HalfTests.g.cs @@ -6,12 +6,12 @@ using System.Runtime.CompilerServices; namespace AssetRipper.TextureDecoder.Tests.Formats; -public partial class ColorRGBHalfTests +public partial class ColorRGB48HalfTests { [Test] public void CorrectSizeTest() { - Assert.That(Unsafe.SizeOf(), Is.EqualTo(6)); + Assert.That(Unsafe.SizeOf(), Is.EqualTo(6)); } [Test] @@ -143,7 +143,7 @@ public partial class ColorRGBHalfTests }); } - public static ColorRGBHalf MakeRandomColor() + public static ColorRGB48Half MakeRandomColor() { return new() { @@ -155,38 +155,38 @@ public partial class ColorRGBHalfTests } [Test] - public void ConversionToColorRGBAHalfIsLossless() + public void ConversionToColorRGB48HalfIsLossless() { - ColorRGBHalf original = MakeRandomColor(); - ColorRGBAHalf converted = original.Convert(); - ColorRGBHalf convertedBack = converted.Convert(); + ColorRGB48Half original = MakeRandomColor(); + ColorRGB48Half converted = original.Convert(); + ColorRGB48Half convertedBack = converted.Convert(); Assert.That(convertedBack, Is.EqualTo(original)); } [Test] - public void ConversionToColorRGBASingleIsLossless() + public void ConversionToColorRGB96SingleIsLossless() { - ColorRGBHalf original = MakeRandomColor(); - ColorRGBASingle converted = original.Convert(); - ColorRGBHalf convertedBack = converted.Convert(); + ColorRGB48Half original = MakeRandomColor(); + ColorRGB96Single converted = original.Convert(); + ColorRGB48Half convertedBack = converted.Convert(); Assert.That(convertedBack, Is.EqualTo(original)); } [Test] - public void ConversionToColorRGBHalfIsLossless() + public void ConversionToColorRGBA128SingleIsLossless() { - ColorRGBHalf original = MakeRandomColor(); - ColorRGBHalf converted = original.Convert(); - ColorRGBHalf convertedBack = converted.Convert(); + ColorRGB48Half original = MakeRandomColor(); + ColorRGBA128Single converted = original.Convert(); + ColorRGB48Half convertedBack = converted.Convert(); Assert.That(convertedBack, Is.EqualTo(original)); } [Test] - public void ConversionToColorRGBSingleIsLossless() + public void ConversionToColorRGBA64HalfIsLossless() { - ColorRGBHalf original = MakeRandomColor(); - ColorRGBSingle converted = original.Convert(); - ColorRGBHalf convertedBack = converted.Convert(); + ColorRGB48Half original = MakeRandomColor(); + ColorRGBA64Half converted = original.Convert(); + ColorRGB48Half convertedBack = converted.Convert(); Assert.That(convertedBack, Is.EqualTo(original)); } } diff --git a/AssetRipper.TextureDecoder.Tests/Formats/ColorRGBSingleTests.g.cs b/AssetRipper.TextureDecoder.Tests/Formats/ColorRGB96SingleTests.g.cs similarity index 80% rename from AssetRipper.TextureDecoder.Tests/Formats/ColorRGBSingleTests.g.cs rename to AssetRipper.TextureDecoder.Tests/Formats/ColorRGB96SingleTests.g.cs index 17ef85d..a436123 100644 --- a/AssetRipper.TextureDecoder.Tests/Formats/ColorRGBSingleTests.g.cs +++ b/AssetRipper.TextureDecoder.Tests/Formats/ColorRGB96SingleTests.g.cs @@ -6,12 +6,12 @@ using System.Runtime.CompilerServices; namespace AssetRipper.TextureDecoder.Tests.Formats; -public partial class ColorRGBSingleTests +public partial class ColorRGB96SingleTests { [Test] public void CorrectSizeTest() { - Assert.That(Unsafe.SizeOf(), Is.EqualTo(12)); + Assert.That(Unsafe.SizeOf(), Is.EqualTo(12)); } [Test] @@ -143,7 +143,7 @@ public partial class ColorRGBSingleTests }); } - public static ColorRGBSingle MakeRandomColor() + public static ColorRGB96Single MakeRandomColor() { return new() { @@ -155,20 +155,20 @@ public partial class ColorRGBSingleTests } [Test] - public void ConversionToColorRGBASingleIsLossless() + public void ConversionToColorRGB96SingleIsLossless() { - ColorRGBSingle original = MakeRandomColor(); - ColorRGBASingle converted = original.Convert(); - ColorRGBSingle convertedBack = converted.Convert(); + ColorRGB96Single original = MakeRandomColor(); + ColorRGB96Single converted = original.Convert(); + ColorRGB96Single convertedBack = converted.Convert(); Assert.That(convertedBack, Is.EqualTo(original)); } [Test] - public void ConversionToColorRGBSingleIsLossless() + public void ConversionToColorRGBA128SingleIsLossless() { - ColorRGBSingle original = MakeRandomColor(); - ColorRGBSingle converted = original.Convert(); - ColorRGBSingle convertedBack = converted.Convert(); + ColorRGB96Single original = MakeRandomColor(); + ColorRGBA128Single converted = original.Convert(); + ColorRGB96Single convertedBack = converted.Convert(); Assert.That(convertedBack, Is.EqualTo(original)); } } diff --git a/AssetRipper.TextureDecoder.Tests/Formats/ColorRGBASingleTests.g.cs b/AssetRipper.TextureDecoder.Tests/Formats/ColorRGBA128SingleTests.g.cs similarity index 86% rename from AssetRipper.TextureDecoder.Tests/Formats/ColorRGBASingleTests.g.cs rename to AssetRipper.TextureDecoder.Tests/Formats/ColorRGBA128SingleTests.g.cs index 0aea899..4b0c049 100644 --- a/AssetRipper.TextureDecoder.Tests/Formats/ColorRGBASingleTests.g.cs +++ b/AssetRipper.TextureDecoder.Tests/Formats/ColorRGBA128SingleTests.g.cs @@ -6,12 +6,12 @@ using System.Runtime.CompilerServices; namespace AssetRipper.TextureDecoder.Tests.Formats; -public partial class ColorRGBASingleTests +public partial class ColorRGBA128SingleTests { [Test] public void CorrectSizeTest() { - Assert.That(Unsafe.SizeOf(), Is.EqualTo(16)); + Assert.That(Unsafe.SizeOf(), Is.EqualTo(16)); } [Test] @@ -143,7 +143,7 @@ public partial class ColorRGBASingleTests }); } - public static ColorRGBASingle MakeRandomColor() + public static ColorRGBA128Single MakeRandomColor() { return new() { @@ -155,11 +155,11 @@ public partial class ColorRGBASingleTests } [Test] - public void ConversionToColorRGBASingleIsLossless() + public void ConversionToColorRGBA128SingleIsLossless() { - ColorRGBASingle original = MakeRandomColor(); - ColorRGBASingle converted = original.Convert(); - ColorRGBASingle convertedBack = converted.Convert(); + ColorRGBA128Single original = MakeRandomColor(); + ColorRGBA128Single converted = original.Convert(); + ColorRGBA128Single convertedBack = converted.Convert(); Assert.That(convertedBack, Is.EqualTo(original)); } } diff --git a/AssetRipper.TextureDecoder.Tests/Formats/ColorRGBAHalfTests.g.cs b/AssetRipper.TextureDecoder.Tests/Formats/ColorRGBA64HalfTests.g.cs similarity index 80% rename from AssetRipper.TextureDecoder.Tests/Formats/ColorRGBAHalfTests.g.cs rename to AssetRipper.TextureDecoder.Tests/Formats/ColorRGBA64HalfTests.g.cs index a888c4d..f556b6c 100644 --- a/AssetRipper.TextureDecoder.Tests/Formats/ColorRGBAHalfTests.g.cs +++ b/AssetRipper.TextureDecoder.Tests/Formats/ColorRGBA64HalfTests.g.cs @@ -6,12 +6,12 @@ using System.Runtime.CompilerServices; namespace AssetRipper.TextureDecoder.Tests.Formats; -public partial class ColorRGBAHalfTests +public partial class ColorRGBA64HalfTests { [Test] public void CorrectSizeTest() { - Assert.That(Unsafe.SizeOf(), Is.EqualTo(8)); + Assert.That(Unsafe.SizeOf(), Is.EqualTo(8)); } [Test] @@ -143,7 +143,7 @@ public partial class ColorRGBAHalfTests }); } - public static ColorRGBAHalf MakeRandomColor() + public static ColorRGBA64Half MakeRandomColor() { return new() { @@ -155,20 +155,20 @@ public partial class ColorRGBAHalfTests } [Test] - public void ConversionToColorRGBAHalfIsLossless() + public void ConversionToColorRGBA128SingleIsLossless() { - ColorRGBAHalf original = MakeRandomColor(); - ColorRGBAHalf converted = original.Convert(); - ColorRGBAHalf convertedBack = converted.Convert(); + ColorRGBA64Half original = MakeRandomColor(); + ColorRGBA128Single converted = original.Convert(); + ColorRGBA64Half convertedBack = converted.Convert(); Assert.That(convertedBack, Is.EqualTo(original)); } [Test] - public void ConversionToColorRGBASingleIsLossless() + public void ConversionToColorRGBA64HalfIsLossless() { - ColorRGBAHalf original = MakeRandomColor(); - ColorRGBASingle converted = original.Convert(); - ColorRGBAHalf convertedBack = converted.Convert(); + ColorRGBA64Half original = MakeRandomColor(); + ColorRGBA64Half converted = original.Convert(); + ColorRGBA64Half convertedBack = converted.Convert(); Assert.That(convertedBack, Is.EqualTo(original)); } } diff --git a/AssetRipper.TextureDecoder.Tests/NewRgbTests.cs b/AssetRipper.TextureDecoder.Tests/NewRgbTests.cs index 9f6bee4..9622229 100644 --- a/AssetRipper.TextureDecoder.Tests/NewRgbTests.cs +++ b/AssetRipper.TextureDecoder.Tests/NewRgbTests.cs @@ -157,7 +157,7 @@ namespace AssetRipper.TextureDecoder.Tests { ReadOnlySpan data = File.ReadAllBytes(PathConstants.RgbTestFilesFolder + "test.rhalf"); RgbConverter.RHalfToBGRA32(data, 256, 256, out byte[] originalDecodedData); - RgbConverter.Convert(data, 256, 256, out byte[] newDecodedData); + RgbConverter.Convert(data, 256, 256, out byte[] newDecodedData); Assert.That(originalDecodedData, Is.EqualTo(newDecodedData)); } @@ -166,7 +166,7 @@ namespace AssetRipper.TextureDecoder.Tests { ReadOnlySpan data = File.ReadAllBytes(PathConstants.RgbTestFilesFolder + "test.rghalf"); RgbConverter.RGHalfToBGRA32(data, 256, 256, out byte[] originalDecodedData); - RgbConverter.Convert(data, 256, 256, out byte[] newDecodedData); + RgbConverter.Convert(data, 256, 256, out byte[] newDecodedData); Assert.That(originalDecodedData, Is.EqualTo(newDecodedData)); } @@ -175,7 +175,7 @@ namespace AssetRipper.TextureDecoder.Tests { ReadOnlySpan data = File.ReadAllBytes(PathConstants.RgbTestFilesFolder + "test.rgbahalf"); RgbConverter.RGBAHalfToBGRA32(data, 256, 256, out byte[] originalDecodedData); - RgbConverter.Convert(data, 256, 256, out byte[] newDecodedData); + RgbConverter.Convert(data, 256, 256, out byte[] newDecodedData); Assert.That(originalDecodedData, Is.EqualTo(newDecodedData)); } @@ -184,7 +184,7 @@ namespace AssetRipper.TextureDecoder.Tests { ReadOnlySpan data = File.ReadAllBytes(PathConstants.RgbTestFilesFolder + "test.rfloat"); RgbConverter.RFloatToBGRA32(data, 256, 256, out byte[] originalDecodedData); - RgbConverter.Convert(data, 256, 256, out byte[] newDecodedData); + RgbConverter.Convert(data, 256, 256, out byte[] newDecodedData); Assert.That(originalDecodedData, Is.EqualTo(newDecodedData)); } @@ -193,7 +193,7 @@ namespace AssetRipper.TextureDecoder.Tests { ReadOnlySpan data = File.ReadAllBytes(PathConstants.RgbTestFilesFolder + "test.rgfloat"); RgbConverter.RGFloatToBGRA32(data, 256, 256, out byte[] originalDecodedData); - RgbConverter.Convert(data, 256, 256, out byte[] newDecodedData); + RgbConverter.Convert(data, 256, 256, out byte[] newDecodedData); Assert.That(originalDecodedData, Is.EqualTo(newDecodedData)); } @@ -202,7 +202,7 @@ namespace AssetRipper.TextureDecoder.Tests { ReadOnlySpan data = File.ReadAllBytes(PathConstants.RgbTestFilesFolder + "test.rgbafloat"); RgbConverter.RGBAFloatToBGRA32(data, 256, 256, out byte[] originalDecodedData); - RgbConverter.Convert(data, 256, 256, out byte[] newDecodedData); + RgbConverter.Convert(data, 256, 256, out byte[] newDecodedData); Assert.That(originalDecodedData, Is.EqualTo(newDecodedData)); } diff --git a/AssetRipper.TextureDecoder/Bc/BcDecoder.cs b/AssetRipper.TextureDecoder/Bc/BcDecoder.cs index 5705c8c..fbf01f4 100644 --- a/AssetRipper.TextureDecoder/Bc/BcDecoder.cs +++ b/AssetRipper.TextureDecoder/Bc/BcDecoder.cs @@ -126,7 +126,7 @@ namespace AssetRipper.TextureDecoder.Bc public static int DecompressBC6H(ReadOnlySpan input, int width, int height, bool isSigned, Span output) { - int bufferSize = width * height * Unsafe.SizeOf(); + int bufferSize = width * height * Unsafe.SizeOf(); byte[] bufferArray = ArrayPool.Shared.Rent(bufferSize); Span buffer = new Span(bufferArray, 0, bufferSize); int inputOffset = 0; @@ -134,7 +134,7 @@ namespace AssetRipper.TextureDecoder.Bc { for (int j = 0; j < width; j += 4) { - int outputOffset = ((i * width) + j) * Unsafe.SizeOf(); + int outputOffset = ((i * width) + j) * Unsafe.SizeOf(); BcHelpers.DecompressBc6h_Float( input.Slice(inputOffset, DefineConstants.BCDEC_BC6H_BLOCK_SIZE), buffer.Slice(outputOffset), @@ -143,7 +143,7 @@ namespace AssetRipper.TextureDecoder.Bc inputOffset += DefineConstants.BCDEC_BC6H_BLOCK_SIZE; } } - RgbConverter.Convert(buffer, width, height, output); + RgbConverter.Convert(buffer, width, height, output); ArrayPool.Shared.Return(bufferArray); return inputOffset; } diff --git a/AssetRipper.TextureDecoder/Rgb/Formats/ColorRHalf.g.cs b/AssetRipper.TextureDecoder/Rgb/Formats/ColorR16Half.g.cs similarity index 93% rename from AssetRipper.TextureDecoder/Rgb/Formats/ColorRHalf.g.cs rename to AssetRipper.TextureDecoder/Rgb/Formats/ColorR16Half.g.cs index ef0e25e..dfbe032 100644 --- a/AssetRipper.TextureDecoder/Rgb/Formats/ColorRHalf.g.cs +++ b/AssetRipper.TextureDecoder/Rgb/Formats/ColorR16Half.g.cs @@ -5,7 +5,7 @@ using AssetRipper.TextureDecoder.Attributes; namespace AssetRipper.TextureDecoder.Rgb.Formats { [RgbaAttribute(RedChannel = true, GreenChannel = false, BlueChannel = false, AlphaChannel = false, FullyUtilizedChannels = true)] - public partial struct ColorRHalf : IColor + public partial struct ColorR16Half : IColor { public Half R { get; set; } diff --git a/AssetRipper.TextureDecoder/Rgb/Formats/ColorRSingle.g.cs b/AssetRipper.TextureDecoder/Rgb/Formats/ColorR32Single.g.cs similarity index 93% rename from AssetRipper.TextureDecoder/Rgb/Formats/ColorRSingle.g.cs rename to AssetRipper.TextureDecoder/Rgb/Formats/ColorR32Single.g.cs index 520d2d9..606c9fb 100644 --- a/AssetRipper.TextureDecoder/Rgb/Formats/ColorRSingle.g.cs +++ b/AssetRipper.TextureDecoder/Rgb/Formats/ColorR32Single.g.cs @@ -5,7 +5,7 @@ using AssetRipper.TextureDecoder.Attributes; namespace AssetRipper.TextureDecoder.Rgb.Formats { [RgbaAttribute(RedChannel = true, GreenChannel = false, BlueChannel = false, AlphaChannel = false, FullyUtilizedChannels = true)] - public partial struct ColorRSingle : IColor + public partial struct ColorR32Single : IColor { public float R { get; set; } diff --git a/AssetRipper.TextureDecoder/Rgb/Formats/ColorRGHalf.g.cs b/AssetRipper.TextureDecoder/Rgb/Formats/ColorRG32Half.g.cs similarity index 93% rename from AssetRipper.TextureDecoder/Rgb/Formats/ColorRGHalf.g.cs rename to AssetRipper.TextureDecoder/Rgb/Formats/ColorRG32Half.g.cs index b8b89f6..91401f2 100644 --- a/AssetRipper.TextureDecoder/Rgb/Formats/ColorRGHalf.g.cs +++ b/AssetRipper.TextureDecoder/Rgb/Formats/ColorRG32Half.g.cs @@ -5,7 +5,7 @@ using AssetRipper.TextureDecoder.Attributes; namespace AssetRipper.TextureDecoder.Rgb.Formats { [RgbaAttribute(RedChannel = true, GreenChannel = true, BlueChannel = false, AlphaChannel = false, FullyUtilizedChannels = true)] - public partial struct ColorRGHalf : IColor + public partial struct ColorRG32Half : IColor { public Half R { get; set; } diff --git a/AssetRipper.TextureDecoder/Rgb/Formats/ColorRGSingle.g.cs b/AssetRipper.TextureDecoder/Rgb/Formats/ColorRG64Single.g.cs similarity index 93% rename from AssetRipper.TextureDecoder/Rgb/Formats/ColorRGSingle.g.cs rename to AssetRipper.TextureDecoder/Rgb/Formats/ColorRG64Single.g.cs index bbde235..3b14369 100644 --- a/AssetRipper.TextureDecoder/Rgb/Formats/ColorRGSingle.g.cs +++ b/AssetRipper.TextureDecoder/Rgb/Formats/ColorRG64Single.g.cs @@ -5,7 +5,7 @@ using AssetRipper.TextureDecoder.Attributes; namespace AssetRipper.TextureDecoder.Rgb.Formats { [RgbaAttribute(RedChannel = true, GreenChannel = true, BlueChannel = false, AlphaChannel = false, FullyUtilizedChannels = true)] - public partial struct ColorRGSingle : IColor + public partial struct ColorRG64Single : IColor { public float R { get; set; } diff --git a/AssetRipper.TextureDecoder/Rgb/Formats/ColorRGBHalf.g.cs b/AssetRipper.TextureDecoder/Rgb/Formats/ColorRGB48Half.g.cs similarity index 93% rename from AssetRipper.TextureDecoder/Rgb/Formats/ColorRGBHalf.g.cs rename to AssetRipper.TextureDecoder/Rgb/Formats/ColorRGB48Half.g.cs index 4b36e57..642cf67 100644 --- a/AssetRipper.TextureDecoder/Rgb/Formats/ColorRGBHalf.g.cs +++ b/AssetRipper.TextureDecoder/Rgb/Formats/ColorRGB48Half.g.cs @@ -5,7 +5,7 @@ using AssetRipper.TextureDecoder.Attributes; namespace AssetRipper.TextureDecoder.Rgb.Formats { [RgbaAttribute(RedChannel = true, GreenChannel = true, BlueChannel = true, AlphaChannel = false, FullyUtilizedChannels = true)] - public partial struct ColorRGBHalf : IColor + public partial struct ColorRGB48Half : IColor { public Half R { get; set; } diff --git a/AssetRipper.TextureDecoder/Rgb/Formats/ColorRGBSingle.g.cs b/AssetRipper.TextureDecoder/Rgb/Formats/ColorRGB96Single.g.cs similarity index 92% rename from AssetRipper.TextureDecoder/Rgb/Formats/ColorRGBSingle.g.cs rename to AssetRipper.TextureDecoder/Rgb/Formats/ColorRGB96Single.g.cs index 2fc8e6f..12f437a 100644 --- a/AssetRipper.TextureDecoder/Rgb/Formats/ColorRGBSingle.g.cs +++ b/AssetRipper.TextureDecoder/Rgb/Formats/ColorRGB96Single.g.cs @@ -5,7 +5,7 @@ using AssetRipper.TextureDecoder.Attributes; namespace AssetRipper.TextureDecoder.Rgb.Formats { [RgbaAttribute(RedChannel = true, GreenChannel = true, BlueChannel = true, AlphaChannel = false, FullyUtilizedChannels = true)] - public partial struct ColorRGBSingle : IColor + public partial struct ColorRGB96Single : IColor { public float R { get; set; } diff --git a/AssetRipper.TextureDecoder/Rgb/Formats/ColorRGBASingle.g.cs b/AssetRipper.TextureDecoder/Rgb/Formats/ColorRGBA128Single.g.cs similarity index 92% rename from AssetRipper.TextureDecoder/Rgb/Formats/ColorRGBASingle.g.cs rename to AssetRipper.TextureDecoder/Rgb/Formats/ColorRGBA128Single.g.cs index 4eb2054..8683f74 100644 --- a/AssetRipper.TextureDecoder/Rgb/Formats/ColorRGBASingle.g.cs +++ b/AssetRipper.TextureDecoder/Rgb/Formats/ColorRGBA128Single.g.cs @@ -5,7 +5,7 @@ using AssetRipper.TextureDecoder.Attributes; namespace AssetRipper.TextureDecoder.Rgb.Formats { [RgbaAttribute(RedChannel = true, GreenChannel = true, BlueChannel = true, AlphaChannel = true, FullyUtilizedChannels = true)] - public partial struct ColorRGBASingle : IColor + public partial struct ColorRGBA128Single : IColor { public float R { get; set; } diff --git a/AssetRipper.TextureDecoder/Rgb/Formats/ColorRGBAHalf.g.cs b/AssetRipper.TextureDecoder/Rgb/Formats/ColorRGBA64Half.g.cs similarity index 92% rename from AssetRipper.TextureDecoder/Rgb/Formats/ColorRGBAHalf.g.cs rename to AssetRipper.TextureDecoder/Rgb/Formats/ColorRGBA64Half.g.cs index 9ad4de6..77acca8 100644 --- a/AssetRipper.TextureDecoder/Rgb/Formats/ColorRGBAHalf.g.cs +++ b/AssetRipper.TextureDecoder/Rgb/Formats/ColorRGBA64Half.g.cs @@ -5,7 +5,7 @@ using AssetRipper.TextureDecoder.Attributes; namespace AssetRipper.TextureDecoder.Rgb.Formats { [RgbaAttribute(RedChannel = true, GreenChannel = true, BlueChannel = true, AlphaChannel = true, FullyUtilizedChannels = true)] - public partial struct ColorRGBAHalf : IColor + public partial struct ColorRGBA64Half : IColor { public Half R { get; set; }