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

Support fading the area behind the radar to black.

Browse Source
This commit is contained in:
Paul Chote
2014-07-14 19:12:34 +12:00
parent fda3ae2fb0
commit dee6a9bac4
2 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
OpenRA.Mods.RA/Widgets/Logic/Ingame/IngameRadarDisplayLogic.cs
View File

@@ -8,6 +8,7 @@
*/ */
#endregion #endregion
using System.Drawing;
using System.Linq; using System.Linq;
using OpenRA.Mods.RA.Widgets; using OpenRA.Mods.RA.Widgets;
using OpenRA.Widgets; using OpenRA.Widgets;
@@ -21,7 +22,9 @@ namespace OpenRA.Mods.RA.Widgets.Logic
{ {
var radarEnabled = false; var radarEnabled = false;
var cachedRadarEnabled = false; var cachedRadarEnabled = false;
widget.Get<RadarWidget>("RADAR_MINIMAP").IsEnabled = () => radarEnabled; var blockColor = Color.Transparent;
var radar = widget.Get<RadarWidget>("RADAR_MINIMAP");
radar.IsEnabled = () => radarEnabled;
var ticker = widget.Get<LogicTickerWidget>("RADAR_TICKER"); var ticker = widget.Get<LogicTickerWidget>("RADAR_TICKER");
ticker.OnTick = () => ticker.OnTick = () =>
@@ -33,6 +36,14 @@ namespace OpenRA.Mods.RA.Widgets.Logic
Sound.PlayNotification(world.Map.Rules, null, "Sounds", radarEnabled ? "RadarUp" : "RadarDown", null); Sound.PlayNotification(world.Map.Rules, null, "Sounds", radarEnabled ? "RadarUp" : "RadarDown", null);
cachedRadarEnabled = radarEnabled; cachedRadarEnabled = radarEnabled;
}; };
var block = widget.GetOrNull<ColorBlockWidget>("RADAR_FADETOBLACK");
if (block != null)
{
radar.Animating = x => blockColor = Color.FromArgb((int)(255 * x), Color.Black);
block.IsVisible = () => blockColor.A != 0;
block.GetColor = () => blockColor;
}
} }
} }
} }

3
OpenRA.Mods.RA/Widgets/RadarWidget.cs
View File

@@ -25,6 +25,7 @@ namespace OpenRA.Mods.RA.Widgets
public Func<bool> IsEnabled = () => true; public Func<bool> IsEnabled = () => true;
public Action AfterOpen = () => { }; public Action AfterOpen = () => { };
public Action AfterClose = () => { }; public Action AfterClose = () => { };
public Action<float> Animating = _ => {};
float radarMinimapHeight; float radarMinimapHeight;
int frame; int frame;
@@ -227,6 +228,8 @@ namespace OpenRA.Mods.RA.Widgets
frame += enabled ? 1 : -1; frame += enabled ? 1 : -1;
radarMinimapHeight = float2.Lerp(0, 1, (float)frame / AnimationLength); radarMinimapHeight = float2.Lerp(0, 1, (float)frame / AnimationLength);
Animating(frame * 1f / AnimationLength);
// Update map rectangle for event handling // Update map rectangle for event handling
var ro = RenderOrigin; var ro = RenderOrigin;
mapRect = new Rectangle(previewOrigin.X + ro.X, previewOrigin.Y + ro.Y, mapRect.Width, mapRect.Height); mapRect = new Rectangle(previewOrigin.X + ro.X, previewOrigin.Y + ro.Y, mapRect.Width, mapRect.Height);