actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

remove TWEEN_SMOOTH. Use Bezier.

Browse Source
This commit is contained in:
Glenn Maynard
2006-01-23 06:53:11 +00:00
parent e83e7acce5
commit 3da3825e20
3 changed files with 0 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/Actor.cpp
-2
View File
@@ -1328,7 +1328,6 @@ public:
static int linear( T* p, lua_State *L ) { p->BeginTweening(FArg(1),TWEEN_LINEAR); return 0; } static int linear( T* p, lua_State *L ) { p->BeginTweening(FArg(1),TWEEN_LINEAR); return 0; }
static int accelerate( T* p, lua_State *L ) { p->BeginTweening(FArg(1),TWEEN_ACCELERATE); return 0; } static int accelerate( T* p, lua_State *L ) { p->BeginTweening(FArg(1),TWEEN_ACCELERATE); return 0; }
static int decelerate( T* p, lua_State *L ) { p->BeginTweening(FArg(1),TWEEN_DECELERATE); return 0; } static int decelerate( T* p, lua_State *L ) { p->BeginTweening(FArg(1),TWEEN_DECELERATE); return 0; }
static int smooth( T* p, lua_State *L ) { p->BeginTweening(FArg(1),TWEEN_SMOOTH); return 0; }
static int spring( T* p, lua_State *L ) { p->BeginTweening(FArg(1),TWEEN_SPRING); return 0; } static int spring( T* p, lua_State *L ) { p->BeginTweening(FArg(1),TWEEN_SPRING); return 0; }
static int tween( T* p, lua_State *L ) static int tween( T* p, lua_State *L )
{ {
@@ -1469,7 +1468,6 @@ public:
ADD_METHOD( linear ); ADD_METHOD( linear );
ADD_METHOD( accelerate ); ADD_METHOD( accelerate );
ADD_METHOD( decelerate ); ADD_METHOD( decelerate );
ADD_METHOD( smooth );
ADD_METHOD( spring ); ADD_METHOD( spring );
ADD_METHOD( tween ); ADD_METHOD( tween );
ADD_METHOD( stoptweening ); ADD_METHOD( stoptweening );
stepmania/src/Tween.cpp
-29
View File
@@ -9,7 +9,6 @@ static const char *TweenTypeNames[] = {
"Linear", "Linear",
"Accelerate", "Accelerate",
"Decelerate", "Decelerate",
"Smooth",
"Spring", "Spring",
"Bezier" "Bezier"
}; };
@@ -41,33 +40,6 @@ struct TweenDecelerate: public ITween
float Tween( float f ) const { return 1 - (1-f) * (1-f); } float Tween( float f ) const { return 1 - (1-f) * (1-f); }
ITween *Copy() const { return new TweenDecelerate(*this); } ITween *Copy() const { return new TweenDecelerate(*this); }
}; };
struct TweenSmooth: public ITween
{
float Tween( float f ) const
{
/* Accelerate, reaching full speed at fShift, then decelerate the rest of
* the way. fShift = 1 degrades to TWEEN_ACCELERATE. fShift = 0 degrades
* to TWEEN_DECELERATE. (This is a rough approximation of a sigmoid.) */
const float fShift = 0.5f;
if( f < fShift )
{
f = SCALE( f, 0.0f, fShift, 0.0f, 1.0f );
f = f * f;
f = SCALE( f, 0.0f, 1.0f, 0.0f, fShift );
}
else
{
f = SCALE( f, fShift, 1.0f, 0.0f, 1.0f );
f = 1 - (1-f) * (1-f);
f = SCALE( f, 0.0f, 1.0f, fShift, 1.0f );
}
return f;
}
ITween *Copy() const { return new TweenSmooth(*this); }
};
struct TweenSpring: public ITween struct TweenSpring: public ITween
{ {
float Tween( float f ) const { return 1 - RageFastCos( f*PI*2.5f )/(1+f*3); } float Tween( float f ) const { return 1 - RageFastCos( f*PI*2.5f )/(1+f*3); }
@@ -120,7 +92,6 @@ ITween *ITween::CreateFromType( TweenType tt )
case TWEEN_LINEAR: return new TweenLinear; case TWEEN_LINEAR: return new TweenLinear;
case TWEEN_ACCELERATE: return new TweenAccelerate; case TWEEN_ACCELERATE: return new TweenAccelerate;
case TWEEN_DECELERATE: return new TweenDecelerate; case TWEEN_DECELERATE: return new TweenDecelerate;
case TWEEN_SMOOTH: return new TweenSmooth;
/* /*
* These may actually be faster than InterpolateBounceBegin/InterpolateBounceEnd, since * These may actually be faster than InterpolateBounceBegin/InterpolateBounceEnd, since
stepmania/src/Tween.h
-1
View File
@@ -9,7 +9,6 @@ enum TweenType
TWEEN_LINEAR, TWEEN_LINEAR,
TWEEN_ACCELERATE, TWEEN_ACCELERATE,
TWEEN_DECELERATE, TWEEN_DECELERATE,
TWEEN_SMOOTH,
TWEEN_SPRING, TWEEN_SPRING,
TWEEN_BEZIER, TWEEN_BEZIER,
NUM_TweenType NUM_TweenType