brought back the MoveFlash

closes #2592
This commit is contained in:
Matthias Mailänder
2013-10-24 21:37:43 +02:00
parent 55b848f071
commit b1c3ac20bf
16 changed files with 104 additions and 11 deletions

View File

@@ -0,0 +1,41 @@
#region Copyright & License Information
/*
* Copyright 2007-2013 The OpenRA Developers (see AUTHORS)
* This file is part of OpenRA, which is free software. It is made
* available to you under the terms of the GNU General Public License
* as published by the Free Software Foundation. For more information,
* see COPYING.
*/
#endregion
using System.Collections.Generic;
using OpenRA.Effects;
using OpenRA.FileFormats;
using OpenRA.Graphics;
using OpenRA.Traits;
namespace OpenRA.Effects
{
public class MoveFlash : IEffect
{
Animation anim;
WPos pos;
public MoveFlash(WPos pos, World world)
{
this.pos = pos;
anim = new Animation("moveflsh");
anim.PlayThen("idle", () => world.AddFrameEndTask(w => w.Remove(this)));
}
public void Tick(World world)
{
anim.Tick();
}
public IEnumerable<IRenderable> Render(WorldRenderer wr)
{
return anim.Render(pos, WVec.Zero, 0, wr.Palette("moveflash"), 1f / wr.Viewport.Zoom);
}
}
}

View File

@@ -94,7 +94,12 @@ namespace OpenRA.Graphics
Zoom = Game.Settings.Graphics.PixelDouble ? 2 : 1;
}
public CPos ViewToWorld(int2 view)
public WPos ViewToWorldPosition(int2 view)
{
return worldRenderer.Position(ViewToWorldPx(view));
}
public CPos ViewToWorldCellPosition(int2 view)
{
return worldRenderer.Position(ViewToWorldPx(view)).ToCPos();
}

View File

@@ -236,6 +236,7 @@
<Compile Include="Traits\World\ScreenMap.cs" />
<Compile Include="Traits\World\ActorMap.cs" />
<Compile Include="Widgets\HotkeyEntryWidget.cs" />
<Compile Include="Effects\MoveFlash.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\OpenRA.FileFormats\OpenRA.FileFormats.csproj">

View File

@@ -95,7 +95,7 @@ namespace OpenRA.Widgets
public void UpdateMouseover()
{
TooltipType = WorldTooltipType.None;
var cell = worldRenderer.Viewport.ViewToWorld(Viewport.LastMousePos);
var cell = worldRenderer.Viewport.ViewToWorldCellPosition(Viewport.LastMousePos);
if (!world.Map.IsInMap(cell))
return;

View File

@@ -12,6 +12,7 @@ using System;
using System.Collections.Generic;
using System.Drawing;
using System.Linq;
using OpenRA.Effects;
using OpenRA.FileFormats;
using OpenRA.Graphics;
using OpenRA.Orders;
@@ -140,6 +141,8 @@ namespace OpenRA.Widgets
orders.Do(o => world.IssueOrder(o));
world.PlayVoiceForOrders(orders);
if (orders.Where(o => o.OrderString != null && o.OrderString.EndsWith("Move")).Any())
world.Add(new MoveFlash(worldRenderer.Viewport.ViewToWorldPosition(mi.Location), world));
}
public override string GetCursor(int2 screenPos)