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

Minimap refactoring; don't render the minimap unless we have radar.

Browse Source
This commit is contained in:
Paul Chote
2010-07-22 00:15:33 +12:00
parent fdc033a63f
commit 2d2362a1a6
2 changed files with 50 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenRA.Game/Graphics/Minimap.cs
View File

@@ -130,9 +130,7 @@ namespace OpenRA.Graphics
var shroud = Color.Black.ToArgb(); var shroud = Color.Black.ToArgb();
var fogOpacity = 0.5f; var fogOpacity = 0.5f;
unsafe unsafe
{ {
int* c = (int*)bitmapData.Scan0; int* c = (int*)bitmapData.Scan0;

100
OpenRA.Game/Widgets/RadarBinWidget.cs
View File

@@ -45,8 +45,8 @@ namespace OpenRA.Widgets
previewScale = Math.Min(192f / world.Map.Width, 192f / world.Map.Height); previewScale = Math.Min(192f / world.Map.Width, 192f / world.Map.Height);
previewOrigin = new int2(9 + (int)(previewScale * (size - world.Map.Width)) / 2, (int)(previewScale * (size - world.Map.Height)) / 2); previewOrigin = new int2(9 + (int)(radarOpenOrigin.X + previewScale * (size - world.Map.Width)/2), (int)(radarOpenOrigin.Y + previewScale * (size - world.Map.Height)/2));
mapRect = new RectangleF(radarOrigin.X + previewOrigin.X, radarOrigin.Y + previewOrigin.Y, (int)(world.Map.Width * previewScale), (int)(world.Map.Height * previewScale)); mapRect = new RectangleF(previewOrigin.X, previewOrigin.Y, (int)(world.Map.Width * previewScale), (int)(world.Map.Height * previewScale));
terrainBitmap = Minimap.RenderTerrainBitmap(world.Map); terrainBitmap = Minimap.RenderTerrainBitmap(world.Map);
radarSheet = new Sheet(new Size( terrainBitmap.Width, terrainBitmap.Height ) ); radarSheet = new Sheet(new Size( terrainBitmap.Width, terrainBitmap.Height ) );
@@ -115,70 +115,68 @@ namespace OpenRA.Widgets
{ {
radarCollection = "radar-" + world.LocalPlayer.Country.Race; radarCollection = "radar-" + world.LocalPlayer.Country.Race;
var hasNewRadar = world.Queries.OwnedBy[world.LocalPlayer]
.WithTrait<ProvidesRadar>()
.Any(a => a.Trait.IsActive);
if (hasNewRadar != hasRadar)
radarAnimating = true;
hasRadar = hasNewRadar;
Game.Renderer.RgbaSpriteRenderer.DrawSprite(ChromeProvider.GetImage(radarCollection, "left"), radarOrigin, "chrome"); Game.Renderer.RgbaSpriteRenderer.DrawSprite(ChromeProvider.GetImage(radarCollection, "left"), radarOrigin, "chrome");
Game.Renderer.RgbaSpriteRenderer.DrawSprite(ChromeProvider.GetImage(radarCollection, "right"), radarOrigin + new float2(201, 0), "chrome"); Game.Renderer.RgbaSpriteRenderer.DrawSprite(ChromeProvider.GetImage(radarCollection, "right"), radarOrigin + new float2(201, 0), "chrome");
Game.Renderer.RgbaSpriteRenderer.DrawSprite(ChromeProvider.GetImage(radarCollection, "bottom"), radarOrigin + new float2(0, 192), "chrome"); Game.Renderer.RgbaSpriteRenderer.DrawSprite(ChromeProvider.GetImage(radarCollection, "bottom"), radarOrigin + new float2(0, 192), "chrome");
Game.Renderer.RgbaSpriteRenderer.DrawSprite(ChromeProvider.GetImage(radarCollection, "bg"), radarOrigin + new float2(9, 0), "chrome"); Game.Renderer.RgbaSpriteRenderer.DrawSprite(ChromeProvider.GetImage(radarCollection, "bg"), radarOrigin + new float2(9, 0), "chrome");
Game.Renderer.RgbaSpriteRenderer.Flush(); Game.Renderer.RgbaSpriteRenderer.Flush();
// Custom terrain layer // Don't draw the radar if the tray is moving
var custom = Minimap.AddCustomTerrain(world,terrainBitmap);
var final = Minimap.AddActors(world, custom);
radarSheet.Texture.SetData(final);
if (radarAnimationFrame >= radarSlideAnimationLength) if (radarAnimationFrame >= radarSlideAnimationLength)
{ {
// Build the radar image
var custom = Minimap.AddCustomTerrain(world,terrainBitmap);
var final = Minimap.AddActors(world, custom);
radarSheet.Texture.SetData(final);
Game.Renderer.RgbaSpriteRenderer.DrawSprite( radarSprite, Game.Renderer.RgbaSpriteRenderer.DrawSprite( radarSprite,
new float2(mapRect.Location), "chrome", new float2(mapRect.Size) ); new float2(mapRect.Location.X, mapRect.Location.Y + world.Map.Height * previewScale * (1 - radarMinimapHeight)/2),
"chrome",
new float2(mapRect.Size.Width, mapRect.Size.Height*radarMinimapHeight) );
} }
} }
public override void Tick(World w) public override void Tick(World w)
{ {
if (world == null) var hasRadarNew = world.Queries.OwnedBy[world.LocalPlayer]
.WithTrait<ProvidesRadar>()
.Any(a => a.Trait.IsActive);
if (hasRadarNew != hasRadar)
radarAnimating = true;
hasRadar = hasRadarNew;
if (!radarAnimating)
return; return;
if (radarAnimating) // Increment frame
{ if (hasRadar)
// Increment frame radarAnimationFrame++;
if (hasRadar) else
radarAnimationFrame++; radarAnimationFrame--;
else
radarAnimationFrame--; // Calculate radar bin position
if (radarAnimationFrame <= radarSlideAnimationLength)
// Calculate radar bin position radarOrigin = float2.Lerp(radarClosedOrigin, radarOpenOrigin, radarAnimationFrame * 1.0f / radarSlideAnimationLength);
if (radarAnimationFrame <= radarSlideAnimationLength)
radarOrigin = float2.Lerp(radarClosedOrigin, radarOpenOrigin, radarAnimationFrame * 1.0f / radarSlideAnimationLength); var eva = Rules.Info["world"].Traits.Get<EvaAlertsInfo>();
var eva = Rules.Info["world"].Traits.Get<EvaAlertsInfo>(); // Play radar-on sound at the start of the activate anim (open)
if (radarAnimationFrame == radarSlideAnimationLength && hasRadar)
// Play radar-on sound at the start of the activate anim (open) Sound.Play(eva.RadarUp);
if (radarAnimationFrame == radarSlideAnimationLength && hasRadar)
Sound.Play(eva.RadarUp); // Play radar-on sound at the start of the activate anim (close)
if (radarAnimationFrame == radarSlideAnimationLength + radarActivateAnimationLength - 1 && !hasRadar)
// Play radar-on sound at the start of the activate anim (close) Sound.Play(eva.RadarDown);
if (radarAnimationFrame == radarSlideAnimationLength + radarActivateAnimationLength - 1 && !hasRadar)
Sound.Play(eva.RadarDown); // Minimap height
if (radarAnimationFrame >= radarSlideAnimationLength)
// Minimap height radarMinimapHeight = float2.Lerp(0, 1, (radarAnimationFrame - radarSlideAnimationLength) * 1.0f / radarActivateAnimationLength);
if (radarAnimationFrame >= radarSlideAnimationLength)
radarMinimapHeight = float2.Lerp(0, 1, (radarAnimationFrame - radarSlideAnimationLength) * 1.0f / radarActivateAnimationLength); // Animation is complete
if (radarAnimationFrame == (hasRadar ? radarSlideAnimationLength + radarActivateAnimationLength : 0))
// Animation is complete radarAnimating = false;
if (radarAnimationFrame == (hasRadar ? radarSlideAnimationLength + radarActivateAnimationLength : 0))
radarAnimating = false;
}
mapRect = new RectangleF(radarOrigin.X + previewOrigin.X, radarOrigin.Y + previewOrigin.Y + (int)(world.Map.Height * previewScale * (1 - radarMinimapHeight)/2), (int)(world.Map.Width * previewScale), (int)(world.Map.Height * previewScale * radarMinimapHeight));
} }
int2 CellToMinimapPixel(int2 p) int2 CellToMinimapPixel(int2 p)