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

Work around the undesired R8 terrain sprite offsets.

Browse Source
This commit is contained in:
Paul Chote
2014-10-23 20:59:18 +13:00
parent aab9ad5ac0
commit 63f5fc8613
3 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenRA.Game/Graphics/Theater.cs
View File

@@ -42,7 +42,13 @@ namespace OpenRA.Graphics
{ {
var allFrames = frameCache[t.Value.Image]; var allFrames = frameCache[t.Value.Image];
var frames = t.Value.Frames != null ? t.Value.Frames.Select(f => allFrames[f]).ToArray() : allFrames; var frames = t.Value.Frames != null ? t.Value.Frames.Select(f => allFrames[f]).ToArray() : allFrames;
templates.Add(t.Value.Id, frames.Select(f => sheetBuilder.Add(f)).ToArray()); var sprites = frames.Select(f => sheetBuilder.Add(f));
// Ignore the offsets baked into R8 sprites
if (tileset.IgnoreTileSpriteOffsets)
sprites = sprites.Select(s => new Sprite(s.sheet, s.bounds, float2.Zero, s.channel, s.blendMode));
templates.Add(t.Value.Id, sprites.ToArray());
} }
// 1x1px transparent tile // 1x1px transparent tile

3
OpenRA.Game/Map/TileSet.cs
View File

@@ -148,7 +148,7 @@ namespace OpenRA
public class TileSet public class TileSet
{ {
static readonly string[] Fields = { "Name", "Id", "SheetSize", "Palette", "PlayerPalette", "Extensions", "WaterPaletteRotationBase", "EditorTemplateOrder" }; static readonly string[] Fields = { "Name", "Id", "SheetSize", "Palette", "PlayerPalette", "Extensions", "WaterPaletteRotationBase", "EditorTemplateOrder", "IgnoreTileSpriteOffsets" };
public readonly string Name; public readonly string Name;
public readonly string Id; public readonly string Id;
@@ -159,6 +159,7 @@ namespace OpenRA
public readonly int WaterPaletteRotationBase = 0x60; public readonly int WaterPaletteRotationBase = 0x60;
public readonly Dictionary<ushort, TerrainTemplateInfo> Templates = new Dictionary<ushort, TerrainTemplateInfo>(); public readonly Dictionary<ushort, TerrainTemplateInfo> Templates = new Dictionary<ushort, TerrainTemplateInfo>();
public readonly string[] EditorTemplateOrder; public readonly string[] EditorTemplateOrder;
public readonly bool IgnoreTileSpriteOffsets;
public readonly TerrainTypeInfo[] TerrainInfo; public readonly TerrainTypeInfo[] TerrainInfo;
readonly Dictionary<string, byte> terrainIndexByType = new Dictionary<string, byte>(); readonly Dictionary<string, byte> terrainIndexByType = new Dictionary<string, byte>();

1
mods/d2k/tilesets/arrakis.yaml
View File

@@ -5,6 +5,7 @@ General:
Palette: d2k.pal Palette: d2k.pal
Extensions: .R8, .r8, .shp, .tmp Extensions: .R8, .r8, .shp, .tmp
EditorTemplateOrder: Basic, Dune, Sand-Detail, Brick, Sand-Cliff, Sand-Smooth, Cliff-Type-Changer, Rock-Sand-Smooth, Rock-Detail, Rock-Cliff, Rock-Cliff-Rock, Rotten-Base, Dead-Worm, Ice, Ice-Detail, Rock-Cliff-Sand, Sand-Platform, Unidentified EditorTemplateOrder: Basic, Dune, Sand-Detail, Brick, Sand-Cliff, Sand-Smooth, Cliff-Type-Changer, Rock-Sand-Smooth, Rock-Detail, Rock-Cliff, Rock-Cliff-Rock, Rotten-Base, Dead-Worm, Ice, Ice-Detail, Rock-Cliff-Sand, Sand-Platform, Unidentified
IgnoreTileSpriteOffsets: true
Terrain: Terrain:
TerrainType@Clear: # TODO: workaround for the stupid WinForms editor TerrainType@Clear: # TODO: workaround for the stupid WinForms editor