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

Apply a simple constraint to ScreenShaker's multiplier to stop it shaking the game too much

Browse Source
This commit is contained in:
ScottNZ
2013-11-09 22:53:32 +13:00
parent 9f65bc7d6b
commit 1a5df86329
1 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -15,14 +15,26 @@ using OpenRA.Graphics;
namespace OpenRA.Traits namespace OpenRA.Traits
{ {
public class ScreenShakerInfo : TraitInfo<ScreenShaker> { } public class ScreenShakerInfo : ITraitInfo
{
public readonly float2 MinMultiplier = new float2(-3, -3);
public readonly float2 MaxMultiplier = new float2(3, 3);
public object Create(ActorInitializer init) { return new ScreenShaker(this); }
}
public class ScreenShaker : ITick, IWorldLoaded public class ScreenShaker : ITick, IWorldLoaded
{ {
readonly ScreenShakerInfo info;
WorldRenderer worldRenderer; WorldRenderer worldRenderer;
List<ShakeEffect> shakeEffects = new List<ShakeEffect>(); List<ShakeEffect> shakeEffects = new List<ShakeEffect>();
int ticks = 0; int ticks = 0;
public ScreenShaker(ScreenShakerInfo info)
{
this.info = info;
}
public void WorldLoaded(World w, WorldRenderer wr) { worldRenderer = wr; } public void WorldLoaded(World w, WorldRenderer wr) { worldRenderer = wr; }
public void Tick(Actor self) public void Tick(Actor self)
@@ -55,7 +67,8 @@ namespace OpenRA.Traits
float2 GetMultiplier() float2 GetMultiplier()
{ {
return shakeEffects.Aggregate(float2.Zero, (sum, next) => sum + next.Multiplier); return shakeEffects.Aggregate(float2.Zero, (sum, next) => sum + next.Multiplier)
.Constrain(info.MinMultiplier, info.MaxMultiplier);
} }
float GetIntensity() float GetIntensity()