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

smooth unit-movement. Doesn't look right yet, but it's getting there.

Browse Source
This commit is contained in:
Bob
2009-10-24 18:20:58 +13:00
parent 06e6d50735
commit d66475edcb
3 changed files with 107 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -87,7 +87,8 @@ namespace OpenRa.Game.Traits
List<int2> path;
int moveFraction, moveFractionTotal;
float2 from, to;
float2 from, to;
int fromFacing, toFacing;
Action<Actor, Mobile> OnComplete;
@@ -129,28 +130,41 @@ namespace OpenRa.Game.Traits
path.RemoveAt( path.Count - 1 );
moveFractionTotal = ( dir.X != 0 && dir.Y != 0 ) ? 35 : 25;
from = CenterOfCell( mobile.fromCell );
to = BetweenCells( mobile.fromCell, mobile.toCell );
to = BetweenCells( mobile.fromCell, mobile.toCell );
CalculateMoveFraction();
fromFacing = mobile.facing;
toFacing = mobile.facing;
OnComplete = OnCompleteFirstHalf;
}
mobile.currentAction.Tick( self, mobile );
}
}
void TickMove( Actor self, Mobile mobile )
{
moveFraction += ( self.unitInfo as UnitInfo.MobileInfo ).Speed;
UpdateCenterLocation( self, (float)moveFraction / moveFractionTotal, from, to );
UpdateCenterLocation( self, mobile, (float)moveFraction / moveFractionTotal );
if( moveFraction >= moveFractionTotal )
{
moveFraction -= moveFractionTotal;
OnComplete( self, mobile );
mobile.fromCell = mobile.toCell;
//mobile.fromCell = mobile.toCell;
}
return;
}
static void UpdateCenterLocation( Actor self, float frac, float2 from, float2 to )
{
self.CenterLocation = float2.Lerp( from, to, frac );
}
void UpdateCenterLocation( Actor self, Mobile mobile, float frac )
{
self.CenterLocation = float2.Lerp( from, to, frac );
if( moveFraction >= moveFractionTotal )
mobile.facing = toFacing;
else
mobile.facing = ( fromFacing + ( toFacing - fromFacing ) * moveFraction / moveFractionTotal ) & 0xFF;
}
void CalculateMoveFraction()
{
var d = to - from;
moveFractionTotal = (int)Math.Sqrt( d.X * d.X + d.Y * d.Y ) * (25 / 6);
}
static float2 CenterOfCell( int2 loc )
@@ -164,17 +178,38 @@ namespace OpenRa.Game.Traits
}
void OnCompleteFirstHalf( Actor self, Mobile mobile )
{
from = BetweenCells( mobile.fromCell, mobile.toCell );
to = CenterOfCell( mobile.toCell );
OnComplete = OnCompleteSecondHalf;
{
if( path.Count > 0 )
{
var nextCell = path[ path.Count - 1 ];
if( ( nextCell - mobile.toCell ) != ( mobile.toCell - mobile.fromCell ) )
{
path.RemoveAt( path.Count - 1 );
from = BetweenCells( mobile.fromCell, mobile.toCell );
to = BetweenCells( mobile.toCell, nextCell );
CalculateMoveFraction();
mobile.fromCell = mobile.toCell;
mobile.toCell = nextCell;
fromFacing = mobile.facing;
toFacing = Util.GetNearestFacing( fromFacing, Util.GetFacing( mobile.toCell-mobile.fromCell, fromFacing ) );
OnComplete = OnCompleteFirstHalf;
return;
}
}
from = BetweenCells( mobile.fromCell, mobile.toCell );
to = CenterOfCell( mobile.toCell );
CalculateMoveFraction();
fromFacing = toFacing = mobile.facing;
OnComplete = OnCompleteSecondHalf;
mobile.fromCell = mobile.toCell;
}
void OnCompleteSecondHalf( Actor self, Mobile mobile )
{
{
moveFractionTotal = 0;
self.CenterLocation = CenterOfCell( mobile.toCell );
OnComplete = null;
OnComplete = null;
mobile.fromCell = mobile.toCell;
}
}
}