From 313359c2d7d91e69ac299e773603ed51645d59f4 Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Wed, 4 Sep 2002 21:53:43 +0000
Subject: [PATCH] bump tween update into a separate function

---
 stepmania/src/Actor.cpp | 109 +++++++++++++++++++++-------------------
 stepmania/src/Actor.h   |   4 ++
 2 files changed, 60 insertions(+), 53 deletions(-)

diff --git a/stepmania/src/Actor.cpp b/stepmania/src/Actor.cpp
index 3e83808518..7da70cdce0 100644
--- a/stepmania/src/Actor.cpp
+++ b/stepmania/src/Actor.cpp
@@ -141,6 +141,61 @@ void Actor::EndDraw()
 	DISPLAY->PopMatrix();
 }
 
+void Actor::UpdateTweening( float fDeltaTime )
+{
+	// update tweening
+	if( m_iNumTweenStates == 0 )
+		return;
+
+	// we are performing a tween
+	TweenState &TS = m_TweenStates[0];		// earliest tween
+	TweenInfo  &TI = m_TweenInfo[0];		// earliest tween
+
+	if( TI.m_fTimeLeftInTween == TI.m_fTweenTime )	// we are just beginning this tween
+	{
+		// set the start position
+		m_start = m_current;
+	}
+	
+	TI.m_fTimeLeftInTween -= fDeltaTime;
+
+	if( TI.m_fTimeLeftInTween <= 0 )	// The tweening is over.  Stop the tweening
+	{
+		m_current = TS;
+		
+		// delete the head tween
+		for( int i=0; i<m_iNumTweenStates-1; i++ )
+		{
+			m_TweenStates[i] = m_TweenStates[i+1];
+            m_TweenInfo[i] = m_TweenInfo[i+1];
+		}
+		m_iNumTweenStates--;
+	}
+	else		// in the middle of tweening.  Recalcute the current position.
+	{
+		const float fPercentThroughTween = 1-(TI.m_fTimeLeftInTween / TI.m_fTweenTime);
+
+		// distort the percentage if appropriate
+		float fPercentAlongPath;
+		switch( TI.m_TweenType )
+		{
+		case TWEEN_LINEAR:		fPercentAlongPath = fPercentThroughTween;														break;
+		case TWEEN_BIAS_BEGIN:	fPercentAlongPath = 1 - (1-fPercentThroughTween) * (1-fPercentThroughTween);					break;
+		case TWEEN_BIAS_END:	fPercentAlongPath = fPercentThroughTween * fPercentThroughTween;								break;
+		case TWEEN_BOUNCE_BEGIN:fPercentAlongPath = 1 - sinf( 1.1f + fPercentThroughTween*(D3DX_PI-1.1f) ) / 0.89f;				break;
+		case TWEEN_BOUNCE_END:	fPercentAlongPath = sinf( 1.1f + (1-fPercentThroughTween)*(D3DX_PI-1.1f) ) / 0.89f;				break;
+		case TWEEN_SPRING:		fPercentAlongPath = 1 - cosf( fPercentThroughTween*D3DX_PI*2.5f )/(1+fPercentThroughTween*3);	break;
+		default:	ASSERT(0);
+		}
+
+		m_current.pos			= m_start.pos	  + (TS.pos		 - m_start.pos	   )*fPercentAlongPath;
+		m_current.scale			= m_start.scale	  + (TS.scale	 - m_start.scale   )*fPercentAlongPath;
+		m_current.rotation		= m_start.rotation+ (TS.rotation - m_start.rotation)*fPercentAlongPath;
+		for(int i=0; i<4; i++) 
+			m_current.diffuse[i]= m_start.diffuse[i]*(1.0f-fPercentAlongPath) + TS.diffuse[i]*(fPercentAlongPath);
+		m_current.glow			= m_start.glow      *(1.0f-fPercentAlongPath) + TS.glow      *(fPercentAlongPath);
+	}
+}
 
 void Actor::Update( float fDeltaTime )
 {
@@ -194,59 +249,7 @@ void Actor::Update( float fDeltaTime )
 		break;
 	}
 
-
-	// update tweening
-	if( m_iNumTweenStates > 0 )		// we are performing a tween
-	{
-		TweenState &TS = m_TweenStates[0];		// earliest tween
-		TweenInfo  &TI = m_TweenInfo[0];		// earliest tween
-
-		if( TI.m_fTimeLeftInTween == TI.m_fTweenTime )	// we are just beginning this tween
-		{
-			// set the start position
-			m_start = m_current;
-		}
-		
-		TI.m_fTimeLeftInTween -= fDeltaTime;
-
-		if( TI.m_fTimeLeftInTween <= 0 )	// The tweening is over.  Stop the tweening
-		{
-			m_current = TS;
-			
-			// delete the head tween
-			for( int i=0; i<m_iNumTweenStates-1; i++ )
-			{
-				m_TweenStates[i] = m_TweenStates[i+1];
-                m_TweenInfo[i] = m_TweenInfo[i+1];
-			}
-			m_iNumTweenStates--;
-		}
-		else		// in the middle of tweening.  Recalcute the curent position.
-		{
-			const float fPercentThroughTween = 1-(TI.m_fTimeLeftInTween / TI.m_fTweenTime);
-
-			// distort the percentage if appropriate
-			float fPercentAlongPath;
-			switch( TI.m_TweenType )
-			{
-			case TWEEN_LINEAR:		fPercentAlongPath = fPercentThroughTween;														break;
-			case TWEEN_BIAS_BEGIN:	fPercentAlongPath = 1 - (1-fPercentThroughTween) * (1-fPercentThroughTween);					break;
-			case TWEEN_BIAS_END:	fPercentAlongPath = fPercentThroughTween * fPercentThroughTween;								break;
-			case TWEEN_BOUNCE_BEGIN:fPercentAlongPath = 1 - sinf( 1.1f + fPercentThroughTween*(D3DX_PI-1.1f) ) / 0.89f;				break;
-			case TWEEN_BOUNCE_END:	fPercentAlongPath = sinf( 1.1f + (1-fPercentThroughTween)*(D3DX_PI-1.1f) ) / 0.89f;				break;
-			case TWEEN_SPRING:		fPercentAlongPath = 1 - cosf( fPercentThroughTween*D3DX_PI*2.5f )/(1+fPercentThroughTween*3);	break;
-			default:	ASSERT(0);
-			}
-
-			m_current.pos			= m_start.pos	  + (TS.pos		 - m_start.pos	   )*fPercentAlongPath;
-			m_current.scale			= m_start.scale	  + (TS.scale	 - m_start.scale   )*fPercentAlongPath;
-			m_current.rotation		= m_start.rotation+ (TS.rotation - m_start.rotation)*fPercentAlongPath;
-			for(int i=0; i<4; i++) 
-				m_current.diffuse[i]= m_start.diffuse[i]*(1.0f-fPercentAlongPath) + TS.diffuse[i]*(fPercentAlongPath);
-			m_current.glow			= m_start.glow      *(1.0f-fPercentAlongPath) + TS.glow      *(fPercentAlongPath);
-		}
-	}	// end if m_TweenType != no_tween
-
+	UpdateTweening( fDeltaTime );
 }
 
 void Actor::BeginTweening( float time, TweenType tt )
diff --git a/stepmania/src/Actor.h b/stepmania/src/Actor.h
index 0f5615ae74..9709500a2d 100644
--- a/stepmania/src/Actor.h
+++ b/stepmania/src/Actor.h
@@ -38,6 +38,9 @@ public:
 
 
 	// let subclasses override
+
+	/* Do subclasses really need to override tweening?  Tween data should
+	 * probably be private ... - glenn */
 	virtual void Restore() {};
 	virtual void Invalidate() {};
 
@@ -46,6 +49,7 @@ public:
 	virtual void DrawPrimitives() = 0;	// override with Actor specific action
 	virtual void EndDraw();		// pops transform from world matrix stack
 	virtual void Update( float fDeltaTime );
+	virtual void UpdateTweening( float fDeltaTime );
 
 	virtual float GetX()					{ return m_current.pos.x; };
 	virtual float GetY()					{ return m_current.pos.y; };