epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change Color.ToAhsv to tuple syntax.

Browse Source
This commit is contained in:
Paul Chote
2021-04-12 18:34:33 +01:00
committed by teinarss
parent 96e333a30e
commit 57d955ec72
5 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
OpenRA.Mods.Common/Traits/World/ColorPickerManager.cs
View File

@@ -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<Color> terrainColors, IEnumerable<Color> playerColors, Action<string> 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;
}

2
OpenRA.Mods.Common/Widgets/ColorMixerWidget.cs
View File

@@ -149,7 +149,7 @@ namespace OpenRA.Mods.Common.Widgets
/// </summary>
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)
{