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

fixed wrong palette remapping for neutral buildings in editor

Browse Source 
for TEMPERAT (fields) and DESERT (buildings, trees, rocks)
This commit is contained in:
Matthias Mailänder
2012-11-26 12:21:50 +01:00
parent 4e0e53c714
commit aad0b3d2d8
5 changed files with 31 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
OpenRA.Editor/Form1.cs
View File

@@ -140,10 +140,8 @@ namespace OpenRA.Editor
tileset.LoadTiles();
int[] ShadowIndex = { 3, 4 };
var palette = new Palette(FileSystem.Open(tileset.Palette), ShadowIndex);
/* PlayerPalette is only used in RA desert terrain
* TODO: use the palette as defined in YAML
* defaults are wrong for DESERT rocks, trees, walls and ore mine
*/
// required for desert terrain in RA
var playerPalette = tileset.PlayerPalette ?? tileset.Palette;
var PlayerPalette = new Palette(FileSystem.Open(playerPalette), ShadowIndex);
@@ -217,7 +215,13 @@ namespace OpenRA.Editor
if (etf != null && etf.RequireTilesets != null
&& !etf.RequireTilesets.Contains(tileset.Id)) continue;
var template = RenderUtils.RenderActor(info, tileset, PlayerPalette);
var TemplatePalette = PlayerPalette;
var rsi = info.Traits.GetOrDefault<RenderSimpleInfo>();
// exception for desert buildings
if (rsi != null && rsi.Palette != null && rsi.Palette.Contains("terrain"))
TemplatePalette = palette;
var template = RenderUtils.RenderActor(info, tileset, TemplatePalette);
var ibox = new PictureBox
{
Image = template.Bitmap,

5
OpenRA.Editor/Surface.cs
View File

@@ -308,7 +308,10 @@ namespace OpenRA.Editor
public void DrawActor(SGraphics g, CPos p, ActorTemplate t, ColorPalette cp)
{
var centered = t.Appearance == null || !t.Appearance.RelativeToTopLeft;
DrawImage(g, t.Bitmap, p, centered, cp);
var actorPalette = cp;
if (t.Appearance != null && t.Appearance.UseTerrainPalette)
actorPalette = Palette.AsSystemPalette();
DrawImage(g, t.Bitmap, p, centered, actorPalette);
}
float2 GetDrawPosition(CPos location, Bitmap bmp, bool centered)