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

StyleCop clean OpenRA.Game

Browse Source
This commit is contained in:
Matthias Mailänder
2015-01-04 11:56:13 +01:00
parent d2d715765c
commit bc3acfeee7
345 changed files with 835 additions and 833 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -127,7 +127,7 @@ namespace OpenRA.Mods.Common.Widgets
{
try
{
mixerSprite.sheet.GetTexture().SetData(front, 256, 256);
mixerSprite.Sheet.GetTexture().SetData(front, 256, 256);
}
finally
{
@@ -138,8 +138,8 @@ namespace OpenRA.Mods.Common.Widgets
Game.Renderer.RgbaSpriteRenderer.DrawSprite(mixerSprite, RenderOrigin, new float2(RenderBounds.Size));
var sprite = ChromeProvider.GetImage("lobby-bits", "colorpicker");
var pos = RenderOrigin + PxFromValue() - new int2(sprite.bounds.Width, sprite.bounds.Height) / 2;
WidgetUtils.FillEllipseWithColor(new Rectangle(pos.X + 1, pos.Y + 1, sprite.bounds.Width - 2, sprite.bounds.Height - 2), Color.RGB);
var pos = RenderOrigin + PxFromValue() - new int2(sprite.Bounds.Width, sprite.Bounds.Height) / 2;
WidgetUtils.FillEllipseWithColor(new Rectangle(pos.X + 1, pos.Y + 1, sprite.Bounds.Width - 2, sprite.Bounds.Height - 2), Color.RGB);
Game.Renderer.RgbaSpriteRenderer.DrawSprite(sprite, pos);
}

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

@@ -55,7 +55,7 @@ namespace OpenRA.Mods.Common.Widgets
Game.Renderer.RgbaSpriteRenderer.DrawSprite(hueSprite, ro, new float2(rb.Size));
var sprite = ChromeProvider.GetImage("lobby-bits", "huepicker");
var pos = RenderOrigin + new int2(PxFromValue(Value).Clamp(0, rb.Width - 1) - sprite.bounds.Width / 2, (rb.Height - sprite.bounds.Height) / 2);
var pos = RenderOrigin + new int2(PxFromValue(Value).Clamp(0, rb.Width - 1) - sprite.Bounds.Width / 2, (rb.Height - sprite.Bounds.Height) / 2);
Game.Renderer.RgbaSpriteRenderer.DrawSprite(sprite, pos);
}
}

2
OpenRA.Mods.Common/Widgets/Logic/ModBrowserLogic.cs
View File

@@ -37,7 +37,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
var panel = widget;
var loadButton = panel.Get<ButtonWidget>("LOAD_BUTTON");
loadButton.OnClick = () => LoadMod(selectedMod);
loadButton.IsDisabled = () => selectedMod.Id == Game.modData.Manifest.Mod.Id;
loadButton.IsDisabled = () => selectedMod.Id == Game.ModData.Manifest.Mod.Id;
panel.Get<ButtonWidget>("QUIT_BUTTON").OnClick = Game.Exit;

4
OpenRA.Mods.Common/Widgets/Logic/SettingsLogic.cs
View File

@@ -212,7 +212,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
colorPreview.Color = ps.Color;
var colorDropdown = panel.Get<DropDownButtonWidget>("PLAYERCOLOR");
colorDropdown.OnMouseDown = _ => ColorPickerLogic.ShowColorDropDown(colorDropdown, colorPreview, worldRenderer.world);
colorDropdown.OnMouseDown = _ => ColorPickerLogic.ShowColorDropDown(colorDropdown, colorPreview, worldRenderer.World);
colorDropdown.Get<ColorBlockWidget>("COLORBLOCK").GetColor = () => ps.Color.RGB;
return () =>
@@ -600,7 +600,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
return item;
};
dropdown.ShowDropDown("LABEL_DROPDOWN_TEMPLATE", 500, Game.modData.Languages, setupItem);
dropdown.ShowDropDown("LABEL_DROPDOWN_TEMPLATE", 500, Game.ModData.Languages, setupItem);
return true;
}

16
OpenRA.Mods.Common/Widgets/RadarWidget.cs
View File

@@ -94,8 +94,8 @@ namespace OpenRA.Mods.Common.Widgets
var uv = Map.CellToMap(world.Map.TileShape, cell);
var terrain = world.Map.GetTerrainInfo(cell);
var dx = terrainSprite.bounds.Left - world.Map.Bounds.Left;
var dy = terrainSprite.bounds.Top - world.Map.Bounds.Top;
var dx = terrainSprite.Bounds.Left - world.Map.Bounds.Left;
var dy = terrainSprite.Bounds.Top - world.Map.Bounds.Top;
unsafe
{
@@ -111,8 +111,8 @@ namespace OpenRA.Mods.Common.Widgets
{
var stride = radarSheet.Size.Width;
var uv = Map.CellToMap(world.Map.TileShape, cell);
var dx = shroudSprite.bounds.Left - world.Map.Bounds.Left;
var dy = shroudSprite.bounds.Top - world.Map.Bounds.Top;
var dx = shroudSprite.Bounds.Left - world.Map.Bounds.Left;
var dy = shroudSprite.Bounds.Top - world.Map.Bounds.Top;
var color = 0;
if (world.ShroudObscures(cell))
@@ -149,7 +149,7 @@ namespace OpenRA.Mods.Common.Widgets
if (cursor == null)
return "default";
return Game.modData.CursorProvider.HasCursorSequence(cursor + "-minimap") ? cursor + "-minimap" : cursor;
return Game.ModData.CursorProvider.HasCursorSequence(cursor + "-minimap") ? cursor + "-minimap" : cursor;
}
public override bool HandleMouseInput(MouseInput mi)
@@ -272,10 +272,10 @@ namespace OpenRA.Mods.Common.Widgets
// The actor layer is updated every tick
var stride = radarSheet.Size.Width;
var dx = actorSprite.bounds.Left - world.Map.Bounds.Left;
var dy = actorSprite.bounds.Top - world.Map.Bounds.Top;
var dx = actorSprite.Bounds.Left - world.Map.Bounds.Left;
var dy = actorSprite.Bounds.Top - world.Map.Bounds.Top;
Array.Clear(radarData, 4 * (actorSprite.bounds.Top * stride + actorSprite.bounds.Left), 4 * actorSprite.bounds.Height * stride);
Array.Clear(radarData, 4 * (actorSprite.Bounds.Top * stride + actorSprite.Bounds.Left), 4 * actorSprite.Bounds.Height * stride);
unsafe
{

8
OpenRA.Mods.Common/Widgets/ResourceBarWidget.cs
View File

@@ -99,8 +99,8 @@ namespace OpenRA.Mods.Common.Widgets
Game.Renderer.LineRenderer.FillRect(new Rectangle(b.X, (int)float2.Lerp(b.Bottom, b.Top, providedFrac),
b.Width, (int)(providedFrac * b.Height)), color);
var x = (b.Left + b.Right - indicator.size.X) / 2;
var y = float2.Lerp(b.Bottom, b.Top, usedFrac) - indicator.size.Y / 2;
var x = (b.Left + b.Right - indicator.Size.X) / 2;
var y = float2.Lerp(b.Bottom, b.Top, usedFrac) - indicator.Size.Y / 2;
Game.Renderer.RgbaSpriteRenderer.DrawSprite(indicator, new float2(x, y));
}
else
@@ -127,8 +127,8 @@ namespace OpenRA.Mods.Common.Widgets
else
Game.Renderer.LineRenderer.FillRect(new Rectangle(b.X, b.Y, (int)(providedFrac * b.Width), b.Height), color);
var x = float2.Lerp(b.Left, b.Right, usedFrac) - indicator.size.X / 2;
var y = (b.Bottom + b.Top - indicator.size.Y) / 2;
var x = float2.Lerp(b.Left, b.Right, usedFrac) - indicator.Size.X / 2;
var y = (b.Bottom + b.Top - indicator.Size.Y) / 2;
Game.Renderer.RgbaSpriteRenderer.DrawSprite(indicator, new float2(x, y));
}
}

14
OpenRA.Mods.Common/Widgets/TerrainTemplatePreviewWidget.cs
View File

@@ -41,8 +41,8 @@ namespace OpenRA.Mods.Common.Widgets
if (template == null)
return;
var ts = Game.modData.Manifest.TileSize;
var shape = Game.modData.Manifest.TileShape;
var ts = Game.ModData.Manifest.TileSize;
var shape = Game.ModData.Manifest.TileShape;
bounds = worldRenderer.Theater.TemplateBounds(template, ts, shape);
}
}
@@ -58,7 +58,7 @@ namespace OpenRA.Mods.Common.Widgets
: base(other)
{
worldRenderer = other.worldRenderer;
tileset = other.worldRenderer.world.Map.Rules.TileSets[other.worldRenderer.world.Map.Tileset];
tileset = other.worldRenderer.World.Map.Rules.TileSets[other.worldRenderer.World.Map.Tileset];
Template = other.Template;
GetScale = other.GetScale;
}
@@ -70,8 +70,8 @@ namespace OpenRA.Mods.Common.Widgets
if (template == null)
return;
var ts = Game.modData.Manifest.TileSize;
var shape = Game.modData.Manifest.TileShape;
var ts = Game.ModData.Manifest.TileSize;
var shape = Game.ModData.Manifest.TileShape;
var scale = GetScale();
var sb = new Rectangle((int)(scale * bounds.X), (int)(scale * bounds.Y), (int)(scale * bounds.Width), (int)(scale * bounds.Height));
@@ -90,11 +90,11 @@ namespace OpenRA.Mods.Common.Widgets
continue;
var sprite = worldRenderer.Theater.TileSprite(tile);
var size = new float2(sprite.size.X * scale, sprite.size.Y * scale);
var size = new float2(sprite.Size.X * scale, sprite.Size.Y * scale);
var u = shape == TileShape.Rectangle ? x : (x - y) / 2f;
var v = shape == TileShape.Rectangle ? y : (x + y) / 2f;
var pos = origin + scale * (new float2(u * ts.Width, (v - 0.5f * tileInfo.Height) * ts.Height) - 0.5f * sprite.size);
var pos = origin + scale * (new float2(u * ts.Width, (v - 0.5f * tileInfo.Height) * ts.Height) - 0.5f * sprite.Size);
Game.Renderer.SpriteRenderer.DrawSprite(sprite, pos, worldRenderer.Palette(Palette), size);
}
}