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

Remove TileSet rendering code.

Browse Source
This commit is contained in:
Paul Chote
2013-08-14 22:58:54 +12:00
parent 18759e01cf
commit f6d0ea4b0f
4 changed files with 0 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
OpenRA.Editor/Form1.cs
View File

@@ -146,7 +146,6 @@ namespace OpenRA.Editor
Rules.LoadRules(manifest, map); Rules.LoadRules(manifest, map);
tileset = Rules.TileSets[map.Tileset]; tileset = Rules.TileSets[map.Tileset];
tilesetRenderer = new TileSetRenderer(tileset, new Size(manifest.TileSize, manifest.TileSize)); tilesetRenderer = new TileSetRenderer(tileset, new Size(manifest.TileSize, manifest.TileSize));
tileset.LoadTiles();
var shadowIndex = new int[] { 3, 4 }; var shadowIndex = new int[] { 3, 4 };
var palette = new Palette(FileSystem.Open(tileset.Palette), shadowIndex); var palette = new Palette(FileSystem.Open(tileset.Palette), shadowIndex);

48
OpenRA.FileFormats/Map/TileSet.cs
View File

@@ -71,8 +71,6 @@ namespace OpenRA.FileFormats
return new MiniYaml(null, root); return new MiniYaml(null, root);
} }
public Terrain Data;
} }
public class TileSet public class TileSet
@@ -108,14 +106,6 @@ namespace OpenRA.FileFormats
.Select(y => new TileTemplate(y)).ToDictionary(t => t.Id); .Select(y => new TileTemplate(y)).ToDictionary(t => t.Id);
} }
public void LoadTiles()
{
foreach (var t in Templates)
if (t.Value.Data == null)
using (var s = FileSystem.OpenWithExts(t.Value.Image, Extensions))
t.Value.Data = new Terrain(s);
}
public void Save(string filepath) public void Save(string filepath)
{ {
var root = new List<MiniYamlNode>(); var root = new List<MiniYamlNode>();
@@ -153,43 +143,5 @@ namespace OpenRA.FileFormats
return ret; return ret;
} }
public Bitmap RenderTemplate(ushort n, Palette p)
{
var template = Templates[n];
var bitmap = new Bitmap(TileSize * template.Size.X, TileSize * template.Size.Y,
PixelFormat.Format8bppIndexed);
bitmap.Palette = p.AsSystemPalette();
var data = bitmap.LockBits(bitmap.Bounds(),
ImageLockMode.WriteOnly, PixelFormat.Format8bppIndexed);
unsafe
{
byte* q = (byte*)data.Scan0.ToPointer();
var stride = data.Stride;
for (var u = 0; u < template.Size.X; u++)
for (var v = 0; v < template.Size.Y; v++)
if (template.Data.TileBitmapBytes[u + v * template.Size.X] != null)
{
var rawImage = template.Data.TileBitmapBytes[u + v * template.Size.X];
for (var i = 0; i < TileSize; i++)
for (var j = 0; j < TileSize; j++)
q[(v * TileSize + j) * stride + u * TileSize + i] = rawImage[i + TileSize * j];
}
else
{
for (var i = 0; i < TileSize; i++)
for (var j = 0; j < TileSize; j++)
q[(v * TileSize + j) * stride + u * TileSize + i] = 0;
}
}
bitmap.UnlockBits(data);
return bitmap;
}
} }
} }

2
OpenRA.Game/World.cs
View File

@@ -119,8 +119,6 @@ namespace OpenRA
Map = map; Map = map;
TileSet = Rules.TileSets[Map.Tileset]; TileSet = Rules.TileSets[Map.Tileset];
TileSet.LoadTiles();
SharedRandom = new XRandom(orderManager.LobbyInfo.GlobalSettings.RandomSeed); SharedRandom = new XRandom(orderManager.LobbyInfo.GlobalSettings.RandomSeed);
WorldActor = CreateActor( "World", new TypeDictionary() ); WorldActor = CreateActor( "World", new TypeDictionary() );

1
OpenRA.Utility/Command.cs
View File

@@ -342,7 +342,6 @@ namespace OpenRA.Utility
throw new InvalidOperationException("No theater named '{0}'".F(theater)); throw new InvalidOperationException("No theater named '{0}'".F(theater));
var renderer = new TileSetRenderer(tileset, new Size(manifest.TileSize, manifest.TileSize)); var renderer = new TileSetRenderer(tileset, new Size(manifest.TileSize, manifest.TileSize));
tileset.LoadTiles();
var palette = new Palette(FileSystem.Open(tileset.Palette), shadowIndex); var palette = new Palette(FileSystem.Open(tileset.Palette), shadowIndex);
foreach (var templateName in templateNames) foreach (var templateName in templateNames)