WIP: port alien swarm and extend engine for asw

This commit is contained in:
nillerusr
2023-10-03 20:02:58 +03:00
parent 7d3c0d8b5a
commit 8322130890
617 changed files with 161164 additions and 220 deletions
+13 -13
View File
@@ -787,9 +787,9 @@ float CFlexAnimationTrack::GetFracIntensity( float time, int type )
prev = MAX( -1, prev );
next = MIN( next, rampCount );
bool clamp[ 2 ];
CExpressionSample *esPre = GetBoundedSample( prev, clamp[ 0 ], type );
CExpressionSample *esNext = GetBoundedSample( next, clamp[ 1 ], type );
bool bClamp[ 2 ];
CExpressionSample *esPre = GetBoundedSample( prev, bClamp[ 0 ], type );
CExpressionSample *esNext = GetBoundedSample( next, bClamp[ 1 ], type );
float dt = esEnd->time - esStart->time;
@@ -1654,9 +1654,9 @@ float CCurveData::GetIntensity( ICurveDataAccessor *data, float time )
prev = MAX( -1, prev );
next = MIN( next, rampCount );
bool clamp[ 2 ];
CExpressionSample *esPre = GetBoundedSample( data, prev, clamp[ 0 ] );
CExpressionSample *esNext = GetBoundedSample( data, next, clamp[ 1 ] );
bool bClamp[ 2 ];
CExpressionSample *esPre = GetBoundedSample( data, prev, bClamp[ 0 ] );
CExpressionSample *esNext = GetBoundedSample( data, next, bClamp[ 1 ] );
float dt = esEnd->time - esStart->time;
@@ -1665,12 +1665,12 @@ float CCurveData::GetIntensity( ICurveDataAccessor *data, float time )
Vector vEnd( esEnd->time, esEnd->value, 0 );
Vector vNext( esNext->time, esNext->value, 0 );
if ( clamp[ 0 ] )
if ( bClamp[ 0 ] )
{
vPre.x = vStart.x;
}
if ( clamp[ 1 ] )
if ( bClamp[ 1 ] )
{
vNext.x = vEnd.x;
}
@@ -1836,9 +1836,9 @@ float CCurveData::GetIntensityArea( ICurveDataAccessor *data, float time )
prev = MAX( -1, prev );
next = MIN( next, rampCount );
bool clamp[ 2 ];
CExpressionSample *esPre = GetBoundedSample( data, prev, clamp[ 0 ] );
CExpressionSample *esNext = GetBoundedSample( data, next, clamp[ 1 ] );
bool bClamp[ 2 ];
CExpressionSample *esPre = GetBoundedSample( data, prev, bClamp[ 0 ] );
CExpressionSample *esNext = GetBoundedSample( data, next, bClamp[ 1 ] );
float dt = esEnd->time - esStart->time;
@@ -1847,12 +1847,12 @@ float CCurveData::GetIntensityArea( ICurveDataAccessor *data, float time )
Vector vEnd( esEnd->time, esEnd->value, 0 );
Vector vNext( esNext->time, esNext->value, 0 );
if ( clamp[ 0 ] )
if ( bClamp[ 0 ] )
{
vPre.x = vStart.x;
}
if ( clamp[ 1 ] )
if ( bClamp[ 1 ] )
{
vNext.x = vEnd.x;
}