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

Revert "use TickRender() for RenderSprites and PaletteModifier"

Browse Source 
This reverts commit 87fd576b26.
This commit is contained in:
Paul Chote
2014-07-08 10:44:36 +12:00
parent 802b6a652c
commit 5650d5fc98
25 changed files with 48 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenRA.Mods.RA/Render/RenderBuilding.cs
View File

@@ -54,9 +54,9 @@ namespace OpenRA.Mods.RA.Render
self.Trait<IBodyOrientation>().SetAutodetectedFacings(DefaultAnimation.CurrentSequence.Facings);
}
public override void TickRender(WorldRenderer wr, Actor self)
public override void Tick(Actor self)
{
base.TickRender(wr, self);
base.Tick(self);
if (buildComplete)
return;

10
OpenRA.Mods.RA/Render/RenderBuildingWall.cs
View File

@@ -9,7 +9,6 @@
#endregion
using System.Linq;
using OpenRA.Graphics;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Render
@@ -22,7 +21,7 @@ namespace OpenRA.Mods.RA.Render
public override object Create(ActorInitializer init) { return new RenderBuildingWall(init, this); }
}
class RenderBuildingWall : RenderBuilding, INotifyAddedToWorld, INotifyRemovedFromWorld, ITick
class RenderBuildingWall : RenderBuilding, INotifyAddedToWorld, INotifyRemovedFromWorld
{
readonly RenderBuildingWallInfo info;
int adjacent = 0;
@@ -45,13 +44,10 @@ namespace OpenRA.Mods.RA.Render
DefaultAnimation.PlayFetchIndex(NormalizeSequence(DefaultAnimation, e.DamageState, info.Sequence), () => adjacent);
}
public override void TickRender(WorldRenderer wr, Actor self)
public override void Tick(Actor self)
{
base.TickRender(wr, self);
}
base.Tick(self);
public void Tick(Actor self)
{
if (!dirty)
return;

6
OpenRA.Mods.RA/Render/RenderBuildingWarFactory.cs
View File

@@ -36,7 +36,7 @@ namespace OpenRA.Mods.RA.Render
}
}
class RenderBuildingWarFactory : RenderBuilding, INotifyBuildComplete, ITickRender, INotifyProduction, INotifySold, ISync
class RenderBuildingWarFactory : RenderBuilding, INotifyBuildComplete, ITick, INotifyProduction, INotifySold, ISync
{
Animation roof;
[Sync] bool isOpen;
@@ -62,9 +62,9 @@ namespace OpenRA.Mods.RA.Render
buildComplete = true;
}
public override void TickRender(WorldRenderer wr, Actor self)
public override void Tick(Actor self)
{
base.TickRender(wr, self);
base.Tick(self);
if (isOpen && !self.World.ActorMap.GetUnitsAt(openExit).Any( a => a != self ))
{
isOpen = false;

5
OpenRA.Mods.RA/Render/RenderDisguise.cs
View File

@@ -9,7 +9,6 @@
#endregion
using OpenRA.Traits;
using OpenRA.Graphics;
namespace OpenRA.Mods.RA.Render
{
@@ -32,7 +31,7 @@ namespace OpenRA.Mods.RA.Render
intendedSprite = disguise.AsSprite;
}
public override void TickRender(WorldRenderer wr, Actor self)
public override void Tick(Actor self)
{
if (disguise.AsSprite != intendedSprite)
{
@@ -41,7 +40,7 @@ namespace OpenRA.Mods.RA.Render
UpdatePalette();
}
base.TickRender(wr, self);
base.Tick(self);
}
}
}

4
OpenRA.Mods.RA/Render/RenderHarvester.cs
View File

@@ -35,7 +35,7 @@ namespace OpenRA.Mods.RA.Render
new Animation(self.World, image);
}
public override void TickRender(WorldRenderer wr, Actor self)
public override void Tick(Actor self)
{
var desiredState = harv.Fullness * (info.ImagesByFullness.Length - 1) / 100;
var desiredImage = info.ImagesByFullness[desiredState];
@@ -43,7 +43,7 @@ namespace OpenRA.Mods.RA.Render
if (DefaultAnimation.Name != desiredImage)
DefaultAnimation.ChangeImage(desiredImage, "idle");
base.TickRender(wr, self);
base.Tick(self);
}
public void Harvested(Actor self, ResourceType resource)

7
OpenRA.Mods.RA/Render/RenderInfantry.cs
View File

@@ -1,6 +1,6 @@
#region Copyright & License Information
/*
* Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
* 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,
@@ -8,7 +8,6 @@
*/
#endregion
using OpenRA.Graphics;
using OpenRA.Mods.RA.Effects;
using OpenRA.Traits;
@@ -80,9 +79,9 @@ namespace OpenRA.Mods.RA.Render
Attacking(self, target);
}
public override void TickRender(WorldRenderer wr, Actor self)
public override void Tick(Actor self)
{
base.TickRender(wr, self);
base.Tick(self);
if ((State == AnimationState.Moving || dirty) && !move.IsMoving)
{

7
OpenRA.Mods.RA/Render/RenderInfantryPanic.cs
View File

@@ -1,6 +1,6 @@
#region Copyright & License Information
/*
* Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
* Copyright 2007-2011 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,
@@ -8,7 +8,6 @@
*/
#endregion
using OpenRA.Graphics;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Render
@@ -44,13 +43,13 @@ namespace OpenRA.Mods.RA.Render
return base.AllowIdleAnimation(self) && !sc.Panicking;
}
public override void TickRender(WorldRenderer wr, Actor self)
public override void Tick (Actor self)
{
if (wasPanic != sc.Panicking)
dirty = true;
wasPanic = sc.Panicking;
base.TickRender(wr, self);
base.Tick(self);
}
}
}

7
OpenRA.Mods.RA/Render/RenderLandingCraft.cs
View File

@@ -9,7 +9,6 @@
#endregion
using System.Linq;
using OpenRA.Graphics;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Render
@@ -42,7 +41,7 @@ namespace OpenRA.Mods.RA.Render
public bool ShouldBeOpen()
{
if (self.CenterPosition.Z > 0 || move.IsMoving || cargo.CurrentAdjacentCells == null)
if (self.CenterPosition.Z > 0 || move.IsMoving)
return false;
return cargo.CurrentAdjacentCells.Any(c => self.World.Map.Contains(c)
@@ -71,14 +70,14 @@ namespace OpenRA.Mods.RA.Render
PlayCustomAnimBackwards(self, info.OpenAnim, null);
}
public override void TickRender(WorldRenderer wr, Actor self)
public override void Tick(Actor self)
{
if (ShouldBeOpen())
Open();
else
Close();
base.TickRender(wr, self);
base.Tick(self);
}
}
}

5
OpenRA.Mods.RA/Render/RenderUnitReload.cs
View File

@@ -9,7 +9,6 @@
#endregion
using System.Linq;
using OpenRA.Graphics;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Render
@@ -35,13 +34,13 @@ namespace OpenRA.Mods.RA.Render
.Single(a => a.Info.Name == info.Armament);
}
public override void TickRender(WorldRenderer wr, Actor self)
public override void Tick(Actor self)
{
var sequence = (armament.IsReloading ? "empty-" : "") + (attack.IsAttacking ? "aim" : "idle");
if (sequence != DefaultAnimation.CurrentSequence.Name)
DefaultAnimation.ReplaceAnim(sequence);
base.TickRender(wr, self);
base.Tick(self);
}
}
}

4
OpenRA.Mods.RA/Render/WithMakeAnimation.cs
View File

@@ -26,7 +26,7 @@ namespace OpenRA.Mods.RA.Render
public object Create(ActorInitializer init) { return new WithMakeAnimation(init, this); }
}
public class WithMakeAnimation : ITickRender
public class WithMakeAnimation : ITick
{
WithMakeAnimationInfo info;
RenderBuilding building;
@@ -39,7 +39,7 @@ namespace OpenRA.Mods.RA.Render
buildComplete = init.Contains<SkipMakeAnimsInit>();
}
public void TickRender(WorldRenderer wr, Actor self)
public void Tick(Actor self)
{
if (self.IsDead() || buildComplete)
return;

4
OpenRA.Mods.RA/Render/WithMuzzleFlash.cs
View File

@@ -25,7 +25,7 @@ namespace OpenRA.Mods.RA.Render
public object Create(ActorInitializer init) { return new WithMuzzleFlash(init.self, this); }
}
class WithMuzzleFlash : INotifyAttack, IRender, ITickRender
class WithMuzzleFlash : INotifyAttack, IRender, ITick
{
Dictionary<Barrel, bool> visible = new Dictionary<Barrel, bool>();
Dictionary<Barrel, AnimationWithOffset> anims = new Dictionary<Barrel, AnimationWithOffset>();
@@ -95,7 +95,7 @@ namespace OpenRA.Mods.RA.Render
}
}
public void TickRender(WorldRenderer wr, Actor self)
public void Tick(Actor self)
{
foreach (var a in anims.Values)
a.Animation.Tick();