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

cleanpu

Browse Source
This commit is contained in:
Glenn Maynard
2006-01-18 05:48:56 +00:00
parent 34b86a2185
commit 63c010f94e
1 changed files with 70 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/Actor.cpp
+3 -5
View File
@@ -336,8 +336,6 @@ void Actor::BeginDraw() // set the world matrix and calculate actor properties
m_pTempState = &tempState; m_pTempState = &tempState;
tempState = m_current; tempState = m_current;
/*
*/
const float fTotalPeriod = GetEffectPeriod(); const float fTotalPeriod = GetEffectPeriod();
ASSERT( fTotalPeriod > 0 ); ASSERT( fTotalPeriod > 0 );
const float fTimeIntoEffect = fmodfp( m_fSecsIntoEffect+m_fEffectOffset, fTotalPeriod ); const float fTimeIntoEffect = fmodfp( m_fSecsIntoEffect+m_fEffectOffset, fTotalPeriod );
@@ -1117,7 +1115,7 @@ float Actor::GetTweenTimeLeft() const
*/ */
void Actor::SetGlobalDiffuseColor( RageColor c ) void Actor::SetGlobalDiffuseColor( RageColor c )
{ {
for(int i=0; i<4; i++) /* color, not alpha */ for( int i=0; i<4; i++ ) /* color, not alpha */
{ {
for( unsigned ts = 0; ts < m_Tweens.size(); ++ts ) for( unsigned ts = 0; ts < m_Tweens.size(); ++ts )
{ {
@@ -1144,7 +1142,7 @@ void Actor::SetGlobalX( float x )
void Actor::SetDiffuseColor( RageColor c ) void Actor::SetDiffuseColor( RageColor c )
{ {
for(int i=0; i<4; i++) for( int i=0; i<4; i++ )
{ {
DestTweenState().diffuse[i].r = c.r; DestTweenState().diffuse[i].r = c.r;
DestTweenState().diffuse[i].g = c.g; DestTweenState().diffuse[i].g = c.g;
@@ -1190,7 +1188,7 @@ void Actor::TweenState::MakeWeightedAverage( TweenState& average_out, const Twee
{ {
average_out.pos = ts1.pos + (ts2.pos - ts1.pos )*fPercentBetween; average_out.pos = ts1.pos + (ts2.pos - ts1.pos )*fPercentBetween;
average_out.scale = ts1.scale + (ts2.scale - ts1.scale )*fPercentBetween; average_out.scale = ts1.scale + (ts2.scale - ts1.scale )*fPercentBetween;
average_out.rotation = ts1.rotation + (ts2.rotation - ts1.rotation)*fPercentBetween; average_out.rotation = ts1.rotation + (ts2.rotation - ts1.rotation )*fPercentBetween;
RageQuatSlerp(&average_out.quat, ts1.quat, ts2.quat, fPercentBetween); RageQuatSlerp(&average_out.quat, ts1.quat, ts2.quat, fPercentBetween);
average_out.fSkewX = ts1.fSkewX + (ts2.fSkewX - ts1.fSkewX)*fPercentBetween; average_out.fSkewX = ts1.fSkewX + (ts2.fSkewX - ts1.fSkewX)*fPercentBetween;