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

changes facing (and desireFacing) on Mobile and on Turreted. range is now 0..255

Browse Source
This commit is contained in:
Bob
2009-10-19 23:45:14 +13:00
parent 451fdc1615
commit a7ce0f97d1
14 changed files with 162 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenRa.Game/MoveOrder.cs
View File

@@ -25,7 +25,9 @@ namespace OpenRa.Game
if (leftMouseButton) return;
if (game.LocalPlayer == Unit.Owner)
game.PlaySound("ackno.r00", false);
Unit.traits.Get<Traits.Mobile>().destination = Destination;
var mobile = Unit.traits.Get<Traits.Mobile>();
mobile.destination = Destination;
mobile.desiredFacing = null;
}
}

1
OpenRa.Game/OpenRa.Game.csproj
View File

@@ -140,6 +140,7 @@
<Compile Include="Traits\TraitsInterfaces.cs" />
<Compile Include="Traits\Tree.cs" />
<Compile Include="Traits\Turreted.cs" />
<Compile Include="Traits\Util.cs" />
<Compile Include="UiOverlay.cs" />
<Compile Include="Graphics\UnitSheetBuilder.cs" />
<Compile Include="Graphics\Util.cs" />

2
OpenRa.Game/Traits/AttackTurreted.cs
View File

@@ -30,7 +30,7 @@ namespace OpenRa.Game.Traits
var mobile = self.traits.Get<Mobile>();
var turreted = self.traits.Get<Turreted>();
turreted.desiredFacing = mobile.GetFacing( target.Location - self.Location );
turreted.desiredFacing = Util.GetFacing( target.CenterLocation - self.CenterLocation, turreted.turretFacing );
if( turreted.desiredFacing != turreted.turretFacing )
return;

18
OpenRa.Game/Traits/McvDeploy.cs
View File

@@ -15,6 +15,7 @@ namespace OpenRa.Game.Traits
public Order Order(Actor self, Game game, int2 xy)
{
DeployLocation = null;
// TODO: check that there's enough space at the destination.
if( xy == self.Location )
return new DeployMcvOrder( self, xy );
@@ -24,24 +25,21 @@ namespace OpenRa.Game.Traits
public void Tick(Actor self, Game game, int dt)
{
var mobile = self.traits.Get<Mobile>();
if( self.Location != DeployLocation )
return;
var mobile = self.traits.Get<Mobile>();
mobile.desiredFacing = 96;
if( mobile.moveFraction < mobile.moveFractionTotal )
return;
if( self.Location != DeployLocation )
{
DeployLocation = null;
return;
}
if (mobile.Turn(12))
if( mobile.facing != mobile.desiredFacing )
return;
game.world.AddFrameEndTask(_ =>
{
game.world.Remove(self);
game.world.Add(new Actor("fact", self.Location - new int2(1, 1), self.Owner));
game.world.Remove(self);
game.world.Add(new Actor("fact", self.Location - new int2(1, 1), self.Owner));
});
}
}

52
OpenRa.Game/Traits/Mobile.cs
View File

@@ -15,6 +15,7 @@ namespace OpenRa.Game.Traits
public int2 toCell { get { return self.Location; } }
public int moveFraction, moveFractionTotal;
public int facing;
public int? desiredFacing;
public Mobile(Actor self)
{
@@ -22,41 +23,6 @@ namespace OpenRa.Game.Traits
fromCell = destination = self.Location;
}
public bool Turn(int desiredFacing)
{
if (facing == desiredFacing)
return false;
int df = (desiredFacing - facing + 32) % 32;
facing = (facing + (df > 16 ? 31 : 1)) % 32;
return true;
}
static float2[] fvecs = Util.MakeArray<float2>(32,
i => -float2.FromAngle(i / 16.0f * (float)Math.PI) * new float2(1f, 1.3f));
// TODO: move this somewhere more appropriate, now that AttackTurreted uses it.
public int GetFacing(float2 d)
{
if (float2.WithinEpsilon(d, float2.Zero, 0.001f))
return facing;
int highest = -1;
float highestDot = -1.0f;
for (int i = 0; i < fvecs.Length; i++)
{
float dot = float2.Dot(fvecs[i], d);
if (dot > highestDot)
{
highestDot = dot;
highest = i;
}
}
return highest;
}
void UpdateCenterLocation()
{
float fraction = (moveFraction > 0) ? (float)moveFraction / moveFractionTotal : 0f;
@@ -71,13 +37,19 @@ namespace OpenRa.Game.Traits
void Move(Actor self, Game game, int dt)
{
if (fromCell != toCell)
{
if (Turn(GetFacing(toCell - fromCell)))
return;
if( fromCell != toCell )
desiredFacing = Util.GetFacing( toCell - fromCell, facing );
moveFraction += dt * ((UnitInfo.MobileInfo)self.unitInfo).Speed;
if( desiredFacing != null && desiredFacing != facing )
{
Util.TickFacing( ref facing, desiredFacing.Value, self.unitInfo.ROT );
return;
}
desiredFacing = null;
if( fromCell != toCell )
moveFraction += dt * ((UnitInfo.MobileInfo)self.unitInfo).Speed;
if (moveFraction < moveFractionTotal)
return;

4
OpenRa.Game/Traits/RenderBuildingTurreted.cs
View File

@@ -10,8 +10,8 @@ namespace OpenRa.Game.Traits
public RenderBuildingTurreted(Actor self)
: base(self)
{
anim.PlayThen("make", () => anim.PlayFetchIndex("idle",
() => self.traits.Get<Turreted>().turretFacing));
anim.PlayThen( "make", () => anim.PlayFetchIndex( "idle",
() => self.traits.Get<Turreted>().turretFacing / 8 ) );
}
}
}

2
OpenRa.Game/Traits/RenderUnit.cs
View File

@@ -12,7 +12,7 @@ namespace OpenRa.Game.Traits
public RenderUnit(Actor self)
: base(self)
{
anim.PlayFetchIndex("idle", () => self.traits.Get<Mobile>().facing);
anim.PlayFetchIndex("idle", () => self.traits.Get<Mobile>().facing / 8);
}
protected static Pair<Sprite, float2> Centered(Sprite s, float2 location)

2
OpenRa.Game/Traits/RenderUnitTurreted.cs
View File

@@ -15,7 +15,7 @@ namespace OpenRa.Game.Traits
: base(self)
{
turretAnim = new Animation(self.unitInfo.Name);
turretAnim.PlayFetchIndex("turret", () => self.traits.Get<Turreted>().turretFacing);
turretAnim.PlayFetchIndex("turret", () => self.traits.Get<Turreted>().turretFacing / 8);
}
public override IEnumerable<Pair<Sprite, float2>> Render(Actor self)

12
OpenRa.Game/Traits/Turreted.cs
View File

@@ -14,21 +14,13 @@ namespace OpenRa.Game.Traits
{
}
public void Tick(Actor self, Game game, int dt)
public void Tick( Actor self, Game game, int dt )
{
// TODO: desiredFacing should follow the base unit's facing only when not in combat.
// also, we want to be able to use this for GUN; avoid referencing Mobile.
var df = desiredFacing ?? self.traits.Get<Mobile>().facing;
if( turretFacing != desiredFacing )
{
var leftTurn = ( 32 + turretFacing - desiredFacing ) % 32;
var rightTurn = ( 32 + desiredFacing - turretFacing ) % 32;
if( leftTurn > rightTurn )
turretFacing = ( turretFacing + 1 ) % 32;
else
turretFacing = ( turretFacing + 31 ) % 32;
}
Util.TickFacing( ref turretFacing, df, self.unitInfo.ROT );
}
}
}

47
OpenRa.Game/Traits/Util.cs Executable file
View File

@@ -0,0 +1,47 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
namespace OpenRa.Game.Traits
{
static class Util
{
public static void TickFacing( ref int facing, int desiredFacing, int rot )
{
var leftTurn = ( facing - desiredFacing ) & 0xFF;
var rightTurn = ( desiredFacing - facing ) & 0xFF;
if( Math.Min( leftTurn, rightTurn ) < rot )
facing = desiredFacing;
else if( rightTurn < leftTurn )
facing = ( facing + rot ) & 0xFF;
else
facing = ( facing - rot ) & 0xFF;
}
static float2[] fvecs = Graphics.Util.MakeArray<float2>( 32,
i => -float2.FromAngle( i / 16.0f * (float)Math.PI ) * new float2( 1f, 1.3f ) );
public static int GetFacing( float2 d, int currentFacing )
{
if( float2.WithinEpsilon( d, float2.Zero, 0.001f ) )
return currentFacing;
int highest = -1;
float highestDot = -1.0f;
for( int i = 0 ; i < fvecs.Length ; i++ )
{
float dot = float2.Dot( fvecs[ i ], d );
if( dot > highestDot )
{
highestDot = dot;
highest = i;
}
}
return highest * 8;
}
}
}