From e44c46200dcc4645438adc9719803d92237cd67d Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Wed, 3 Feb 2010 21:14:42 +1300 Subject: [PATCH] Hack in a different terrain palette --- OpenRa.Game/Graphics/HardwarePalette.cs | 7 ++++++- OpenRa.Game/Graphics/OverlayRenderer.cs | 4 ++-- OpenRa.Game/Graphics/TerrainRenderer.cs | 2 +- mods/cnc/overrides.mix | Bin 6890 -> 14362 bytes 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/OpenRa.Game/Graphics/HardwarePalette.cs b/OpenRa.Game/Graphics/HardwarePalette.cs index 51a95e7bf2..841274dcc8 100644 --- a/OpenRa.Game/Graphics/HardwarePalette.cs +++ b/OpenRa.Game/Graphics/HardwarePalette.cs @@ -9,6 +9,7 @@ namespace OpenRa.Graphics { Gold, Blue, Red, Orange, Teal, Salmon, Green, Gray, Shadow, Invuln, Disabled, Highlight, Shroud, Chrome, + Terrain }; class HardwarePalette : Sheet @@ -19,8 +20,9 @@ namespace OpenRa.Graphics public HardwarePalette(Renderer renderer, Map map) : base(renderer,new Size(256, maxEntries)) { + Palette pal = new Palette(FileSystem.Open(map.Theater + ".pal")); - AddPalette(pal); + AddPalette(pal); // Gold foreach (string remap in new string[] { "blue", "red", "orange", "teal", "salmon", "green", "gray" }) AddPalette(new Palette(pal, new PlayerColorRemap(FileSystem.Open(remap + ".rem")))); @@ -31,6 +33,9 @@ namespace OpenRa.Graphics AddPalette(new Palette(pal, new SingleColorRemap(Color.FromArgb(128, 255, 255, 255)))); // Highlight AddPalette(new Palette(pal, new ShroudPaletteRemap())); // Shroud AddPalette(pal); // Chrome (it's like gold, but we're not going to hax it in palettemods) + + Palette palTerrain = new Palette(FileSystem.Open("temperat_ra.pal")); + AddPalette(palTerrain); // Terrain } int AddPalette(Palette p) diff --git a/OpenRa.Game/Graphics/OverlayRenderer.cs b/OpenRa.Game/Graphics/OverlayRenderer.cs index c1e9b576be..cc9fdd0fc0 100755 --- a/OpenRa.Game/Graphics/OverlayRenderer.cs +++ b/OpenRa.Game/Graphics/OverlayRenderer.cs @@ -61,8 +61,8 @@ namespace OpenRa.Graphics if (Ore.overlayIsFence[o]) spriteIndex = NearbyFences(x, y); else if (Ore.overlayIsOre[o]) spriteIndex = map.MapTiles[x,y].density - 1; else if (Ore.overlayIsGems[o]) spriteIndex = map.MapTiles[x,y].density - 1; - spriteRenderer.DrawSprite(sprites[spriteIndex], - Game.CellSize * (float2)location, 0); + spriteRenderer.DrawSprite(sprites[spriteIndex], + Game.CellSize * (float2)location, PaletteType.Terrain); } } diff --git a/OpenRa.Game/Graphics/TerrainRenderer.cs b/OpenRa.Game/Graphics/TerrainRenderer.cs index d981e746b3..1a558ddb82 100644 --- a/OpenRa.Game/Graphics/TerrainRenderer.cs +++ b/OpenRa.Game/Graphics/TerrainRenderer.cs @@ -34,7 +34,7 @@ namespace OpenRa.Graphics for( int i = map.XOffset ; i < map.XOffset + map.Width; i++ ) { Sprite tile = tileMapping[map.MapTiles[i, j]]; - Util.FastCreateQuad(vertices, indices, Game.CellSize * new float2(i, j), tile, 0, nv, ni, tile.size); + Util.FastCreateQuad(vertices, indices, Game.CellSize * new float2(i, j), tile, (int)PaletteType.Terrain, nv, ni, tile.size); nv += 4; ni += 6; } diff --git a/mods/cnc/overrides.mix b/mods/cnc/overrides.mix index e798663a514a37e684e370a4cb63767d1619bd04..8d227fb2c2a5dac1e0427329dcc161c7417c2f4b 100644 GIT binary patch delta 915 zcmXw%y^q{P7{*_2zx=)a8rx%g?Dg!9cWtkC&--=fYz|9EiRfskXwX6qU8GBL%ALd& zh*cE+02IC?N}!{PXi-E(O@l-aLWsWriH6yNnP=X4o|$I!oA>Ya*H@puef;e^z5z@dHG4- ze|Z!8djQA}^H7`yHCzbgh$rB|wwuE}_xv!=o2F^ETCH}c)9DJmUQZB3QBovHQe;_G z4Na2_N!2A;*EAmNzG3vSt?{550WwV!naDA*gAle%j4-yy9$VOV2p4f3;_=Ooa6|}o zY#KT=3WCHX362;^sL!}kk~1>ONS;S-l+h@6l2J6I5iNXHQJOH8WNcUzLrTk(%`%o} z>8vV;(_*nG7xkt-TSxUGT+jV#>Xq5v$x}3<)`;jys0CPakc=$RGz3lUsd7gWj@;_R z%@*#kbV+uo+?OYFfYtG&D%mVgrsF6Z1#IBaz>Yn0d%8JUR?FFRmZjM!VR4v*ICN~+ z)a}07mnFH^1&*}>7{VSL*lxFVU9VQF`Fvg!#bh#Jj8RJCI1a-QW9+)FWm%jf$Ia1K zbuwMW<2j*45T)3soSbFhejh1{A&P3ZE4G_v+^nG~p`mbEpDkB+%K6D8UkuqSP70q) z9G@A8YI`$QbRubiAbVXIwFKj+qb6BF*ccBe3W(u&nrVrO+7U!!6zd7mNYD$su4DCd zy``!k2<4`U=XVWOOVLI|%dSy&`s21jS804q{W3&_YowNz=t?Myp4e+@)~w^RD%=)( zbZ4U1BWWGAD-TK&G7VA*5&?oXxJO_CXaMeUhNh`Cp;c9F)|~nu`{{!CX z|Bu(WY4LS^v3v03!`b!472KRZx;lTlyLtENZg#c1gv%%I?=A~41N?XJ&f G+`xa)L5LOr delta 105 zcmbPL@XB;Th=N|I@Zysfo$|YmSlFTQDCA~VD5NBoBqk*mr|JP23;@~|B3S?c