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

cleanup: move code out of header, remove RageUtil.h from Actor.h

Browse Source
This commit is contained in:
Glenn Maynard
2005-10-07 01:59:20 +00:00
parent 630ea78f63
commit 7a8cf0bb38
2 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/Actor.cpp
+18
View File
@@ -1145,6 +1145,24 @@ void Actor::TweenState::Init()
aux = 0;
}
bool Actor::TweenState::operator==( const TweenState &other ) const
{
#define COMPARE( x ) if( x != other.x ) return false;
COMPARE( pos );
COMPARE( rotation );
COMPARE( quat );
COMPARE( scale );
COMPARE( fSkewX );
COMPARE( crop );
COMPARE( fade );
for( unsigned i=0; i<ARRAYSIZE(diffuse); i++ )
COMPARE( diffuse[i] );
COMPARE( glow );
COMPARE( aux );
#undef COMPARE
return true;
}
void Actor::TweenState::MakeWeightedAverage( TweenState& average_out, const TweenState& ts1, const TweenState& ts2, float fPercentBetween )
{
average_out.pos = ts1.pos + (ts2.pos - ts1.pos )*fPercentBetween;
stepmania/src/Actor.h
+3 -21
View File
@@ -12,7 +12,6 @@ struct lua_State;
class LuaReference;
class LuaClass;
#include "MessageManager.h"
#include "RageUtil.h" // for ARRAYSIZE
#define DRAW_ORDER_BEFORE_EVERYTHING -200
@@ -56,23 +55,9 @@ public:
struct TweenState
{
bool operator==( const TweenState &other ) const
{
#define COMPARE( x ) if( x != other.x ) return false;
COMPARE( pos );
COMPARE( rotation );
COMPARE( quat );
COMPARE( scale );
COMPARE( fSkewX );
COMPARE( crop );
COMPARE( fade );
for( unsigned i=0; i<ARRAYSIZE(diffuse); i++ )
COMPARE( diffuse[i] );
COMPARE( glow );
COMPARE( aux );
#undef COMPARE
return true;
}
void Init();
static void MakeWeightedAverage( TweenState& average_out, const TweenState& ts1, const TweenState& ts2, float fPercentBetween );
bool operator==( const TweenState &other ) const;
bool operator!=( const TweenState &other ) const { return !operator==(other); }
// start and end position for tweening
@@ -87,9 +72,6 @@ public:
RageColor glow;
float aux;
CString sCommandName; // command to execute when this TweenState goes into effect
void Init();
static void MakeWeightedAverage( TweenState& average_out, const TweenState& ts1, const TweenState& ts2, float fPercentBetween );
};
enum EffectClock