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

slightly nicer infantry behavior

Browse Source
This commit is contained in:
Chris Forbes
2009-11-01 14:18:58 +13:00
parent a6e39eb320
commit db810105da
3 changed files with 29 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
OpenRa.Game/Graphics/Animation.cs
View File

@@ -43,6 +43,13 @@ namespace OpenRa.Game.Graphics
PlayThen( sequenceName, () => PlayRepeating( sequenceName ) ); PlayThen( sequenceName, () => PlayRepeating( sequenceName ) );
} }
public void PlayRepeatingPreservingPosition(string sequenceName)
{
var f = frame;
PlayThen(sequenceName, () => PlayRepeating(sequenceName));
frame = f % CurrentSequence.Length;
}
public void PlayThen( string sequenceName, Action after ) public void PlayThen( string sequenceName, Action after )
{ {
backwards = false; backwards = false;

1
OpenRa.Game/MainWindow.cs
View File

@@ -64,6 +64,7 @@ namespace OpenRa.Game
Game.world.Add( new Actor( "jeep", Game.map.Offset + new int2( 9, 15 ), Game.players[ 1 ] ) ); Game.world.Add( new Actor( "jeep", Game.map.Offset + new int2( 9, 15 ), Game.players[ 1 ] ) );
Game.world.Add( new Actor( "3tnk", Game.map.Offset + new int2( 12, 7 ), Game.players[ 1 ] ) ); Game.world.Add( new Actor( "3tnk", Game.map.Offset + new int2( 12, 7 ), Game.players[ 1 ] ) );
Game.world.Add(new Actor("ca", Game.map.Offset + new int2(40, 7), Game.players[1])); Game.world.Add(new Actor("ca", Game.map.Offset + new int2(40, 7), Game.players[1]));
Game.world.Add(new Actor("e1", Game.map.Offset + new int2(9, 13), Game.players[1]));
sidebar = new Sidebar(renderer, Game.LocalPlayer); sidebar = new Sidebar(renderer, Game.LocalPlayer);

33
OpenRa.Game/Traits/InfantrySquad.cs
View File

@@ -32,7 +32,7 @@ namespace OpenRa.Game.Traits
{ {
for (int i = 0; i < elements.Count; i++) for (int i = 0; i < elements.Count; i++)
elements[i].Tick( elements[i].Tick(
self.CenterLocation.ToInt2() + elementOffsets[elements.Count][i]); self.CenterLocation.ToInt2() + elementOffsets[elements.Count][i], self);
} }
public IEnumerable<Pair<Sprite, float2>> Render(Actor self) public IEnumerable<Pair<Sprite, float2>> Render(Actor self)
@@ -49,18 +49,27 @@ namespace OpenRa.Game.Traits
public float2 location; public float2 location;
string name; string name;
int facing = 128; int facing = 128;
float speed;
string currentSequence; string currentSequence;
static int QuantizeFacingNicely(int facing, int n)
{
var step = 256 / n;
var a = facing;
return a / step;
}
void PlaySequence(string seq, bool isFacing) void PlaySequence(string seq, bool isFacing)
{ {
if (currentSequence == seq) return; if (currentSequence == seq) return;
currentSequence = seq;
if (isFacing) if (isFacing)
anim.PlayFetchIndex(seq, () => facing / (256 / anim.CurrentSequence.Length)); anim.PlayFetchIndex(seq, () => QuantizeFacingNicely(facing, anim.CurrentSequence.Length));
else else
anim.PlayRepeating(seq); anim.PlayRepeatingPreservingPosition(seq);
currentSequence = seq;
} }
public Soldier(string type, int2 initialLocation) public Soldier(string type, int2 initialLocation)
@@ -70,25 +79,25 @@ namespace OpenRa.Game.Traits
anim.PlayFetchIndex("stand", anim.PlayFetchIndex("stand",
() => facing / (256 / anim.CurrentSequence.Length) ); () => facing / (256 / anim.CurrentSequence.Length) );
location = initialLocation; location = initialLocation;
speed = ((UnitInfo.InfantryInfo)Rules.UnitInfo[name]).Speed / 2;
} }
public void Tick( int2 desiredLocation ) public void Tick( int2 desiredLocation, Actor self )
{ {
anim.Tick(); anim.Tick();
var d = (desiredLocation - location); var d = (desiredLocation - location);
var speed = ((UnitInfo.InfantryInfo)Rules.UnitInfo[name]).Speed / 2;
facing = Util.GetFacing(d, facing); facing = self.traits.Get<Mobile>().facing;
if (float2.WithinEpsilon(d, float2.Zero, .1f)) if (float2.WithinEpsilon(d, float2.Zero, .1f))
PlaySequence("stand", true); PlaySequence("stand", true);
else else
PlaySequence("run-" + (facing / 32), false); PlaySequence("run-" + QuantizeFacingNicely(facing, 8), false);
if (d.Length > speed) if (d.Length <= speed)
d = (d.Length / speed) * d; location = desiredLocation;
else
location += d; location += (speed / d.Length) * d;
} }
} }
} }