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

32bpp terrain does not need a palette.

Browse Source
This commit is contained in:
Andre Mohren
2021-06-11 13:33:00 +02:00
committed by reaperrr
parent 62207313a0
commit de6b8b6a74
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
OpenRA.Mods.Common/Terrain/DefaultTerrain.cs
View File

@@ -75,6 +75,7 @@ namespace OpenRA.Mods.Common.Terrain
public readonly bool EnableDepth = false; public readonly bool EnableDepth = false;
public readonly float MinHeightColorBrightness = 1.0f; public readonly float MinHeightColorBrightness = 1.0f;
public readonly float MaxHeightColorBrightness = 1.0f; public readonly float MaxHeightColorBrightness = 1.0f;
public readonly string Palette = TileSet.TerrainPaletteInternalName;
[FieldLoader.Ignore] [FieldLoader.Ignore]
public readonly IReadOnlyDictionary<ushort, TerrainTemplateInfo> Templates; public readonly IReadOnlyDictionary<ushort, TerrainTemplateInfo> Templates;

6
OpenRA.Mods.Common/Traits/World/TerrainRenderer.cs
View File

@@ -92,7 +92,7 @@ namespace OpenRA.Mods.Common.Traits
public void UpdateCell(CPos cell) public void UpdateCell(CPos cell)
{ {
var tile = map.Tiles[cell]; var tile = map.Tiles[cell];
var palette = TileSet.TerrainPaletteInternalName; var palette = terrainInfo.Palette;
if (terrainInfo.Templates.TryGetValue(tile.Type, out var template)) if (terrainInfo.Templates.TryGetValue(tile.Type, out var template))
palette = ((DefaultTerrainTemplateInfo)template).Palette ?? palette; palette = ((DefaultTerrainTemplateInfo)template).Palette ?? palette;
@@ -178,7 +178,7 @@ namespace OpenRA.Mods.Common.Traits
var u = gridType == MapGridType.Rectangular ? x : (x - y) / 2f; var u = gridType == MapGridType.Rectangular ? x : (x - y) / 2f;
var v = gridType == MapGridType.Rectangular ? y : (x + y) / 2f; var v = gridType == MapGridType.Rectangular ? y : (x + y) / 2f;
var offset = (new float2(u * ts.Width, (v - 0.5f * tileInfo.Height) * ts.Height) - 0.5f * sprite.Size.XY).ToInt2(); var offset = (new float2(u * ts.Width, (v - 0.5f * tileInfo.Height) * ts.Height) - 0.5f * sprite.Size.XY).ToInt2();
var palette = template.Palette ?? TileSet.TerrainPaletteInternalName; var palette = template.Palette ?? terrainInfo.Palette;
yield return new UISpriteRenderable(sprite, WPos.Zero, origin + offset, 0, wr.Palette(palette), scale); yield return new UISpriteRenderable(sprite, WPos.Zero, origin + offset, 0, wr.Palette(palette), scale);
} }
@@ -201,7 +201,7 @@ namespace OpenRA.Mods.Common.Traits
var sprite = tileCache.TileSprite(tile, 0); var sprite = tileCache.TileSprite(tile, 0);
var offset = map.Offset(new CVec(x, y), tileInfo.Height); var offset = map.Offset(new CVec(x, y), tileInfo.Height);
var palette = wr.Palette(template.Palette ?? TileSet.TerrainPaletteInternalName); var palette = wr.Palette(template.Palette ?? terrainInfo.Palette);
yield return new SpriteRenderable(sprite, origin, offset, 0, palette, 1f, 1f, float3.Ones, TintModifiers.None, false); yield return new SpriteRenderable(sprite, origin, offset, 0, palette, 1f, 1f, float3.Ones, TintModifiers.None, false);
} }