diff --git a/AssetRipper.TextureDecoder.ColorGenerator/Program.cs b/AssetRipper.TextureDecoder.ColorGenerator/Program.cs index 14770c3..133aa12 100644 --- a/AssetRipper.TextureDecoder.ColorGenerator/Program.cs +++ b/AssetRipper.TextureDecoder.ColorGenerator/Program.cs @@ -25,7 +25,7 @@ internal static class Program { typeof(sbyte), "sbyte.MaxValue" }, { typeof(short), "short.MaxValue" }, { typeof(ushort), "ushort.MaxValue" }, - { typeof(Half), "Half.One" }, + { typeof(Half), "HalfConstants.One" }, { typeof(float), "1f" }, { typeof(double), "1d" }, }; diff --git a/AssetRipper.TextureDecoder/AssetRipper.TextureDecoder.csproj b/AssetRipper.TextureDecoder/AssetRipper.TextureDecoder.csproj index 146584c..55673cc 100644 --- a/AssetRipper.TextureDecoder/AssetRipper.TextureDecoder.csproj +++ b/AssetRipper.TextureDecoder/AssetRipper.TextureDecoder.csproj @@ -1,7 +1,7 @@  - net7.0 + netstandard2.0;net5.0;net6.0;net7.0 Latest enable disable @@ -28,4 +28,17 @@ 1591 + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + diff --git a/AssetRipper.TextureDecoder/Rgb/Formats/ColorR16Half.g.cs b/AssetRipper.TextureDecoder/Rgb/Formats/ColorR16Half.g.cs index 43bbef0..33d804c 100644 --- a/AssetRipper.TextureDecoder/Rgb/Formats/ColorR16Half.g.cs +++ b/AssetRipper.TextureDecoder/Rgb/Formats/ColorR16Half.g.cs @@ -23,7 +23,7 @@ namespace AssetRipper.TextureDecoder.Rgb.Formats public Half A { - get => Half.One; + get => HalfConstants.One; set { } } diff --git a/AssetRipper.TextureDecoder/Rgb/Formats/ColorRG32Half.g.cs b/AssetRipper.TextureDecoder/Rgb/Formats/ColorRG32Half.g.cs index 431c361..4c6434e 100644 --- a/AssetRipper.TextureDecoder/Rgb/Formats/ColorRG32Half.g.cs +++ b/AssetRipper.TextureDecoder/Rgb/Formats/ColorRG32Half.g.cs @@ -19,7 +19,7 @@ namespace AssetRipper.TextureDecoder.Rgb.Formats public Half A { - get => Half.One; + get => HalfConstants.One; set { } } diff --git a/AssetRipper.TextureDecoder/Rgb/Formats/ColorRGB48Half.g.cs b/AssetRipper.TextureDecoder/Rgb/Formats/ColorRGB48Half.g.cs index fe081f3..24bb5db 100644 --- a/AssetRipper.TextureDecoder/Rgb/Formats/ColorRGB48Half.g.cs +++ b/AssetRipper.TextureDecoder/Rgb/Formats/ColorRGB48Half.g.cs @@ -15,7 +15,7 @@ namespace AssetRipper.TextureDecoder.Rgb.Formats public Half A { - get => Half.One; + get => HalfConstants.One; set { } } diff --git a/AssetRipper.TextureDecoder/Rgb/HalfConstants.cs b/AssetRipper.TextureDecoder/Rgb/HalfConstants.cs new file mode 100644 index 0000000..eefe386 --- /dev/null +++ b/AssetRipper.TextureDecoder/Rgb/HalfConstants.cs @@ -0,0 +1,20 @@ +namespace AssetRipper.TextureDecoder.Rgb; +internal static class HalfConstants +{ +#if !NET7_0_OR_GREATER + private static readonly Half one = (Half)1; +#endif + + public static Half One + { + [MethodImpl(OptimizationConstants.AggressiveInliningAndOptimization)] + get + { +#if !NET7_0_OR_GREATER + return one; +#else + return Half.One; +#endif + } + } +}