Revert "freeze animations during pause to visualize it better"

This reverts commit 960248fe44.
This commit is contained in:
Paul Chote
2014-07-08 10:40:06 +12:00
parent 3c2d9910e3
commit 18c9a25232
20 changed files with 2 additions and 65 deletions

View File

@@ -128,9 +128,6 @@ namespace OpenRA.Traits
public virtual void TickRender(WorldRenderer wr, Actor self) public virtual void TickRender(WorldRenderer wr, Actor self)
{ {
if (wr.world.Paused == World.PauseState.Paused)
return;
foreach (var a in anims.Values) foreach (var a in anims.Values)
a.Animation.Animation.Tick(); a.Animation.Animation.Tick();
} }

View File

@@ -185,9 +185,6 @@ namespace OpenRA.Mods.RA
public void TickRender(WorldRenderer wr, Actor self) public void TickRender(WorldRenderer wr, Actor self)
{ {
if (wr.world.Paused == World.PauseState.Paused)
return;
// Take a copy so that Tick() can remove animations // Take a copy so that Tick() can remove animations
foreach (var m in muzzles.ToList()) foreach (var m in muzzles.ToList())
m.Animation.Tick(); m.Animation.Tick();

View File

@@ -29,9 +29,6 @@ namespace OpenRA.Mods.RA
public void TickRender(WorldRenderer wr, Actor self) public void TickRender(WorldRenderer wr, Actor self)
{ {
if (wr.world.Paused == World.PauseState.Paused)
return;
if (remainingFrames > 0) if (remainingFrames > 0)
remainingFrames--; remainingFrames--;
} }

View File

@@ -43,9 +43,6 @@ namespace OpenRA.Mods.RA
public void TickRender(WorldRenderer wr, Actor self) public void TickRender(WorldRenderer wr, Actor self)
{ {
if (wr.world.Paused == World.PauseState.Paused)
return;
t += 0.25f; t += 0.25f;
if (t >= 256) t = 0; if (t >= 256) t = 0;
} }

View File

@@ -21,7 +21,7 @@ namespace OpenRA.Mods.RA.Effects
public readonly string Palette = "effect"; public readonly string Palette = "effect";
public readonly int BrightZaps = 1; public readonly int BrightZaps = 1;
public readonly int DimZaps = 2; public readonly int DimZaps = 2;
public IEffect Create(ProjectileArgs args) { return new TeslaZap(this, args); } public IEffect Create(ProjectileArgs args) { return new TeslaZap( this, args ); }
} }
class TeslaZap : IEffect class TeslaZap : IEffect

View File

@@ -28,9 +28,6 @@ namespace OpenRA.Mods.RA
float t = 0; float t = 0;
public void TickRender(WorldRenderer wr, Actor self) public void TickRender(WorldRenderer wr, Actor self)
{ {
if (wr.world.Paused == World.PauseState.Paused)
return;
t += .5f; t += .5f;
} }

View File

@@ -29,9 +29,6 @@ namespace OpenRA.Mods.RA
public void TickRender(WorldRenderer wr, Actor self) public void TickRender(WorldRenderer wr, Actor self)
{ {
if (wr.world.Paused == World.PauseState.Paused)
return;
if (remainingFrames > 0) if (remainingFrames > 0)
remainingFrames--; remainingFrames--;
} }

View File

@@ -56,9 +56,6 @@ namespace OpenRA.Mods.RA.Render
public override void TickRender(WorldRenderer wr, Actor self) public override void TickRender(WorldRenderer wr, Actor self)
{ {
if (wr.world.Paused == World.PauseState.Paused)
return;
base.TickRender(wr, self); base.TickRender(wr, self);
if (buildComplete) if (buildComplete)

View File

@@ -47,9 +47,6 @@ namespace OpenRA.Mods.RA.Render
public override void TickRender(WorldRenderer wr, Actor self) public override void TickRender(WorldRenderer wr, Actor self)
{ {
if (wr.world.Paused == World.PauseState.Paused)
return;
base.TickRender(wr, self); base.TickRender(wr, self);
} }

View File

@@ -64,11 +64,7 @@ namespace OpenRA.Mods.RA.Render
public override void TickRender(WorldRenderer wr, Actor self) public override void TickRender(WorldRenderer wr, Actor self)
{ {
if (wr.world.Paused == World.PauseState.Paused)
return;
base.TickRender(wr, self); base.TickRender(wr, self);
if (isOpen && !self.World.ActorMap.GetUnitsAt(openExit).Any( a => a != self )) if (isOpen && !self.World.ActorMap.GetUnitsAt(openExit).Any( a => a != self ))
{ {
isOpen = false; isOpen = false;

View File

@@ -34,9 +34,6 @@ namespace OpenRA.Mods.RA.Render
public override void TickRender(WorldRenderer wr, Actor self) public override void TickRender(WorldRenderer wr, Actor self)
{ {
if (wr.world.Paused == World.PauseState.Paused)
return;
if (disguise.AsSprite != intendedSprite) if (disguise.AsSprite != intendedSprite)
{ {
intendedSprite = disguise.AsSprite; intendedSprite = disguise.AsSprite;

View File

@@ -37,9 +37,6 @@ namespace OpenRA.Mods.RA.Render
public override void TickRender(WorldRenderer wr, Actor self) public override void TickRender(WorldRenderer wr, Actor self)
{ {
if (wr.world.Paused == World.PauseState.Paused)
return;
var desiredState = harv.Fullness * (info.ImagesByFullness.Length - 1) / 100; var desiredState = harv.Fullness * (info.ImagesByFullness.Length - 1) / 100;
var desiredImage = info.ImagesByFullness[desiredState]; var desiredImage = info.ImagesByFullness[desiredState];

View File

@@ -82,9 +82,6 @@ namespace OpenRA.Mods.RA.Render
public override void TickRender(WorldRenderer wr, Actor self) public override void TickRender(WorldRenderer wr, Actor self)
{ {
if (wr.world.Paused == World.PauseState.Paused)
return;
base.TickRender(wr, self); base.TickRender(wr, self);
if ((State == AnimationState.Moving || dirty) && !move.IsMoving) if ((State == AnimationState.Moving || dirty) && !move.IsMoving)

View File

@@ -46,9 +46,6 @@ namespace OpenRA.Mods.RA.Render
public override void TickRender(WorldRenderer wr, Actor self) public override void TickRender(WorldRenderer wr, Actor self)
{ {
if (wr.world.Paused == World.PauseState.Paused)
return;
if (wasPanic != sc.Panicking) if (wasPanic != sc.Panicking)
dirty = true; dirty = true;

View File

@@ -73,9 +73,6 @@ namespace OpenRA.Mods.RA.Render
public override void TickRender(WorldRenderer wr, Actor self) public override void TickRender(WorldRenderer wr, Actor self)
{ {
if (wr.world.Paused == World.PauseState.Paused)
return;
if (ShouldBeOpen()) if (ShouldBeOpen())
Open(); Open();
else else

View File

@@ -37,9 +37,6 @@ namespace OpenRA.Mods.RA.Render
public override void TickRender(WorldRenderer wr, Actor self) public override void TickRender(WorldRenderer wr, Actor self)
{ {
if (wr.world.Paused == World.PauseState.Paused)
return;
var sequence = (armament.IsReloading ? "empty-" : "") + (attack.IsAttacking ? "aim" : "idle"); var sequence = (armament.IsReloading ? "empty-" : "") + (attack.IsAttacking ? "aim" : "idle");
if (sequence != DefaultAnimation.CurrentSequence.Name) if (sequence != DefaultAnimation.CurrentSequence.Name)
DefaultAnimation.ReplaceAnim(sequence); DefaultAnimation.ReplaceAnim(sequence);

View File

@@ -41,9 +41,6 @@ namespace OpenRA.Mods.RA.Render
public void TickRender(WorldRenderer wr, Actor self) public void TickRender(WorldRenderer wr, Actor self)
{ {
if (wr.world.Paused == World.PauseState.Paused)
return;
if (self.IsDead() || buildComplete) if (self.IsDead() || buildComplete)
return; return;

View File

@@ -97,9 +97,6 @@ namespace OpenRA.Mods.RA.Render
public void TickRender(WorldRenderer wr, Actor self) public void TickRender(WorldRenderer wr, Actor self)
{ {
if (wr.world.Paused == World.PauseState.Paused)
return;
foreach (var a in anims.Values) foreach (var a in anims.Values)
a.Animation.Tick(); a.Animation.Tick();
} }

View File

@@ -53,7 +53,6 @@ namespace OpenRA.Mods.RA
public override void Tick(Actor self) public override void Tick(Actor self)
{ {
base.Tick(self); base.Tick(self);
if (IsProne && --remainingProneTime == 0) if (IsProne && --remainingProneTime == 0)
LocalOffset = WVec.Zero; LocalOffset = WVec.Zero;
} }
@@ -102,14 +101,10 @@ namespace OpenRA.Mods.RA
public override void TickRender(WorldRenderer wr, Actor self) public override void TickRender(WorldRenderer wr, Actor self)
{ {
if (wr.world.Paused == World.PauseState.Paused)
return;
if (wasProne != tc.IsProne) if (wasProne != tc.IsProne)
dirty = true; dirty = true;
wasProne = tc.IsProne; wasProne = tc.IsProne;
base.TickRender(wr, self); base.TickRender(wr, self);
} }
} }

View File

@@ -36,13 +36,7 @@ namespace OpenRA.Mods.RA
this.info = info; this.info = info;
} }
public void TickRender(WorldRenderer wr, Actor self) public void TickRender(WorldRenderer wr, Actor self) { t += .25f; }
{
if (wr.world.Paused == World.PauseState.Paused)
return;
t += .25f;
}
uint[] temp = new uint[7]; /* allocating this on the fly actually hurts our profile */ uint[] temp = new uint[7]; /* allocating this on the fly actually hurts our profile */