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

Rewrite TS minimap rendering:

Browse Source 
* Rename LeftColor and RightColor to MinColor and MaxColor
  These are mapped from LowRadarColor and HighRadarColor in
  the original inis, and appear to be used to set the bounding
  values for selecting a random colour, NOT for left/right
  pixels (which caused noticeably wrong banding).

* Adjust brightness based on terrain height.
  MinHeightColorBrightness and MaxHeightColorBrightness
  were chosen by trial/error to match the original
  map preview rendering.
This commit is contained in:
Paul Chote
2020-06-18 21:48:59 +01:00
committed by Oliver Brakmann
parent 83c53e17e0
commit 5f588561b6
29 changed files with 11931 additions and 11843 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
OpenRA.Game/Map/Map.cs
View File

@@ -702,6 +702,11 @@ namespace OpenRA
var pxStride = 4;
var minimapData = new byte[stride * height];
Color leftColor, rightColor;
var useHeightModifiers = tileset.MinHeightColorBrightness != 1.0f || tileset.MaxHeightColorBrightness != 1.0f;
var minHeightBrightness = tileset.MinHeightColorBrightness;
var maxHeightBrightness = tileset.MaxHeightColorBrightness;
var heightModifier = 1f / Grid.MaximumTerrainHeight;
for (var y = 0; y < height; y++)
{
for (var x = 0; x < width; x++)
@@ -716,8 +721,21 @@ namespace OpenRA
{
// Cell contains terrain
var type = tileset.GetTileInfo(Tiles[uv]);
leftColor = type != null ? type.LeftColor : Color.Black;
rightColor = type != null ? type.RightColor : Color.Black;
if (type != null)
{
if (useHeightModifiers)
{
var left = Exts.ColorLerp(Game.CosmeticRandom.NextFloat(), type.MinColor, type.MaxColor);
var right = Exts.ColorLerp(Game.CosmeticRandom.NextFloat(), type.MinColor, type.MaxColor);
var scale = float2.Lerp(minHeightBrightness, maxHeightBrightness, heightModifier * Height[uv]);
leftColor = Color.FromArgb((int)(scale * left.R).Clamp(0, 255), (int)(scale * left.G).Clamp(0, 255), (int)(scale * left.B).Clamp(0, 255));
rightColor = Color.FromArgb((int)(scale * right.R).Clamp(0, 255), (int)(scale * right.G).Clamp(0, 255), (int)(scale * right.B).Clamp(0, 255));
}
else
leftColor = rightColor = type.MinColor;
}
else
leftColor = rightColor = Color.Black;
}
if (isRectangularIsometric)