tidy in TileSet
This commit is contained in:
@@ -114,7 +114,6 @@ namespace OpenRA.Editor
|
|||||||
tileset.LoadTiles();
|
tileset.LoadTiles();
|
||||||
var palette = new Palette(FileSystem.Open(tileset.Palette), true);
|
var palette = new Palette(FileSystem.Open(tileset.Palette), true);
|
||||||
|
|
||||||
|
|
||||||
surface1.Bind(map, tileset, palette);
|
surface1.Bind(map, tileset, palette);
|
||||||
// construct the palette of tiles
|
// construct the palette of tiles
|
||||||
var palettes = new[] { tilePalette, actorPalette, resourcePalette };
|
var palettes = new[] { tilePalette, actorPalette, resourcePalette };
|
||||||
|
|||||||
@@ -25,6 +25,7 @@ namespace OpenRA.FileFormats
|
|||||||
|
|
||||||
public TerrainTypeInfo() {}
|
public TerrainTypeInfo() {}
|
||||||
public TerrainTypeInfo(MiniYaml my) { FieldLoader.Load(this, my); }
|
public TerrainTypeInfo(MiniYaml my) { FieldLoader.Load(this, my); }
|
||||||
|
|
||||||
public MiniYaml Save() { return FieldSaver.Save(this); }
|
public MiniYaml Save() { return FieldSaver.Save(this); }
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -39,10 +40,7 @@ namespace OpenRA.FileFormats
|
|||||||
public Dictionary<byte, string> Tiles = new Dictionary<byte, string>();
|
public Dictionary<byte, string> Tiles = new Dictionary<byte, string>();
|
||||||
|
|
||||||
public TileTemplate() {}
|
public TileTemplate() {}
|
||||||
public TileTemplate(MiniYaml my)
|
public TileTemplate(MiniYaml my) { FieldLoader.Load( this, my ); }
|
||||||
{
|
|
||||||
FieldLoader.Load( this, my );
|
|
||||||
}
|
|
||||||
|
|
||||||
static object LoadTiles( MiniYaml y )
|
static object LoadTiles( MiniYaml y )
|
||||||
{
|
{
|
||||||
@@ -78,9 +76,11 @@ namespace OpenRA.FileFormats
|
|||||||
public Dictionary<string, TerrainTypeInfo> Terrain = new Dictionary<string, TerrainTypeInfo>();
|
public Dictionary<string, TerrainTypeInfo> Terrain = new Dictionary<string, TerrainTypeInfo>();
|
||||||
public Dictionary<ushort, Terrain> Tiles = new Dictionary<ushort, Terrain>();
|
public Dictionary<ushort, Terrain> Tiles = new Dictionary<ushort, Terrain>();
|
||||||
public Dictionary<ushort, TileTemplate> Templates = new Dictionary<ushort, TileTemplate>();
|
public Dictionary<ushort, TileTemplate> Templates = new Dictionary<ushort, TileTemplate>();
|
||||||
static List<string> fields = new List<string>() {"Name", "TileSize", "Id", "Palette", "Extensions"};
|
|
||||||
|
static readonly string[] fields = {"Name", "TileSize", "Id", "Palette", "Extensions"};
|
||||||
|
|
||||||
public TileSet() {}
|
public TileSet() {}
|
||||||
|
|
||||||
public TileSet( string filepath )
|
public TileSet( string filepath )
|
||||||
{
|
{
|
||||||
var yaml = MiniYaml.DictFromFile( filepath );
|
var yaml = MiniYaml.DictFromFile( filepath );
|
||||||
|
|||||||
Reference in New Issue
Block a user