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

Rename enum TileShape to MapGridType

Browse Source
This commit is contained in:
Pavel Penev
2015-10-01 00:48:01 +03:00
parent 06ba175fde
commit bb3aea338a
17 changed files with 63 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenRA.Game/Graphics/Minimap.cs
View File

@@ -20,7 +20,7 @@ namespace OpenRA.Graphics
{
public static Bitmap TerrainBitmap(TileSet tileset, Map map, bool actualSize = false)
{
var isDiamond = map.Grid.Type == TileShape.Diamond;
var isDiamond = map.Grid.Type == MapGridType.Diamond;
var b = map.Bounds;
// Fudge the heightmap offset by adding as much extra as we need / can.
@@ -81,7 +81,7 @@ namespace OpenRA.Graphics
static Bitmap AddStaticResources(TileSet tileset, Map map, Ruleset resourceRules, Bitmap terrainBitmap)
{
var terrain = new Bitmap(terrainBitmap);
var isDiamond = map.Grid.Type == TileShape.Diamond;
var isDiamond = map.Grid.Type == MapGridType.Diamond;
var b = map.Bounds;
// Fudge the heightmap offset by adding as much extra as we need / can

6
OpenRA.Game/Graphics/Theater.cs
View File

@@ -108,7 +108,7 @@ namespace OpenRA.Graphics
return template.Sprites[start * template.Stride + r.Index];
}
public Rectangle TemplateBounds(TerrainTemplateInfo template, Size tileSize, TileShape tileShape)
public Rectangle TemplateBounds(TerrainTemplateInfo template, Size tileSize, MapGridType mapGrid)
{
Rectangle? templateRect = null;
@@ -125,8 +125,8 @@ namespace OpenRA.Graphics
continue;
var sprite = TileSprite(tile);
var u = tileShape == TileShape.Rectangle ? x : (x - y) / 2f;
var v = tileShape == TileShape.Rectangle ? y : (x + y) / 2f;
var u = mapGrid == MapGridType.Rectangle ? x : (x - y) / 2f;
var v = mapGrid == MapGridType.Rectangle ? y : (x + y) / 2f;
var tl = new float2(u * tileSize.Width, (v - 0.5f * tileInfo.Height) * tileSize.Height) - 0.5f * sprite.Size;
var rect = new Rectangle((int)(tl.X + sprite.Offset.X), (int)(tl.Y + sprite.Offset.Y), (int)sprite.Size.X, (int)sprite.Size.Y);

4
OpenRA.Game/Graphics/Viewport.cs
View File

@@ -100,7 +100,7 @@ namespace OpenRA.Graphics
// The full map is visible in the editor
var width = map.MapSize.X * grid.TileSize.Width;
var height = map.MapSize.Y * grid.TileSize.Height;
if (wr.World.Map.Grid.Type == TileShape.Diamond)
if (wr.World.Map.Grid.Type == MapGridType.Diamond)
height /= 2;
mapBounds = new Rectangle(0, 0, width, height);
@@ -243,7 +243,7 @@ namespace OpenRA.Graphics
// Diamond tile shapes don't have straight edges, and so we need
// an additional cell margin to include the cells that are half
// visible on each edge.
if (map.Grid.Type == TileShape.Diamond)
if (map.Grid.Type == MapGridType.Diamond)
{
tl = new PPos(tl.U - 1, tl.V - 1);
br = new PPos(br.U + 1, br.V + 1);