From 18c9a25232547844060c240c601e918986f6b8f9 Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Tue, 8 Jul 2014 10:40:06 +1200 Subject: [PATCH] Revert "freeze animations during pause to visualize it better" This reverts commit 960248fe4425463a45c64058f5b6591878886016. --- OpenRA.Game/Traits/Render/RenderSprites.cs | 3 --- OpenRA.Mods.RA/Attack/AttackGarrisoned.cs | 3 --- OpenRA.Mods.RA/ChronoshiftPaletteEffect.cs | 3 --- OpenRA.Mods.RA/CloakPaletteEffect.cs | 3 --- OpenRA.Mods.RA/Effects/TeslaZap.cs | 2 +- OpenRA.Mods.RA/LightPaletteRotator.cs | 3 --- OpenRA.Mods.RA/NukePaletteEffect.cs | 3 --- OpenRA.Mods.RA/Render/RenderBuilding.cs | 3 --- OpenRA.Mods.RA/Render/RenderBuildingWall.cs | 3 --- OpenRA.Mods.RA/Render/RenderBuildingWarFactory.cs | 4 ---- OpenRA.Mods.RA/Render/RenderDisguise.cs | 3 --- OpenRA.Mods.RA/Render/RenderHarvester.cs | 3 --- OpenRA.Mods.RA/Render/RenderInfantry.cs | 3 --- OpenRA.Mods.RA/Render/RenderInfantryPanic.cs | 3 --- OpenRA.Mods.RA/Render/RenderLandingCraft.cs | 3 --- OpenRA.Mods.RA/Render/RenderUnitReload.cs | 3 --- OpenRA.Mods.RA/Render/WithMakeAnimation.cs | 3 --- OpenRA.Mods.RA/Render/WithMuzzleFlash.cs | 3 --- OpenRA.Mods.RA/TakeCover.cs | 5 ----- OpenRA.Mods.RA/WaterPaletteRotation.cs | 8 +------- 20 files changed, 2 insertions(+), 65 deletions(-) diff --git a/OpenRA.Game/Traits/Render/RenderSprites.cs b/OpenRA.Game/Traits/Render/RenderSprites.cs index e8c4fb93b5..063e608f99 100644 --- a/OpenRA.Game/Traits/Render/RenderSprites.cs +++ b/OpenRA.Game/Traits/Render/RenderSprites.cs @@ -128,9 +128,6 @@ namespace OpenRA.Traits public virtual void TickRender(WorldRenderer wr, Actor self) { - if (wr.world.Paused == World.PauseState.Paused) - return; - foreach (var a in anims.Values) a.Animation.Animation.Tick(); } diff --git a/OpenRA.Mods.RA/Attack/AttackGarrisoned.cs b/OpenRA.Mods.RA/Attack/AttackGarrisoned.cs index ce0bc91849..e2e9545566 100644 --- a/OpenRA.Mods.RA/Attack/AttackGarrisoned.cs +++ b/OpenRA.Mods.RA/Attack/AttackGarrisoned.cs @@ -185,9 +185,6 @@ namespace OpenRA.Mods.RA public void TickRender(WorldRenderer wr, Actor self) { - if (wr.world.Paused == World.PauseState.Paused) - return; - // Take a copy so that Tick() can remove animations foreach (var m in muzzles.ToList()) m.Animation.Tick(); diff --git a/OpenRA.Mods.RA/ChronoshiftPaletteEffect.cs b/OpenRA.Mods.RA/ChronoshiftPaletteEffect.cs index 19c99528e8..fc13a78441 100644 --- a/OpenRA.Mods.RA/ChronoshiftPaletteEffect.cs +++ b/OpenRA.Mods.RA/ChronoshiftPaletteEffect.cs @@ -29,9 +29,6 @@ namespace OpenRA.Mods.RA public void TickRender(WorldRenderer wr, Actor self) { - if (wr.world.Paused == World.PauseState.Paused) - return; - if (remainingFrames > 0) remainingFrames--; } diff --git a/OpenRA.Mods.RA/CloakPaletteEffect.cs b/OpenRA.Mods.RA/CloakPaletteEffect.cs index 306041e60d..e47ea3a7d2 100644 --- a/OpenRA.Mods.RA/CloakPaletteEffect.cs +++ b/OpenRA.Mods.RA/CloakPaletteEffect.cs @@ -43,9 +43,6 @@ namespace OpenRA.Mods.RA public void TickRender(WorldRenderer wr, Actor self) { - if (wr.world.Paused == World.PauseState.Paused) - return; - t += 0.25f; if (t >= 256) t = 0; } diff --git a/OpenRA.Mods.RA/Effects/TeslaZap.cs b/OpenRA.Mods.RA/Effects/TeslaZap.cs index cfaefbefde..d26d947028 100644 --- a/OpenRA.Mods.RA/Effects/TeslaZap.cs +++ b/OpenRA.Mods.RA/Effects/TeslaZap.cs @@ -21,7 +21,7 @@ namespace OpenRA.Mods.RA.Effects public readonly string Palette = "effect"; public readonly int BrightZaps = 1; 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 diff --git a/OpenRA.Mods.RA/LightPaletteRotator.cs b/OpenRA.Mods.RA/LightPaletteRotator.cs index 0cfecfee7b..1a1ee96d9f 100644 --- a/OpenRA.Mods.RA/LightPaletteRotator.cs +++ b/OpenRA.Mods.RA/LightPaletteRotator.cs @@ -28,9 +28,6 @@ namespace OpenRA.Mods.RA float t = 0; public void TickRender(WorldRenderer wr, Actor self) { - if (wr.world.Paused == World.PauseState.Paused) - return; - t += .5f; } diff --git a/OpenRA.Mods.RA/NukePaletteEffect.cs b/OpenRA.Mods.RA/NukePaletteEffect.cs index e1ddf805d5..537fa6cb65 100644 --- a/OpenRA.Mods.RA/NukePaletteEffect.cs +++ b/OpenRA.Mods.RA/NukePaletteEffect.cs @@ -29,9 +29,6 @@ namespace OpenRA.Mods.RA public void TickRender(WorldRenderer wr, Actor self) { - if (wr.world.Paused == World.PauseState.Paused) - return; - if (remainingFrames > 0) remainingFrames--; } diff --git a/OpenRA.Mods.RA/Render/RenderBuilding.cs b/OpenRA.Mods.RA/Render/RenderBuilding.cs index e30569fbf5..0440578fd4 100755 --- a/OpenRA.Mods.RA/Render/RenderBuilding.cs +++ b/OpenRA.Mods.RA/Render/RenderBuilding.cs @@ -56,9 +56,6 @@ namespace OpenRA.Mods.RA.Render public override void TickRender(WorldRenderer wr, Actor self) { - if (wr.world.Paused == World.PauseState.Paused) - return; - base.TickRender(wr, self); if (buildComplete) diff --git a/OpenRA.Mods.RA/Render/RenderBuildingWall.cs b/OpenRA.Mods.RA/Render/RenderBuildingWall.cs index 62bf58e486..a595d21075 100644 --- a/OpenRA.Mods.RA/Render/RenderBuildingWall.cs +++ b/OpenRA.Mods.RA/Render/RenderBuildingWall.cs @@ -47,9 +47,6 @@ namespace OpenRA.Mods.RA.Render public override void TickRender(WorldRenderer wr, Actor self) { - if (wr.world.Paused == World.PauseState.Paused) - return; - base.TickRender(wr, self); } diff --git a/OpenRA.Mods.RA/Render/RenderBuildingWarFactory.cs b/OpenRA.Mods.RA/Render/RenderBuildingWarFactory.cs index 828fba2229..1638821b87 100755 --- a/OpenRA.Mods.RA/Render/RenderBuildingWarFactory.cs +++ b/OpenRA.Mods.RA/Render/RenderBuildingWarFactory.cs @@ -64,11 +64,7 @@ namespace OpenRA.Mods.RA.Render public override void TickRender(WorldRenderer wr, Actor self) { - if (wr.world.Paused == World.PauseState.Paused) - return; - base.TickRender(wr, self); - if (isOpen && !self.World.ActorMap.GetUnitsAt(openExit).Any( a => a != self )) { isOpen = false; diff --git a/OpenRA.Mods.RA/Render/RenderDisguise.cs b/OpenRA.Mods.RA/Render/RenderDisguise.cs index a1d35fa16c..723820bc38 100644 --- a/OpenRA.Mods.RA/Render/RenderDisguise.cs +++ b/OpenRA.Mods.RA/Render/RenderDisguise.cs @@ -34,9 +34,6 @@ namespace OpenRA.Mods.RA.Render public override void TickRender(WorldRenderer wr, Actor self) { - if (wr.world.Paused == World.PauseState.Paused) - return; - if (disguise.AsSprite != intendedSprite) { intendedSprite = disguise.AsSprite; diff --git a/OpenRA.Mods.RA/Render/RenderHarvester.cs b/OpenRA.Mods.RA/Render/RenderHarvester.cs index 9a048aa776..1b9a5d7d3d 100644 --- a/OpenRA.Mods.RA/Render/RenderHarvester.cs +++ b/OpenRA.Mods.RA/Render/RenderHarvester.cs @@ -37,9 +37,6 @@ namespace OpenRA.Mods.RA.Render 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 desiredImage = info.ImagesByFullness[desiredState]; diff --git a/OpenRA.Mods.RA/Render/RenderInfantry.cs b/OpenRA.Mods.RA/Render/RenderInfantry.cs index 835c81ce17..9e59c1522a 100644 --- a/OpenRA.Mods.RA/Render/RenderInfantry.cs +++ b/OpenRA.Mods.RA/Render/RenderInfantry.cs @@ -82,9 +82,6 @@ namespace OpenRA.Mods.RA.Render public override void TickRender(WorldRenderer wr, Actor self) { - if (wr.world.Paused == World.PauseState.Paused) - return; - base.TickRender(wr, self); if ((State == AnimationState.Moving || dirty) && !move.IsMoving) diff --git a/OpenRA.Mods.RA/Render/RenderInfantryPanic.cs b/OpenRA.Mods.RA/Render/RenderInfantryPanic.cs index 8a47624d43..27dc7f7daa 100644 --- a/OpenRA.Mods.RA/Render/RenderInfantryPanic.cs +++ b/OpenRA.Mods.RA/Render/RenderInfantryPanic.cs @@ -46,9 +46,6 @@ namespace OpenRA.Mods.RA.Render public override void TickRender(WorldRenderer wr, Actor self) { - if (wr.world.Paused == World.PauseState.Paused) - return; - if (wasPanic != sc.Panicking) dirty = true; diff --git a/OpenRA.Mods.RA/Render/RenderLandingCraft.cs b/OpenRA.Mods.RA/Render/RenderLandingCraft.cs index 50b6e9b55d..f3f2866ac7 100644 --- a/OpenRA.Mods.RA/Render/RenderLandingCraft.cs +++ b/OpenRA.Mods.RA/Render/RenderLandingCraft.cs @@ -73,9 +73,6 @@ namespace OpenRA.Mods.RA.Render public override void TickRender(WorldRenderer wr, Actor self) { - if (wr.world.Paused == World.PauseState.Paused) - return; - if (ShouldBeOpen()) Open(); else diff --git a/OpenRA.Mods.RA/Render/RenderUnitReload.cs b/OpenRA.Mods.RA/Render/RenderUnitReload.cs index b9c817fa81..4e56c862bd 100755 --- a/OpenRA.Mods.RA/Render/RenderUnitReload.cs +++ b/OpenRA.Mods.RA/Render/RenderUnitReload.cs @@ -37,9 +37,6 @@ namespace OpenRA.Mods.RA.Render 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"); if (sequence != DefaultAnimation.CurrentSequence.Name) DefaultAnimation.ReplaceAnim(sequence); diff --git a/OpenRA.Mods.RA/Render/WithMakeAnimation.cs b/OpenRA.Mods.RA/Render/WithMakeAnimation.cs index dd8fd06b5d..545185d5ed 100644 --- a/OpenRA.Mods.RA/Render/WithMakeAnimation.cs +++ b/OpenRA.Mods.RA/Render/WithMakeAnimation.cs @@ -41,9 +41,6 @@ namespace OpenRA.Mods.RA.Render public void TickRender(WorldRenderer wr, Actor self) { - if (wr.world.Paused == World.PauseState.Paused) - return; - if (self.IsDead() || buildComplete) return; diff --git a/OpenRA.Mods.RA/Render/WithMuzzleFlash.cs b/OpenRA.Mods.RA/Render/WithMuzzleFlash.cs index 50984d7d1b..dcc11f6d2d 100644 --- a/OpenRA.Mods.RA/Render/WithMuzzleFlash.cs +++ b/OpenRA.Mods.RA/Render/WithMuzzleFlash.cs @@ -97,9 +97,6 @@ namespace OpenRA.Mods.RA.Render public void TickRender(WorldRenderer wr, Actor self) { - if (wr.world.Paused == World.PauseState.Paused) - return; - foreach (var a in anims.Values) a.Animation.Tick(); } diff --git a/OpenRA.Mods.RA/TakeCover.cs b/OpenRA.Mods.RA/TakeCover.cs index 57f47e60b7..2c9e847380 100644 --- a/OpenRA.Mods.RA/TakeCover.cs +++ b/OpenRA.Mods.RA/TakeCover.cs @@ -53,7 +53,6 @@ namespace OpenRA.Mods.RA public override void Tick(Actor self) { base.Tick(self); - if (IsProne && --remainingProneTime == 0) LocalOffset = WVec.Zero; } @@ -102,14 +101,10 @@ namespace OpenRA.Mods.RA public override void TickRender(WorldRenderer wr, Actor self) { - if (wr.world.Paused == World.PauseState.Paused) - return; - if (wasProne != tc.IsProne) dirty = true; wasProne = tc.IsProne; - base.TickRender(wr, self); } } diff --git a/OpenRA.Mods.RA/WaterPaletteRotation.cs b/OpenRA.Mods.RA/WaterPaletteRotation.cs index 1eefcc87e2..1e37052c9d 100644 --- a/OpenRA.Mods.RA/WaterPaletteRotation.cs +++ b/OpenRA.Mods.RA/WaterPaletteRotation.cs @@ -36,13 +36,7 @@ namespace OpenRA.Mods.RA this.info = info; } - public void TickRender(WorldRenderer wr, Actor self) - { - if (wr.world.Paused == World.PauseState.Paused) - return; - - t += .25f; - } + public void TickRender(WorldRenderer wr, Actor self) { t += .25f; } uint[] temp = new uint[7]; /* allocating this on the fly actually hurts our profile */