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

expermienting with DEFINE_METHOD macro for Lua methods

Browse Source
This commit is contained in:
Chris Danford
2005-09-10 02:47:04 +00:00
parent 9580a5f8a4
commit 65d71a4f23
46 changed files with 408 additions and 371 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/Actor.cpp
+124 -124
View File
@@ -1418,132 +1418,132 @@ public:
static int GetName( T* p, lua_State *L ) { lua_pushstring( L, p->GetName() ); return 1; } static int GetName( T* p, lua_State *L ) { lua_pushstring( L, p->GetName() ); return 1; }
static void Register(lua_State *L) { static void Register(lua_State *L) {
ADD_METHOD( sleep ) ADD_METHOD( sleep );
ADD_METHOD( linear ) ADD_METHOD( linear );
ADD_METHOD( accelerate ) ADD_METHOD( accelerate );
ADD_METHOD( decelerate ) ADD_METHOD( decelerate );
ADD_METHOD( smooth ) ADD_METHOD( smooth );
ADD_METHOD( bouncebegin ) ADD_METHOD( bouncebegin );
ADD_METHOD( bounceend ) ADD_METHOD( bounceend );
ADD_METHOD( spring ) ADD_METHOD( spring );
ADD_METHOD( stoptweening ) ADD_METHOD( stoptweening );
ADD_METHOD( finishtweening ) ADD_METHOD( finishtweening );
ADD_METHOD( hurrytweening ) ADD_METHOD( hurrytweening );
ADD_METHOD( x ) ADD_METHOD( x );
ADD_METHOD( y ) ADD_METHOD( y );
ADD_METHOD( z ) ADD_METHOD( z );
ADD_METHOD( addx ) ADD_METHOD( addx );
ADD_METHOD( addy ) ADD_METHOD( addy );
ADD_METHOD( addz ) ADD_METHOD( addz );
ADD_METHOD( zoom ) ADD_METHOD( zoom );
ADD_METHOD( zoomx ) ADD_METHOD( zoomx );
ADD_METHOD( zoomy ) ADD_METHOD( zoomy );
ADD_METHOD( zoomz ) ADD_METHOD( zoomz );
ADD_METHOD( zoomto ) ADD_METHOD( zoomto );
ADD_METHOD( zoomtowidth ) ADD_METHOD( zoomtowidth );
ADD_METHOD( zoomtoheight ) ADD_METHOD( zoomtoheight );
ADD_METHOD( basezoomx ) ADD_METHOD( basezoomx );
ADD_METHOD( basezoomy ) ADD_METHOD( basezoomy );
ADD_METHOD( stretchto ) ADD_METHOD( stretchto );
ADD_METHOD( cropleft ) ADD_METHOD( cropleft );
ADD_METHOD( croptop ) ADD_METHOD( croptop );
ADD_METHOD( cropright ) ADD_METHOD( cropright );
ADD_METHOD( cropbottom ) ADD_METHOD( cropbottom );
ADD_METHOD( fadeleft ) ADD_METHOD( fadeleft );
ADD_METHOD( fadetop ) ADD_METHOD( fadetop );
ADD_METHOD( faderight ) ADD_METHOD( faderight );
ADD_METHOD( fadebottom ) ADD_METHOD( fadebottom );
ADD_METHOD( diffuse ) ADD_METHOD( diffuse );
ADD_METHOD( diffuseupperleft ) ADD_METHOD( diffuseupperleft );
ADD_METHOD( diffuseupperright ) ADD_METHOD( diffuseupperright );
ADD_METHOD( diffuselowerleft ) ADD_METHOD( diffuselowerleft );
ADD_METHOD( diffuselowerright ) ADD_METHOD( diffuselowerright );
ADD_METHOD( diffuseleftedge ) ADD_METHOD( diffuseleftedge );
ADD_METHOD( diffuserightedge ) ADD_METHOD( diffuserightedge );
ADD_METHOD( diffusetopedge ) ADD_METHOD( diffusetopedge );
ADD_METHOD( diffusebottomedge ) ADD_METHOD( diffusebottomedge );
ADD_METHOD( diffusealpha ) ADD_METHOD( diffusealpha );
ADD_METHOD( diffusecolor ) ADD_METHOD( diffusecolor );
ADD_METHOD( glow ) ADD_METHOD( glow );
ADD_METHOD( aux ) ADD_METHOD( aux );
ADD_METHOD( getaux ) ADD_METHOD( getaux );
ADD_METHOD( rotationx ) ADD_METHOD( rotationx );
ADD_METHOD( rotationy ) ADD_METHOD( rotationy );
ADD_METHOD( rotationz ) ADD_METHOD( rotationz );
ADD_METHOD( getrotation ) ADD_METHOD( getrotation );
ADD_METHOD( baserotationx ) ADD_METHOD( baserotationx );
ADD_METHOD( baserotationy ) ADD_METHOD( baserotationy );
ADD_METHOD( baserotationz ) ADD_METHOD( baserotationz );
ADD_METHOD( skewx ) ADD_METHOD( skewx );
ADD_METHOD( heading ) ADD_METHOD( heading );
ADD_METHOD( pitch ) ADD_METHOD( pitch );
ADD_METHOD( roll ) ADD_METHOD( roll );
ADD_METHOD( shadowlength ) ADD_METHOD( shadowlength );
ADD_METHOD( horizalign ) ADD_METHOD( horizalign );
ADD_METHOD( vertalign ) ADD_METHOD( vertalign );
ADD_METHOD( luaeffect ) ADD_METHOD( luaeffect );
ADD_METHOD( diffuseblink ) ADD_METHOD( diffuseblink );
ADD_METHOD( diffuseshift ) ADD_METHOD( diffuseshift );
ADD_METHOD( diffuseramp ) ADD_METHOD( diffuseramp );
ADD_METHOD( glowblink ) ADD_METHOD( glowblink );
ADD_METHOD( glowshift ) ADD_METHOD( glowshift );
ADD_METHOD( rainbow ) ADD_METHOD( rainbow );
ADD_METHOD( wag ) ADD_METHOD( wag );
ADD_METHOD( bounce ) ADD_METHOD( bounce );
ADD_METHOD( bob ) ADD_METHOD( bob );
ADD_METHOD( pulse ) ADD_METHOD( pulse );
ADD_METHOD( spin ) ADD_METHOD( spin );
ADD_METHOD( vibrate ) ADD_METHOD( vibrate );
ADD_METHOD( stopeffect ) ADD_METHOD( stopeffect );
ADD_METHOD( effectcolor1 ) ADD_METHOD( effectcolor1 );
ADD_METHOD( effectcolor2 ) ADD_METHOD( effectcolor2 );
ADD_METHOD( effectperiod ) ADD_METHOD( effectperiod );
ADD_METHOD( effecttiming ) ADD_METHOD( effecttiming );
ADD_METHOD( effectoffset ) ADD_METHOD( effectoffset );
ADD_METHOD( effectclock ) ADD_METHOD( effectclock );
ADD_METHOD( effectmagnitude ) ADD_METHOD( effectmagnitude );
ADD_METHOD( geteffectmagnitude ) ADD_METHOD( geteffectmagnitude );
ADD_METHOD( scaletocover ) ADD_METHOD( scaletocover );
ADD_METHOD( scaletofit ) ADD_METHOD( scaletofit );
ADD_METHOD( animate ) ADD_METHOD( animate );
ADD_METHOD( play ) ADD_METHOD( play );
ADD_METHOD( pause ) ADD_METHOD( pause );
ADD_METHOD( setstate ) ADD_METHOD( setstate );
ADD_METHOD( texturewrapping ) ADD_METHOD( texturewrapping );
ADD_METHOD( additiveblend ) ADD_METHOD( additiveblend );
ADD_METHOD( blend ) ADD_METHOD( blend );
ADD_METHOD( zbuffer ) ADD_METHOD( zbuffer );
ADD_METHOD( ztest ) ADD_METHOD( ztest );
ADD_METHOD( ztestmode ) ADD_METHOD( ztestmode );
ADD_METHOD( zwrite ) ADD_METHOD( zwrite );
ADD_METHOD( zbias ) ADD_METHOD( zbias );
ADD_METHOD( clearzbuffer ) ADD_METHOD( clearzbuffer );
ADD_METHOD( backfacecull ) ADD_METHOD( backfacecull );
ADD_METHOD( cullmode ) ADD_METHOD( cullmode );
ADD_METHOD( visible ) ADD_METHOD( visible );
ADD_METHOD( hidden ) ADD_METHOD( hidden );
ADD_METHOD( hibernate ) ADD_METHOD( hibernate );
ADD_METHOD( draworder ) ADD_METHOD( draworder );
ADD_METHOD( playcommand ) ADD_METHOD( playcommand );
ADD_METHOD( queuecommand ) ADD_METHOD( queuecommand );
ADD_METHOD( queuemessage ) ADD_METHOD( queuemessage );
ADD_METHOD( GetX ) ADD_METHOD( GetX );
ADD_METHOD( GetY ) ADD_METHOD( GetY );
ADD_METHOD( GetZ ) ADD_METHOD( GetZ );
ADD_METHOD( GetWidth ) ADD_METHOD( GetWidth );
ADD_METHOD( GetHeight ) ADD_METHOD( GetHeight );
ADD_METHOD( GetZoom ) ADD_METHOD( GetZoom );
ADD_METHOD( GetZoomX ) ADD_METHOD( GetZoomX );
ADD_METHOD( GetZoomY ) ADD_METHOD( GetZoomY );
ADD_METHOD( GetZoomZ ) ADD_METHOD( GetZoomZ );
ADD_METHOD( GetRotationY ) ADD_METHOD( GetRotationY );
ADD_METHOD( GetBaseZoomX ) ADD_METHOD( GetBaseZoomX );
ADD_METHOD( GetSecsIntoEffect ) ADD_METHOD( GetSecsIntoEffect );
ADD_METHOD( GetEffectDelta ) ADD_METHOD( GetEffectDelta );
ADD_METHOD( GetDiffuseAlpha ) ADD_METHOD( GetDiffuseAlpha );
ADD_METHOD( GetName ) ADD_METHOD( GetName );
Luna<T>::Register( L ); Luna<T>::Register( L );
} }
stepmania/src/ActorFrame.cpp
+8 -8
View File
@@ -393,14 +393,14 @@ public:
static void Register(lua_State *L) static void Register(lua_State *L)
{ {
ADD_METHOD( propagate ) ADD_METHOD( propagate );
ADD_METHOD( fov ) ADD_METHOD( fov );
ADD_METHOD( SetUpdateRate ) ADD_METHOD( SetUpdateRate );
ADD_METHOD( SetFOV ) ADD_METHOD( SetFOV );
ADD_METHOD( vanishpoint ) ADD_METHOD( vanishpoint );
ADD_METHOD( GetChild ) ADD_METHOD( GetChild );
ADD_METHOD( GetNumChildren ) ADD_METHOD( GetNumChildren );
ADD_METHOD( SetDrawByZPosition ) ADD_METHOD( SetDrawByZPosition );
Luna<T>::Register( L ); Luna<T>::Register( L );
} }
}; };
stepmania/src/ActorScroller.cpp
+1 -1
View File
@@ -299,7 +299,7 @@ public:
static void Register(lua_State *L) static void Register(lua_State *L)
{ {
ADD_METHOD( SetCurrentAndDestinationItem ) ADD_METHOD( SetCurrentAndDestinationItem );
Luna<T>::Register( L ); Luna<T>::Register( L );
} }
}; };
stepmania/src/ActorSound.cpp
+2 -2
View File
@@ -47,8 +47,8 @@ public:
static void Register(lua_State *L) static void Register(lua_State *L)
{ {
ADD_METHOD( load ) ADD_METHOD( load );
ADD_METHOD( play ) ADD_METHOD( play );
Luna<T>::Register( L ); Luna<T>::Register( L );
} }
stepmania/src/BitmapText.cpp
+5 -5
View File
@@ -850,11 +850,11 @@ public:
static void Register(lua_State *L) static void Register(lua_State *L)
{ {
ADD_METHOD( wrapwidthpixels ) ADD_METHOD( wrapwidthpixels );
ADD_METHOD( maxwidth ) ADD_METHOD( maxwidth );
ADD_METHOD( maxheight ) ADD_METHOD( maxheight );
ADD_METHOD( settext ) ADD_METHOD( settext );
ADD_METHOD( GetText ) ADD_METHOD( GetText );
Luna<T>::Register( L ); Luna<T>::Register( L );
} }
}; };
stepmania/src/Character.cpp
+5 -4
View File
@@ -210,10 +210,11 @@ public:
static void Register( Lua *L ) static void Register( Lua *L )
{ {
ADD_METHOD( GetCardPath ) ADD_METHOD( GetCardPath );
ADD_METHOD( GetIconPath ) ADD_METHOD( GetIconPath );
ADD_METHOD( GetSongSelectIconPath ) ADD_METHOD( GetSongSelectIconPath );
ADD_METHOD( GetStageIconPath ) ADD_METHOD( GetStageIconPath );
Luna<T>::Register( L ); Luna<T>::Register( L );
} }
}; };
stepmania/src/CharacterManager.cpp
+2 -1
View File
@@ -124,7 +124,8 @@ public:
static void Register(lua_State *L) static void Register(lua_State *L)
{ {
ADD_METHOD( GetCharacter ) ADD_METHOD( GetCharacter );
Luna<T>::Register( L ); Luna<T>::Register( L );
// Add global singleton if constructed already. If it's not constructed yet, // Add global singleton if constructed already. If it's not constructed yet,
stepmania/src/ComboGraph.cpp
+2 -1
View File
@@ -124,7 +124,8 @@ public:
static void Register(lua_State *L) static void Register(lua_State *L)
{ {
ADD_METHOD( LoadFromStats ) ADD_METHOD( LoadFromStats );
Luna<T>::Register( L ); Luna<T>::Register( L );
} }
}; };
stepmania/src/Course.cpp
+7 -7
View File
@@ -114,7 +114,7 @@ public:
static void Register(lua_State *L) static void Register(lua_State *L)
{ {
ADD_METHOD( GetSong ) ADD_METHOD( GetSong );
Luna<T>::Register( L ); Luna<T>::Register( L );
} }
@@ -1017,12 +1017,12 @@ public:
static void Register(lua_State *L) static void Register(lua_State *L)
{ {
ADD_METHOD( GetPlayMode ) ADD_METHOD( GetPlayMode );
ADD_METHOD( GetDisplayFullTitle ) ADD_METHOD( GetDisplayFullTitle );
ADD_METHOD( GetTranslitFullTitle ) ADD_METHOD( GetTranslitFullTitle );
ADD_METHOD( HasMods ) ADD_METHOD( HasMods );
ADD_METHOD( GetCourseType ) ADD_METHOD( GetCourseType );
ADD_METHOD( GetCourseEntry ) ADD_METHOD( GetCourseEntry );
Luna<T>::Register( L ); Luna<T>::Register( L );
} }
stepmania/src/CourseContentsList.cpp
+2 -1
View File
@@ -124,7 +124,8 @@ public:
static void Register(lua_State *L) static void Register(lua_State *L)
{ {
ADD_METHOD( SetFromGameState ) ADD_METHOD( SetFromGameState );
Luna<T>::Register( L ); Luna<T>::Register( L );
} }
}; };
stepmania/src/CourseEntryDisplay.cpp
+2 -1
View File
@@ -186,7 +186,8 @@ public:
static void Register(lua_State *L) static void Register(lua_State *L)
{ {
ADD_METHOD( SetFromGameState ) ADD_METHOD( SetFromGameState );
Luna<T>::Register( L ); Luna<T>::Register( L );
} }
}; };
stepmania/src/DifficultyMeter.cpp
+5 -4
View File
@@ -291,10 +291,11 @@ public:
static void Register(lua_State *L) static void Register(lua_State *L)
{ {
ADD_METHOD( Load ) ADD_METHOD( Load );
ADD_METHOD( SetFromMeterAndDifficulty ) ADD_METHOD( SetFromMeterAndDifficulty );
ADD_METHOD( SetFromSteps ) ADD_METHOD( SetFromSteps );
ADD_METHOD( SetFromTrail ) ADD_METHOD( SetFromTrail );
Luna<T>::Register( L ); Luna<T>::Register( L );
} }
}; };
stepmania/src/FadingBanner.cpp
+7 -6
View File
@@ -271,12 +271,13 @@ public:
static void Register(lua_State *L) static void Register(lua_State *L)
{ {
ADD_METHOD( scaletoclipped ) ADD_METHOD( scaletoclipped );
ADD_METHOD( ScaleToClipped ) ADD_METHOD( ScaleToClipped );
ADD_METHOD( LoadFromSong ) ADD_METHOD( LoadFromSong );
ADD_METHOD( LoadFromCourse ) ADD_METHOD( LoadFromCourse );
ADD_METHOD( LoadIconFromCharacter ) ADD_METHOD( LoadIconFromCharacter );
ADD_METHOD( LoadCardFromCharacter ) ADD_METHOD( LoadCardFromCharacter );
Luna<T>::Register( L ); Luna<T>::Register( L );
} }
}; };
stepmania/src/Game.cpp
+2 -1
View File
@@ -125,7 +125,8 @@ public:
static int GetName( T* p, lua_State *L ) { lua_pushstring( L, p->m_szName ); return 1; } static int GetName( T* p, lua_State *L ) { lua_pushstring( L, p->m_szName ); return 1; }
static void Register( Lua *L ) static void Register( Lua *L )
{ {
ADD_METHOD( GetName ) ADD_METHOD( GetName );
Luna<T>::Register( L ); Luna<T>::Register( L );
} }
}; };
stepmania/src/GameCommand.cpp
+6 -6
View File
@@ -1162,12 +1162,12 @@ public:
static void Register(lua_State *L) static void Register(lua_State *L)
{ {
ADD_METHOD( GetName ) ADD_METHOD( GetName );
ADD_METHOD( GetText ) ADD_METHOD( GetText );
ADD_METHOD( GetIndex ) ADD_METHOD( GetIndex );
ADD_METHOD( GetMultiPlayer ) ADD_METHOD( GetMultiPlayer );
ADD_METHOD( GetProfileID ) ADD_METHOD( GetProfileID );
ADD_METHOD( GetSong ) ADD_METHOD( GetSong );
Luna<T>::Register( L ); Luna<T>::Register( L );
} }
stepmania/src/GameManager.cpp
+2 -2
View File
@@ -2829,8 +2829,8 @@ public:
static void Register(lua_State *L) static void Register(lua_State *L)
{ {
ADD_METHOD( StepsTypeToThemedString ) ADD_METHOD( StepsTypeToThemedString );
ADD_METHOD( GetFirstStepsTypeForCurrentGame ) ADD_METHOD( GetFirstStepsTypeForCurrentGame );
Luna<T>::Register( L ); Luna<T>::Register( L );
stepmania/src/GameSoundManager.cpp
+3 -2
View File
@@ -739,8 +739,9 @@ public:
static void Register(lua_State *L) static void Register(lua_State *L)
{ {
ADD_METHOD( DimMusic ) ADD_METHOD( DimMusic );
ADD_METHOD( PlayOnce ) ADD_METHOD( PlayOnce );
Luna<T>::Register( L ); Luna<T>::Register( L );
// Add global singleton if constructed already. If it's not constructed yet, // Add global singleton if constructed already. If it's not constructed yet,
stepmania/src/GameState.cpp
+67 -65
View File
@@ -1901,15 +1901,17 @@ class LunaGameState: public Luna<GameState>
public: public:
LunaGameState() { LUA->Register( Register ); } LunaGameState() { LUA->Register( Register ); }
static int IsPlayerEnabled( T* p, lua_State *L ) { lua_pushboolean(L, p->IsPlayerEnabled((PlayerNumber)IArg(1)) ); return 1; } DEFINE_METHOD( IsPlayerEnabled, IsPlayerEnabled((PlayerNumber)IArg(1)) )
static int IsHumanPlayer( T* p, lua_State *L ) { lua_pushboolean(L, p->IsHumanPlayer((PlayerNumber)IArg(1)) ); return 1; } DEFINE_METHOD( IsHumanPlayer, IsHumanPlayer((PlayerNumber)IArg(1)) )
static int GetPlayerDisplayName( T* p, lua_State *L ) { lua_pushstring(L, p->GetPlayerDisplayName((PlayerNumber)IArg(1)) ); return 1; } DEFINE_METHOD( GetPlayerDisplayName, GetPlayerDisplayName((PlayerNumber)IArg(1)) )
static int GetMasterPlayerNumber( T* p, lua_State *L ) { lua_pushnumber(L, p->m_MasterPlayerNumber ); return 1; } DEFINE_METHOD( GetMasterPlayerNumber, m_MasterPlayerNumber )
static int GetMultiplayer( T* p, lua_State *L ) { lua_pushboolean(L, p->m_bMultiplayer); return 1; } DEFINE_METHOD( GetMultiplayer, m_bMultiplayer )
static int GetPlayerState( T* p, lua_State *L ) { static int GetPlayerState( T* p, lua_State *L )
{
PlayerNumber pn = (PlayerNumber)IArg(1); PlayerNumber pn = (PlayerNumber)IArg(1);
p->m_pPlayerState[pn]->PushSelf(L);return 1; } p->m_pPlayerState[pn]->PushSelf(L);
return 1;
}
static int ApplyGameCommand( T* p, lua_State *L ) static int ApplyGameCommand( T* p, lua_State *L )
{ {
PlayerNumber pn = PLAYER_INVALID; PlayerNumber pn = PLAYER_INVALID;
@@ -2037,63 +2039,63 @@ public:
static void Register(lua_State *L) static void Register(lua_State *L)
{ {
ADD_METHOD( IsPlayerEnabled ) ADD_METHOD( IsPlayerEnabled );
ADD_METHOD( IsHumanPlayer ) ADD_METHOD( IsHumanPlayer );
ADD_METHOD( GetPlayerDisplayName ) ADD_METHOD( GetPlayerDisplayName );
ADD_METHOD( GetMasterPlayerNumber ) ADD_METHOD( GetMasterPlayerNumber );
ADD_METHOD( GetMultiplayer ) ADD_METHOD( GetMultiplayer );
ADD_METHOD( GetPlayerState ) ADD_METHOD( GetPlayerState );
ADD_METHOD( ApplyGameCommand ) ADD_METHOD( ApplyGameCommand );
ADD_METHOD( GetCurrentSong ) ADD_METHOD( GetCurrentSong );
ADD_METHOD( SetCurrentSong ) ADD_METHOD( SetCurrentSong );
ADD_METHOD( GetCurrentSteps ) ADD_METHOD( GetCurrentSteps );
ADD_METHOD( SetCurrentSteps ) ADD_METHOD( SetCurrentSteps );
ADD_METHOD( GetCurrentCourse ) ADD_METHOD( GetCurrentCourse );
ADD_METHOD( SetCurrentCourse ) ADD_METHOD( SetCurrentCourse );
ADD_METHOD( GetCurrentTrail ) ADD_METHOD( GetCurrentTrail );
ADD_METHOD( SetPreferredSong ) ADD_METHOD( SetPreferredSong );
ADD_METHOD( GetPreferredSong ) ADD_METHOD( GetPreferredSong );
ADD_METHOD( SetTemporaryEventMode ) ADD_METHOD( SetTemporaryEventMode );
ADD_METHOD( Env ) ADD_METHOD( Env );
ADD_METHOD( SetEnv ) ADD_METHOD( SetEnv );
ADD_METHOD( GetEnv ) ADD_METHOD( GetEnv );
ADD_METHOD( GetEditSourceSteps ) ADD_METHOD( GetEditSourceSteps );
ADD_METHOD( GetPreferredDifficulty ) ADD_METHOD( GetPreferredDifficulty );
ADD_METHOD( AnyPlayerHasRankingFeats ) ADD_METHOD( AnyPlayerHasRankingFeats );
ADD_METHOD( IsCourseMode ) ADD_METHOD( IsCourseMode );
ADD_METHOD( IsDemonstration ) ADD_METHOD( IsDemonstration );
ADD_METHOD( GetPlayMode ) ADD_METHOD( GetPlayMode );
ADD_METHOD( GetSortOrder ) ADD_METHOD( GetSortOrder );
ADD_METHOD( StageIndex ) ADD_METHOD( StageIndex );
ADD_METHOD( IsGoalComplete ) ADD_METHOD( IsGoalComplete );
ADD_METHOD( PlayerIsUsingModifier ) ADD_METHOD( PlayerIsUsingModifier );
ADD_METHOD( GetCourseSongIndex ) ADD_METHOD( GetCourseSongIndex );
ADD_METHOD( IsFinalStage ) ADD_METHOD( IsFinalStage );
ADD_METHOD( IsExtraStage ) ADD_METHOD( IsExtraStage );
ADD_METHOD( IsExtraStage2 ) ADD_METHOD( IsExtraStage2 );
ADD_METHOD( GetCurrentStage ) ADD_METHOD( GetCurrentStage );
ADD_METHOD( IsStagePossible ) ADD_METHOD( IsStagePossible );
ADD_METHOD( HasEarnedExtraStage ) ADD_METHOD( HasEarnedExtraStage );
ADD_METHOD( GetEasiestStepsDifficulty ) ADD_METHOD( GetEasiestStepsDifficulty );
ADD_METHOD( IsEventMode ) ADD_METHOD( IsEventMode );
ADD_METHOD( GetNumPlayersEnabled ) ADD_METHOD( GetNumPlayersEnabled );
ADD_METHOD( GetSongBeat ) ADD_METHOD( GetSongBeat );
ADD_METHOD( PlayerUsingBothSides ) ADD_METHOD( PlayerUsingBothSides );
ADD_METHOD( GetCoins ) ADD_METHOD( GetCoins );
ADD_METHOD( IsSideJoined ) ADD_METHOD( IsSideJoined );
ADD_METHOD( GetCoinsNeededToJoin ) ADD_METHOD( GetCoinsNeededToJoin );
ADD_METHOD( PlayersCanJoin ) ADD_METHOD( PlayersCanJoin );
ADD_METHOD( GetNumSidesJoined ) ADD_METHOD( GetNumSidesJoined );
ADD_METHOD( GetCoinMode ) ADD_METHOD( GetCoinMode );
ADD_METHOD( GetPremium ) ADD_METHOD( GetPremium );
ADD_METHOD( GetSongOptionsString ) ADD_METHOD( GetSongOptionsString );
ADD_METHOD( IsSyncDataChanged ) ADD_METHOD( IsSyncDataChanged );
ADD_METHOD( IsWinner ) ADD_METHOD( IsWinner );
ADD_METHOD( IsDisqualified ) ADD_METHOD( IsDisqualified );
ADD_METHOD( GetCurrentGame ) ADD_METHOD( GetCurrentGame );
ADD_METHOD( GetEditCourseEntryIndex ) ADD_METHOD( GetEditCourseEntryIndex );
ADD_METHOD( GetEditLocalProfileID ) ADD_METHOD( GetEditLocalProfileID );
ADD_METHOD( GetEditLocalProfile ) ADD_METHOD( GetEditLocalProfile );
Luna<T>::Register( L ); Luna<T>::Register( L );
stepmania/src/GraphDisplay.cpp
+2 -1
View File
@@ -308,7 +308,8 @@ public:
static void Register(lua_State *L) static void Register(lua_State *L)
{ {
ADD_METHOD( LoadFromStats ) ADD_METHOD( LoadFromStats );
Luna<T>::Register( L ); Luna<T>::Register( L );
} }
}; };
stepmania/src/HelpDisplay.cpp
+3 -2
View File
@@ -128,8 +128,9 @@ public:
static void Register(lua_State *L) static void Register(lua_State *L)
{ {
ADD_METHOD( settips ) ADD_METHOD( settips );
ADD_METHOD( gettips ) ADD_METHOD( gettips );
Luna<T>::Register( L ); Luna<T>::Register( L );
} }
}; };
stepmania/src/LuaBinding.h
+5 -1
View File
@@ -248,7 +248,11 @@ protected:
/* Call PushSelf, so we always call the derived Luna<T>::Push. */ \ /* Call PushSelf, so we always call the derived Luna<T>::Push. */ \
namespace LuaHelpers { template<> void Push( T *pObject, lua_State *L ) { pObject->PushSelf( L ); } } namespace LuaHelpers { template<> void Push( T *pObject, lua_State *L ) { pObject->PushSelf( L ); } }
#define ADD_METHOD( method_name ) AddMethod( #method_name, method_name ); #define DEFINE_METHOD( method_name, expr ) \
static int method_name( T* p, lua_State *L ) { LuaHelpers::Push( p->expr, L ); return 1; }
#define ADD_METHOD( method_name ) \
AddMethod( #method_name, method_name )
#endif #endif
stepmania/src/MessageManager.cpp
+2 -1
View File
@@ -202,7 +202,8 @@ public:
static void Register(lua_State *L) static void Register(lua_State *L)
{ {
ADD_METHOD( Broadcast ) ADD_METHOD( Broadcast );
Luna<T>::Register( L ); Luna<T>::Register( L );
// Add global singleton if constructed already. If it's not constructed yet, // Add global singleton if constructed already. If it's not constructed yet,
stepmania/src/Model.cpp
+2 -1
View File
@@ -823,7 +823,8 @@ public:
static void Register(lua_State *L) static void Register(lua_State *L)
{ {
ADD_METHOD( playanimation ) ADD_METHOD( playanimation );
Luna<T>::Register( L ); Luna<T>::Register( L );
} }
}; };
stepmania/src/NoteSkinManager.cpp
+2 -1
View File
@@ -296,7 +296,8 @@ public:
static void Register(lua_State *L) static void Register(lua_State *L)
{ {
ADD_METHOD( GetPath ) ADD_METHOD( GetPath );
Luna<T>::Register( L ); Luna<T>::Register( L );
// Add global singleton if constructed already. If it's not constructed yet, // Add global singleton if constructed already. If it's not constructed yet,
stepmania/src/OptionIconRow.cpp
+2 -1
View File
@@ -149,7 +149,8 @@ public:
static void Register(lua_State *L) static void Register(lua_State *L)
{ {
ADD_METHOD( set ) ADD_METHOD( set );
Luna<T>::Register( L ); Luna<T>::Register( L );
} }
}; };
stepmania/src/PaneDisplay.cpp
+2 -1
View File
@@ -304,7 +304,8 @@ public:
static void Register(lua_State *L) static void Register(lua_State *L)
{ {
ADD_METHOD( SetFromGameState ) ADD_METHOD( SetFromGameState );
Luna<T>::Register( L ); Luna<T>::Register( L );
} }
}; };
stepmania/src/PercentageDisplay.cpp
+2 -1
View File
@@ -199,7 +199,8 @@ public:
static void Register(lua_State *L) static void Register(lua_State *L)
{ {
ADD_METHOD( LoadFromStats ) ADD_METHOD( LoadFromStats );
Luna<T>::Register( L ); Luna<T>::Register( L );
} }
}; };
stepmania/src/PlayerStageStats.cpp
+9 -8
View File
@@ -529,14 +529,15 @@ public:
static void Register(lua_State *L) static void Register(lua_State *L)
{ {
ADD_METHOD( GetCaloriesBurned ) ADD_METHOD( GetCaloriesBurned );
ADD_METHOD( GetLifeRemainingSeconds ) ADD_METHOD( GetLifeRemainingSeconds );
ADD_METHOD( GetSurvivalSeconds ) ADD_METHOD( GetSurvivalSeconds );
ADD_METHOD( FullCombo ) ADD_METHOD( FullCombo );
ADD_METHOD( MaxCombo ) ADD_METHOD( MaxCombo );
ADD_METHOD( GetGrade ) ADD_METHOD( GetGrade );
ADD_METHOD( GetLessonScoreActual ) ADD_METHOD( GetLessonScoreActual );
ADD_METHOD( GetLessonScorePossible ) ADD_METHOD( GetLessonScorePossible );
Luna<T>::Register( L ); Luna<T>::Register( L );
} }
}; };
stepmania/src/PrefsManager.cpp
+3 -2
View File
@@ -468,8 +468,9 @@ public:
static void Register(lua_State *L) static void Register(lua_State *L)
{ {
ADD_METHOD( GetPreference ) ADD_METHOD( GetPreference );
ADD_METHOD( SetPreference ) ADD_METHOD( SetPreference );
Luna<T>::Register( L ); Luna<T>::Register( L );
// Add global singleton if constructed already. If it's not constructed yet, // Add global singleton if constructed already. If it's not constructed yet,
stepmania/src/Profile.cpp
+28 -28
View File
@@ -1969,34 +1969,34 @@ public:
static void Register(lua_State *L) static void Register(lua_State *L)
{ {
ADD_METHOD( GetDisplayName ) ADD_METHOD( GetDisplayName );
ADD_METHOD( GetCharacter ) ADD_METHOD( GetCharacter );
ADD_METHOD( GetWeightPounds ) ADD_METHOD( GetWeightPounds );
ADD_METHOD( SetWeightPounds ) ADD_METHOD( SetWeightPounds );
ADD_METHOD( GetGoalType ) ADD_METHOD( GetGoalType );
ADD_METHOD( SetGoalType ) ADD_METHOD( SetGoalType );
ADD_METHOD( GetGoalCalories ) ADD_METHOD( GetGoalCalories );
ADD_METHOD( SetGoalCalories ) ADD_METHOD( SetGoalCalories );
ADD_METHOD( GetGoalSeconds ) ADD_METHOD( GetGoalSeconds );
ADD_METHOD( SetGoalSeconds ) ADD_METHOD( SetGoalSeconds );
ADD_METHOD( GetCaloriesBurnedToday ) ADD_METHOD( GetCaloriesBurnedToday );
ADD_METHOD( GetSaved ) ADD_METHOD( GetSaved );
ADD_METHOD( GetTotalNumSongsPlayed ) ADD_METHOD( GetTotalNumSongsPlayed );
ADD_METHOD( IsCodeUnlocked ) ADD_METHOD( IsCodeUnlocked );
ADD_METHOD( GetSongsActual ) ADD_METHOD( GetSongsActual );
ADD_METHOD( GetCoursesActual ) ADD_METHOD( GetCoursesActual );
ADD_METHOD( GetSongsPossible ) ADD_METHOD( GetSongsPossible );
ADD_METHOD( GetCoursesPossible ) ADD_METHOD( GetCoursesPossible );
ADD_METHOD( GetSongsPercentComplete ) ADD_METHOD( GetSongsPercentComplete );
ADD_METHOD( GetCoursesPercentComplete ) ADD_METHOD( GetCoursesPercentComplete );
ADD_METHOD( GetTotalStepsWithTopGrade ) ADD_METHOD( GetTotalStepsWithTopGrade );
ADD_METHOD( GetTotalTrailsWithTopGrade ) ADD_METHOD( GetTotalTrailsWithTopGrade );
ADD_METHOD( GetNumTotalSongsPlayed ) ADD_METHOD( GetNumTotalSongsPlayed );
ADD_METHOD( GetLastPlayedStepsType ) ADD_METHOD( GetLastPlayedStepsType );
ADD_METHOD( GetSongsAndCoursesPercentCompleteAllDifficulties ) ADD_METHOD( GetSongsAndCoursesPercentCompleteAllDifficulties );
ADD_METHOD( GetDisplayTotalCaloriesBurned ) ADD_METHOD( GetDisplayTotalCaloriesBurned );
ADD_METHOD( GetMostPopularSong ) ADD_METHOD( GetMostPopularSong );
ADD_METHOD( GetMostPopularCourse ) ADD_METHOD( GetMostPopularCourse );
Luna<T>::Register( L ); Luna<T>::Register( L );
} }
stepmania/src/ProfileManager.cpp
+10 -9
View File
@@ -809,15 +809,16 @@ public:
static void Register(lua_State *L) static void Register(lua_State *L)
{ {
ADD_METHOD( IsPersistentProfile ) ADD_METHOD( IsPersistentProfile );
ADD_METHOD( GetProfile ) ADD_METHOD( GetProfile );
ADD_METHOD( GetMachineProfile ) ADD_METHOD( GetMachineProfile );
ADD_METHOD( SaveMachineProfile ) ADD_METHOD( SaveMachineProfile );
ADD_METHOD( GetLocalProfile ) ADD_METHOD( GetLocalProfile );
ADD_METHOD( GetLocalProfileFromIndex ) ADD_METHOD( GetLocalProfileFromIndex );
ADD_METHOD( GetLocalProfileIDFromIndex ) ADD_METHOD( GetLocalProfileIDFromIndex );
ADD_METHOD( GetLocalProfileIndexFromID ) ADD_METHOD( GetLocalProfileIndexFromID );
ADD_METHOD( GetNumLocalProfiles ) ADD_METHOD( GetNumLocalProfiles );
Luna<T>::Register( L ); Luna<T>::Register( L );
// Add global singleton if constructed already. If it's not constructed yet, // Add global singleton if constructed already. If it's not constructed yet,
stepmania/src/RageInput.cpp
+2 -1
View File
@@ -104,7 +104,8 @@ public:
static void Register(lua_State *L) static void Register(lua_State *L)
{ {
ADD_METHOD( GetDescriptions ) ADD_METHOD( GetDescriptions );
Luna<T>::Register( L ); Luna<T>::Register( L );
// Add global singleton if constructed already. If it's not constructed yet, // Add global singleton if constructed already. If it's not constructed yet,
stepmania/src/ScreenEvaluation.cpp
+6 -5
View File
@@ -1264,11 +1264,12 @@ public:
static void Register( Lua *L ) static void Register( Lua *L )
{ {
ADD_METHOD( GetEvalStageStats ) ADD_METHOD( GetEvalStageStats );
ADD_METHOD( GetPersonalHighScoreIndex ) ADD_METHOD( GetPersonalHighScoreIndex );
ADD_METHOD( GetMachineHighScoreIndex ) ADD_METHOD( GetMachineHighScoreIndex );
ADD_METHOD( GetPerDifficultyAward ) ADD_METHOD( GetPerDifficultyAward );
ADD_METHOD( GetPeakComboAward ) ADD_METHOD( GetPeakComboAward );
Luna<T>::Register( L ); Luna<T>::Register( L );
} }
}; };
stepmania/src/ScreenGameplay.cpp
+2 -1
View File
@@ -2714,7 +2714,8 @@ public:
static int GetNextCourseSong( T* p, lua_State *L ) { p->GetNextCourseSong()->PushSelf(L); return 1; } static int GetNextCourseSong( T* p, lua_State *L ) { p->GetNextCourseSong()->PushSelf(L); return 1; }
static void Register( Lua *L ) static void Register( Lua *L )
{ {
ADD_METHOD( GetNextCourseSong ) ADD_METHOD( GetNextCourseSong );
Luna<T>::Register( L ); Luna<T>::Register( L );
} }
}; };
stepmania/src/ScreenManager.cpp
+3 -3
View File
@@ -859,9 +859,9 @@ public:
static void Register(lua_State *L) static void Register(lua_State *L)
{ {
ADD_METHOD( SetNewScreen ) ADD_METHOD( SetNewScreen );
ADD_METHOD( GetTopScreen ) ADD_METHOD( GetTopScreen );
ADD_METHOD( SystemMessage ) ADD_METHOD( SystemMessage );
Luna<T>::Register( L ); Luna<T>::Register( L );
stepmania/src/ScreenPlayerOptions.cpp
+2 -1
View File
@@ -195,7 +195,8 @@ public:
static int GetGoToOptions( T* p, lua_State *L ) { lua_pushboolean( L, p->GetGoToOptions() ); return 1; } static int GetGoToOptions( T* p, lua_State *L ) { lua_pushboolean( L, p->GetGoToOptions() ); return 1; }
static void Register( Lua *L ) static void Register( Lua *L )
{ {
ADD_METHOD( GetGoToOptions ) ADD_METHOD( GetGoToOptions );
Luna<T>::Register( L ); Luna<T>::Register( L );
} }
}; };
stepmania/src/ScreenSelectMusic.cpp
+2 -1
View File
@@ -1818,7 +1818,8 @@ public:
static int GetGoToOptions( T* p, lua_State *L ) { lua_pushboolean( L, p->GetGoToOptions() ); return 1; } static int GetGoToOptions( T* p, lua_State *L ) { lua_pushboolean( L, p->GetGoToOptions() ); return 1; }
static void Register( Lua *L ) static void Register( Lua *L )
{ {
ADD_METHOD( GetGoToOptions ) ADD_METHOD( GetGoToOptions );
Luna<T>::Register( L ); Luna<T>::Register( L );
} }
}; };
stepmania/src/Song.cpp
+14 -13
View File
@@ -1539,19 +1539,20 @@ public:
static void Register(lua_State *L) static void Register(lua_State *L)
{ {
ADD_METHOD( GetDisplayFullTitle ) ADD_METHOD( GetDisplayFullTitle );
ADD_METHOD( GetTranslitFullTitle ) ADD_METHOD( GetTranslitFullTitle );
ADD_METHOD( GetDisplayMainTitle ) ADD_METHOD( GetDisplayMainTitle );
ADD_METHOD( GetTranslitMainTitle ) ADD_METHOD( GetTranslitMainTitle );
ADD_METHOD( GetDisplayArtist ) ADD_METHOD( GetDisplayArtist );
ADD_METHOD( GetTranslitArtist ) ADD_METHOD( GetTranslitArtist );
ADD_METHOD( GetGenre ) ADD_METHOD( GetGenre );
ADD_METHOD( GetAllSteps ) ADD_METHOD( GetAllSteps );
ADD_METHOD( GetStepsByStepsType ) ADD_METHOD( GetStepsByStepsType );
ADD_METHOD( GetSongDir ) ADD_METHOD( GetSongDir );
ADD_METHOD( GetBannerPath ) ADD_METHOD( GetBannerPath );
ADD_METHOD( GetBackgroundPath ) ADD_METHOD( GetBackgroundPath );
ADD_METHOD( IsTutorial ) ADD_METHOD( IsTutorial );
Luna<T>::Register( L ); Luna<T>::Register( L );
} }
}; };
stepmania/src/SongManager.cpp
+11 -10
View File
@@ -1420,16 +1420,17 @@ public:
static void Register(lua_State *L) static void Register(lua_State *L)
{ {
ADD_METHOD( GetAllSongs ) ADD_METHOD( GetAllSongs );
ADD_METHOD( GetAllCourses ) ADD_METHOD( GetAllCourses );
ADD_METHOD( FindSong ) ADD_METHOD( FindSong );
ADD_METHOD( FindCourse ) ADD_METHOD( FindCourse );
ADD_METHOD( GetRandomSong ) ADD_METHOD( GetRandomSong );
ADD_METHOD( GetRandomCourse ) ADD_METHOD( GetRandomCourse );
ADD_METHOD( GetNumSongs ) ADD_METHOD( GetNumSongs );
ADD_METHOD( GetNumSongGroups ) ADD_METHOD( GetNumSongGroups );
ADD_METHOD( GetNumCourses ) ADD_METHOD( GetNumCourses );
ADD_METHOD( GetNumCourseGroups ) ADD_METHOD( GetNumCourseGroups );
Luna<T>::Register( L ); Luna<T>::Register( L );
// Add global singleton if constructed already. If it's not constructed yet, // Add global singleton if constructed already. If it's not constructed yet,
stepmania/src/Sprite.cpp
+12 -11
View File
@@ -972,17 +972,18 @@ public:
static int rate( T* p, lua_State *L ) { p->SetPlaybackRate(FArg(1)); return 0; } static int rate( T* p, lua_State *L ) { p->SetPlaybackRate(FArg(1)); return 0; }
static void Register(lua_State *L) { static void Register(lua_State *L) {
ADD_METHOD( Load ) ADD_METHOD( Load );
ADD_METHOD( LoadBanner ) ADD_METHOD( LoadBanner );
ADD_METHOD( LoadBackground ) ADD_METHOD( LoadBackground );
ADD_METHOD( customtexturerect ) ADD_METHOD( customtexturerect );
ADD_METHOD( texcoordvelocity ) ADD_METHOD( texcoordvelocity );
ADD_METHOD( scaletoclipped ) ADD_METHOD( scaletoclipped );
ADD_METHOD( stretchtexcoords ) ADD_METHOD( stretchtexcoords );
ADD_METHOD( setstate ) ADD_METHOD( setstate );
ADD_METHOD( position ) ADD_METHOD( position );
ADD_METHOD( loop ) ADD_METHOD( loop );
ADD_METHOD( rate ) ADD_METHOD( rate );
Luna<T>::Register( L ); Luna<T>::Register( L );
} }
}; };
stepmania/src/StageStats.cpp
+5 -4
View File
@@ -132,10 +132,11 @@ public:
static void Register(lua_State *L) static void Register(lua_State *L)
{ {
ADD_METHOD( GetPlayerStageStats ) ADD_METHOD( GetPlayerStageStats );
ADD_METHOD( GetGameplaySeconds ) ADD_METHOD( GetGameplaySeconds );
ADD_METHOD( OnePassed ) ADD_METHOD( OnePassed );
ADD_METHOD( AllFailed ) ADD_METHOD( AllFailed );
Luna<T>::Register( L ); Luna<T>::Register( L );
} }
}; };
stepmania/src/StatsManager.cpp
+7 -7
View File
@@ -244,13 +244,13 @@ public:
static void Register(lua_State *L) static void Register(lua_State *L)
{ {
ADD_METHOD( GetCurStageStats ) ADD_METHOD( GetCurStageStats );
ADD_METHOD( GetAccumStageStats ) ADD_METHOD( GetAccumStageStats );
ADD_METHOD( Reset ) ADD_METHOD( Reset );
ADD_METHOD( GetFinalGrade ) ADD_METHOD( GetFinalGrade );
ADD_METHOD( GetStagesPlayed ) ADD_METHOD( GetStagesPlayed );
ADD_METHOD( GetBestGrade ) ADD_METHOD( GetBestGrade );
ADD_METHOD( GetWorstGrade ) ADD_METHOD( GetWorstGrade );
Luna<T>::Register( L ); Luna<T>::Register( L );
stepmania/src/Steps.cpp
+5 -4
View File
@@ -373,10 +373,11 @@ public:
static void Register(lua_State *L) static void Register(lua_State *L)
{ {
ADD_METHOD( GetStepsType ) ADD_METHOD( GetStepsType );
ADD_METHOD( GetDifficulty ) ADD_METHOD( GetDifficulty );
ADD_METHOD( GetDescription ) ADD_METHOD( GetDescription );
ADD_METHOD( GetMeter ) ADD_METHOD( GetMeter );
Luna<T>::Register( L ); Luna<T>::Register( L );
} }
}; };
stepmania/src/ThemeManager.cpp
+4 -4
View File
@@ -882,10 +882,10 @@ public:
static void Register(lua_State *L) static void Register(lua_State *L)
{ {
ADD_METHOD( GetMetric ) ADD_METHOD( GetMetric );
ADD_METHOD( GetPathG ) ADD_METHOD( GetPathG );
ADD_METHOD( GetPathB ) ADD_METHOD( GetPathB );
ADD_METHOD( GetPathS ) ADD_METHOD( GetPathS );
Luna<T>::Register( L ); Luna<T>::Register( L );
stepmania/src/Trail.cpp
+2 -2
View File
@@ -196,8 +196,8 @@ public:
static void Register(lua_State *L) static void Register(lua_State *L)
{ {
ADD_METHOD( GetCourseDifficulty ) ADD_METHOD( GetCourseDifficulty );
ADD_METHOD( GetStepsType ) ADD_METHOD( GetStepsType );
Luna<T>::Register( L ); Luna<T>::Register( L );
} }
stepmania/src/UnlockManager.cpp
+7 -6
View File
@@ -535,12 +535,13 @@ public:
static void Register(lua_State *L) static void Register(lua_State *L)
{ {
ADD_METHOD( FindCode ) ADD_METHOD( FindCode );
ADD_METHOD( UnlockCode ) ADD_METHOD( UnlockCode );
ADD_METHOD( PreferUnlockCode ) ADD_METHOD( PreferUnlockCode );
ADD_METHOD( GetNumUnlocks ) ADD_METHOD( GetNumUnlocks );
ADD_METHOD( GetSongsUnlockedByCode ) ADD_METHOD( GetSongsUnlockedByCode );
ADD_METHOD( GetStepsUnlockedByCode ) ADD_METHOD( GetStepsUnlockedByCode );
Luna<T>::Register( L ); Luna<T>::Register( L );
// Add global singleton if constructed already. If it's not constructed yet, // Add global singleton if constructed already. If it's not constructed yet,