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

Convert Map.SavePreview to new Png code.

Browse Source
This commit is contained in:
Paul Chote
2019-02-17 13:15:14 +00:00
committed by reaperrr
parent 368b0314d5
commit 5f212a99fe
1 changed files with 52 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

98
OpenRA.Game/Map/Map.cs
View File

@@ -12,11 +12,11 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Drawing; using System.Drawing;
using System.Drawing.Imaging;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using System.Reflection; using System.Reflection;
using System.Text; using System.Text;
using OpenRA.FileFormats;
using OpenRA.FileSystem; using OpenRA.FileSystem;
using OpenRA.Primitives; using OpenRA.Primitives;
using OpenRA.Support; using OpenRA.Support;
@@ -664,61 +664,67 @@ namespace OpenRA
if (isRectangularIsometric) if (isRectangularIsometric)
bitmapWidth = 2 * bitmapWidth - 1; bitmapWidth = 2 * bitmapWidth - 1;
using (var bitmap = new Bitmap(bitmapWidth, height)) var stride = bitmapWidth * 4;
var minimapData = new byte[stride * height];
Color leftColor, rightColor;
for (var y = 0; y < height; y++)
{ {
var bitmapData = bitmap.LockBits(bitmap.Bounds(), for (var x = 0; x < width; x++)
ImageLockMode.ReadWrite, PixelFormat.Format32bppArgb);
unsafe
{ {
var colors = (int*)bitmapData.Scan0; var uv = new MPos(x + Bounds.Left, y + Bounds.Top);
var stride = bitmapData.Stride / 4; var resourceType = Resources[uv].Type;
Color leftColor, rightColor; if (resourceType != 0)
for (var y = 0; y < height; y++)
{ {
for (var x = 0; x < width; x++) // Cell contains resources
string res;
if (!resources.TryGetValue(resourceType, out res))
continue;
leftColor = rightColor = tileset[tileset.GetTerrainIndex(res)].Color;
}
else
{
// Cell contains terrain
var type = tileset.GetTileInfo(Tiles[uv]);
leftColor = type != null ? type.LeftColor : Color.Black;
rightColor = type != null ? type.RightColor : Color.Black;
}
if (isRectangularIsometric)
{
// Odd rows are shifted right by 1px
var dx = uv.V & 1;
if (x + dx > 0)
{ {
var uv = new MPos(x + Bounds.Left, y + Bounds.Top); var z = y * stride + 8 * x + dx - 4;
var resourceType = Resources[uv].Type; minimapData[z++] = leftColor.R;
if (resourceType != 0) minimapData[z++] = leftColor.G;
{ minimapData[z++] = leftColor.B;
// Cell contains resources minimapData[z++] = leftColor.A;
string res; }
if (!resources.TryGetValue(resourceType, out res))
continue;
leftColor = rightColor = tileset[tileset.GetTerrainIndex(res)].Color; if (2 * x + dx < stride)
} {
else var z = y * stride + 8 * x + dx;
{ minimapData[z++] = rightColor.R;
// Cell contains terrain minimapData[z++] = rightColor.G;
var type = tileset.GetTileInfo(Tiles[uv]); minimapData[z++] = rightColor.B;
leftColor = type != null ? type.LeftColor : Color.Black; minimapData[z++] = rightColor.A;
rightColor = type != null ? type.RightColor : Color.Black;
}
if (isRectangularIsometric)
{
// Odd rows are shifted right by 1px
var dx = uv.V & 1;
if (x + dx > 0)
colors[y * stride + 2 * x + dx - 1] = leftColor.ToArgb();
if (2 * x + dx < stride)
colors[y * stride + 2 * x + dx] = rightColor.ToArgb();
}
else
colors[y * stride + x] = leftColor.ToArgb();
} }
} }
else
{
var z = y * stride + 4 * x;
minimapData[z++] = leftColor.R;
minimapData[z++] = leftColor.G;
minimapData[z++] = leftColor.B;
minimapData[z++] = leftColor.A;
}
} }
bitmap.UnlockBits(bitmapData);
bitmap.Save(stream, ImageFormat.Png);
} }
return stream.ToArray(); var png = new Png(minimapData, bitmapWidth, height);
return png.Save();
} }
} }