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

6
OpenRA.Game/Primitives/Color.cs
View File

@@ -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)

2
OpenRA.Game/Traits/Player/PlayerColorPalette.cs
View File

@@ -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);

2
OpenRA.Game/Traits/World/FixedColorPalette.cs
View File

@@ -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);