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

Fix a collection of whitespace-style issues in Mods.Common.

Browse Source
This commit is contained in:
Paul Chote
2014-12-14 17:04:37 +13:00
parent 299a933dac
commit ecd3809bc2
51 changed files with 142 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,9 +18,9 @@ namespace OpenRA.Mods.Common.Widgets
{
public class ColorMixerWidget : Widget
{
public float[] SRange = {0.0f, 1.0f};
public float[] VRange = {0.2f, 1.0f};
public event Action OnChange = () => {};
public float[] SRange = { 0.0f, 1.0f };
public float[] VRange = { 0.2f, 1.0f };
public event Action OnChange = () => { };
float H, S, V;
byte[] front, back;
@@ -32,7 +32,7 @@ namespace OpenRA.Mods.Common.Widgets
Thread workerThread;
bool workerAlive;
public ColorMixerWidget() {}
public ColorMixerWidget() { }
public ColorMixerWidget(ColorMixerWidget other)
: base(other)
{
@@ -47,10 +47,10 @@ namespace OpenRA.Mods.Common.Widgets
base.Initialize(args);
// Bitmap data is generated in a background thread and then flipped
front = new byte[4*256*256];
back = new byte[4*256*256];
front = new byte[4 * 256 * 256];
back = new byte[4 * 256 * 256];
var rect = new Rectangle((int)(255*SRange[0]), (int)(255*(1 - VRange[1])), (int)(255*(SRange[1] - SRange[0]))+1, (int)(255*(VRange[1] - VRange[0])) + 1);
var rect = new Rectangle((int)(255 * SRange[0]), (int)(255 * (1 - VRange[1])), (int)(255 * (SRange[1] - SRange[0])) + 1, (int)(255 * (VRange[1] - VRange[0])) + 1);
var mixerSheet = new Sheet(new Size(256, 256));
mixerSheet.GetTexture().SetData(front, 256, 256);
mixerSprite = new Sprite(mixerSheet, rect, TextureChannel.Alpha);
@@ -87,6 +87,7 @@ namespace OpenRA.Mods.Common.Widgets
workerAlive = false;
break;
}
update = false;
// Take a local copy of the hue to generate to avoid tearing
@@ -142,8 +143,8 @@ namespace OpenRA.Mods.Common.Widgets
void SetValueFromPx(int2 xy)
{
var rb = RenderBounds;
var s = SRange[0] + xy.X*(SRange[1] - SRange[0])/rb.Width;
var v = SRange[1] - xy.Y*(VRange[1] - VRange[0])/rb.Height;
var s = SRange[0] + xy.X * (SRange[1] - SRange[0]) / rb.Width;
var v = SRange[1] - xy.Y * (VRange[1] - VRange[0]) / rb.Height;
S = s.Clamp(SRange[0], SRange[1]);
V = v.Clamp(VRange[0], VRange[1]);
}
@@ -151,8 +152,8 @@ namespace OpenRA.Mods.Common.Widgets
int2 PxFromValue()
{
var rb = RenderBounds;
var x = RenderBounds.Width*(S - SRange[0])/(SRange[1] - SRange[0]);
var y = RenderBounds.Height*(1 - (V - VRange[0])/(VRange[1] - VRange[0]));
var x = RenderBounds.Width * (S - SRange[0]) / (SRange[1] - SRange[0]);
var y = RenderBounds.Height * (1 - (V - VRange[0]) / (VRange[1] - VRange[0]));
return new int2((int)x.Clamp(0, rb.Width), (int)y.Clamp(0, rb.Height));
}
@@ -184,6 +185,7 @@ namespace OpenRA.Mods.Common.Widgets
SetValueFromPx(mi.Location - RenderOrigin);
OnChange();
}
break;
}
@@ -204,7 +206,7 @@ namespace OpenRA.Mods.Common.Widgets
public void Set(HSLColor color)
{
float h,s,v;
float h, s, v;
color.ToHSV(out h, out s, out v);
if (H != h || S != s || V != v)