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

Remove PPos hack from ScreenShaker.

Browse Source
This commit is contained in:
Paul Chote
2013-09-20 18:53:06 +12:00
parent 90ab2477b4
commit 68a0070fa6
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenRA.Game/Traits/World/ScreenShaker.cs
View File

@@ -11,16 +11,20 @@
using System;
using System.Collections.Generic;
using System.Linq;
using OpenRA.Graphics;
namespace OpenRA.Traits
{
public class ScreenShakerInfo : TraitInfo<ScreenShaker> { }
public class ScreenShaker : ITick
public class ScreenShaker : ITick, IWorldLoaded
{
WorldRenderer worldRenderer;
List<ShakeEffect> shakeEffects = new List<ShakeEffect>();
int ticks = 0;
public void WorldLoaded(World w, WorldRenderer wr) { worldRenderer = wr; }
public void Tick(Actor self)
{
if (shakeEffects.Any())
@@ -46,7 +50,7 @@ namespace OpenRA.Traits
float GetIntensity()
{
var cp = ((PPos)Game.viewport.CenterLocation.ToInt2()).ToWPos(0);
var cp = worldRenderer.Position(Game.viewport.CenterLocation.ToInt2());
var intensity = 100 * 1024 * 1024 * shakeEffects.Sum(
e => (float)e.Intensity / (e.Position - cp).LengthSquared);