From 57d955ec72f8c75116dde6fd937a94e9f9aae62d Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Mon, 12 Apr 2021 18:34:33 +0100 Subject: [PATCH] Change Color.ToAhsv to tuple syntax. --- OpenRA.Game/Primitives/Color.cs | 6 +++--- OpenRA.Game/Traits/Player/PlayerColorPalette.cs | 2 +- OpenRA.Game/Traits/World/FixedColorPalette.cs | 2 +- OpenRA.Mods.Common/Traits/World/ColorPickerManager.cs | 10 +++------- OpenRA.Mods.Common/Widgets/ColorMixerWidget.cs | 2 +- 5 files changed, 9 insertions(+), 13 deletions(-) diff --git a/OpenRA.Game/Primitives/Color.cs b/OpenRA.Game/Primitives/Color.cs index eeddd18c9c..453530ddbd 100644 --- a/OpenRA.Game/Primitives/Color.cs +++ b/OpenRA.Game/Primitives/Color.cs @@ -49,10 +49,10 @@ namespace OpenRA.Primitives return FromAhsv(255, h, s, v); } - public void ToAhsv(out int a, out float h, out float s, out float v) + public (float A, float H, float S, float V) ToAhsv() { - a = A; - (h, s, v) = RgbToHsv(R, G, B); + var (h, s, v) = RgbToHsv(R, G, B); + return (A, h, s, v); } Color(long argb) diff --git a/OpenRA.Game/Traits/Player/PlayerColorPalette.cs b/OpenRA.Game/Traits/Player/PlayerColorPalette.cs index d3d0809553..583492856d 100644 --- a/OpenRA.Game/Traits/Player/PlayerColorPalette.cs +++ b/OpenRA.Game/Traits/Player/PlayerColorPalette.cs @@ -46,7 +46,7 @@ namespace OpenRA.Traits public void LoadPlayerPalettes(WorldRenderer wr, string playerName, Color color, bool replaceExisting) { - color.ToAhsv(out _, out var h, out var s, out _); + var (_, h, s, _) = color.ToAhsv(); var remap = new PlayerColorRemap(info.RemapIndex, h, s); var pal = new ImmutablePalette(wr.Palette(info.BasePalette).Palette, remap); diff --git a/OpenRA.Game/Traits/World/FixedColorPalette.cs b/OpenRA.Game/Traits/World/FixedColorPalette.cs index 25865a3908..30a66915d1 100644 --- a/OpenRA.Game/Traits/World/FixedColorPalette.cs +++ b/OpenRA.Game/Traits/World/FixedColorPalette.cs @@ -48,7 +48,7 @@ namespace OpenRA.Traits public void LoadPalettes(WorldRenderer wr) { - info.Color.ToAhsv(out _, out var h, out var s, out _); + var (_, h, s, _) = info.Color.ToAhsv(); var remap = new PlayerColorRemap(info.RemapIndex, h, s); wr.AddPalette(info.Name, new ImmutablePalette(wr.Palette(info.Base).Palette, remap), info.AllowModifiers); diff --git a/OpenRA.Mods.Common/Traits/World/ColorPickerManager.cs b/OpenRA.Mods.Common/Traits/World/ColorPickerManager.cs index 7abb42aa12..b19d8fee55 100644 --- a/OpenRA.Mods.Common/Traits/World/ColorPickerManager.cs +++ b/OpenRA.Mods.Common/Traits/World/ColorPickerManager.cs @@ -71,8 +71,7 @@ namespace OpenRA.Mods.Common.Traits { Color = color; - Color.ToAhsv(out _, out var h, out var s, out _); - + var (_, h, s, _) = Color.ToAhsv(); var newPalette = new MutablePalette(worldRenderer.Palette(PaletteName).Palette); newPalette.ApplyRemap(new PlayerColorRemap(RemapIndices, h, s)); worldRenderer.ReplacePalette(PaletteName, newPalette); @@ -141,7 +140,7 @@ namespace OpenRA.Mods.Common.Traits public Color MakeValid(Color color, MersenneTwister random, IEnumerable terrainColors, IEnumerable playerColors, Action onError = null) { - color.ToAhsv(out _, out var h, out var s, out _); + var (_, h, s, _) = color.ToAhsv(); return MakeValid(h, s, random, terrainColors, playerColors, onError); } @@ -181,10 +180,7 @@ namespace OpenRA.Mods.Common.Traits // until we either find a suitable color or loop back to where we started. // This is a simple way to avoid being trapped between two blocking colors. if (stepSign == 0) - { - Color.FromLinear(255, blocker.R, blocker.G, blocker.B).ToAhsv(out _, out var blockerHue, out _, out _); - stepSign = blockerHue > hue ? -1 : 1; - } + stepSign = Color.FromLinear(255, blocker.R, blocker.G, blocker.B).ToAhsv().H > hue ? -1 : 1; hue += stepSign * 0.01f; } diff --git a/OpenRA.Mods.Common/Widgets/ColorMixerWidget.cs b/OpenRA.Mods.Common/Widgets/ColorMixerWidget.cs index cf0bd33eed..7ab3a0947a 100644 --- a/OpenRA.Mods.Common/Widgets/ColorMixerWidget.cs +++ b/OpenRA.Mods.Common/Widgets/ColorMixerWidget.cs @@ -149,7 +149,7 @@ namespace OpenRA.Mods.Common.Widgets /// public void Set(Color color) { - color.ToAhsv(out _, out var h, out var s, out _); + var (_, h, s, _) = color.ToAhsv(); if (H != h || S != s) {