This commit is contained in:
Chris Forbes
2010-05-08 20:59:18 +12:00
parent 5124319a29
commit 0feb2da477
3 changed files with 82 additions and 18 deletions

View File

@@ -26,21 +26,30 @@ namespace OpenRA.Editor
UpdateStyles();
}
public const int CellSize = 24;
static readonly Pen RedPen = new Pen(Color.Red);
int2 MousePos;
protected override void OnMouseMove(MouseEventArgs e)
{
base.OnMouseMove(e);
var oldMousePos = MousePos;
MousePos = new int2(e.Location);
Invalidate();
if (e.Button == MouseButtons.Middle)
{
Offset += MousePos - oldMousePos;
Invalidate();
}
else
if (Brush.Second != null)
Invalidate();
}
protected override void OnMouseDown(MouseEventArgs e)
{
base.OnMouseDown(e);
if (e.Button == MouseButtons.Right)
Brush = Pair.New((ushort)0, null as Bitmap);
@@ -52,6 +61,7 @@ namespace OpenRA.Editor
Bitmap RenderChunk(int u, int v)
{
var bitmap = new Bitmap(ChunkSize * 24, ChunkSize * 24);
bitmap.SetPixel(0, 0, Color.Green);
var hx = Math.Min(Map.Width - u * ChunkSize, ChunkSize);
var hy = Math.Min(Map.Height - v * ChunkSize, ChunkSize);
@@ -62,21 +72,22 @@ namespace OpenRA.Editor
var tr = Map.MapTiles[u * ChunkSize + i, v * ChunkSize + j];
var tile = TileSet.tiles[tr.type];
try
{
var rawImage = tile.TileBitmapBytes[tr.index % tile.TileBitmapBytes.Count];
var index = (tr.index < tile.TileBitmapBytes.Count) ? tr.index : 0;
var rawImage = tile.TileBitmapBytes[index];
for (var x = 0; x < 24; x++)
for (var y = 0; y < 24; y++)
bitmap.SetPixel(i * 24 + x, j * 24 + y, Palette.GetColor(rawImage[x + 24 * y]));
}
catch
{
}
}
return bitmap;
}
int2 GetBrushLocation()
{
var v = MousePos - Offset;
return new int2(v.X / 24, v.Y / 24);
}
protected override void OnPaint(PaintEventArgs e)
{
if (Map == null) return;
@@ -85,14 +96,14 @@ namespace OpenRA.Editor
for( var u = Map.TopLeft.X - Map.TopLeft.X % ChunkSize; u < Map.BottomRight.X; u += ChunkSize )
for (var v = Map.TopLeft.Y - Map.TopLeft.Y % ChunkSize; v < Map.BottomRight.Y; v += ChunkSize)
{
var x = new int2(u,v);
var x = new int2(u/ChunkSize,v/ChunkSize);
if (!Chunks.ContainsKey(x)) Chunks[x] = RenderChunk(u / ChunkSize, v / ChunkSize);
e.Graphics.DrawImage(Chunks[x], u * ChunkSize * 24, v * ChunkSize * 24);
e.Graphics.DrawImage(Chunks[x], (24 * ChunkSize * x + Offset).ToPoint());
}
if (Brush.Second != null)
e.Graphics.DrawImage(Brush.Second,
(MousePos - new int2(MousePos.X % 24, MousePos.Y % 24)).ToPoint());
e.Graphics.DrawImage(Brush.Second,
(24 * GetBrushLocation() + Offset).ToPoint());
}
}
}