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

Merge pull request #4260 from pchote/editor-fix

Browse Source 
Fix editor parsing templates.
This commit is contained in:
Matthias Mailänder
2013-12-08 00:15:48 -08:00
parent 269b7e25c1 a13de137e7
commit 3fa5aef8d4
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenRA.Editor/TileSetRenderer.cs
View File

@@ -80,10 +80,12 @@ namespace OpenRA.Editor
var stride = data.Stride; var stride = data.Stride;
for (var u = 0; u < template.Size.X; u++) for (var u = 0; u < template.Size.X; u++)
{
for (var v = 0; v < template.Size.Y; v++) for (var v = 0; v < template.Size.Y; v++)
if (templateData[u + v * template.Size.X] != null)
{ {
var rawImage = templateData[u + v * template.Size.X]; var rawImage = templateData[u + v * template.Size.X];
if (rawImage != null && rawImage.Length > 0)
{
for (var i = 0; i < TileSize.Width; i++) for (var i = 0; i < TileSize.Width; i++)
for (var j = 0; j < TileSize.Height; j++) for (var j = 0; j < TileSize.Height; j++)
q[(v * TileSize.Width + j) * stride + u * TileSize.Width + i] = rawImage[i + TileSize.Width * j]; q[(v * TileSize.Width + j) * stride + u * TileSize.Width + i] = rawImage[i + TileSize.Width * j];
@@ -95,6 +97,8 @@ namespace OpenRA.Editor
q[(v * TileSize.Width + j) * stride + u * TileSize.Width + i] = 0; q[(v * TileSize.Width + j) * stride + u * TileSize.Width + i] = 0;
} }
} }
}
}
bitmap.UnlockBits(data); bitmap.UnlockBits(data);
return bitmap; return bitmap;