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

cleanup/comment

Browse Source
This commit is contained in:
AJ Kelly
2010-04-30 12:37:19 -05:00
parent cb57878455
commit b769b53fd2
3 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/GameCommand.cpp
+2 -2
View File
@@ -259,7 +259,7 @@ void GameCommand::LoadOne( const Command& cmd )
{ {
RString sSteps = sValue; RString sSteps = sValue;
/* This must be processed after "song" and "style" commands. */ // This must be processed after "song" and "style" commands.
if( !m_bInvalid ) if( !m_bInvalid )
{ {
Song *pSong = (m_pSong != NULL)? m_pSong:GAMESTATE->m_pCurSong; Song *pSong = (m_pSong != NULL)? m_pSong:GAMESTATE->m_pCurSong;
@@ -294,7 +294,7 @@ void GameCommand::LoadOne( const Command& cmd )
{ {
RString sTrail = sValue; RString sTrail = sValue;
/* This must be processed after "course" and "style" commands. */ // This must be processed after "course" and "style" commands.
if( !m_bInvalid ) if( !m_bInvalid )
{ {
Course *pCourse = (m_pCourse != NULL)? m_pCourse:GAMESTATE->m_pCurCourse; Course *pCourse = (m_pCourse != NULL)? m_pCourse:GAMESTATE->m_pCurCourse;
src/Model.h
+7 -9
View File
@@ -50,9 +50,7 @@ public:
bool MaterialsNeedNormals() const; bool MaterialsNeedNormals() const;
//
// Lua // Lua
//
virtual void PushSelf( lua_State *L ); virtual void PushSelf( lua_State *L );
private: private:
@@ -63,7 +61,7 @@ private:
const msAnimation* m_pCurAnimation; const msAnimation* m_pCurAnimation;
static void SetBones( const msAnimation* pAnimation, float fFrame, vector<myBone_t> &vpBones ); static void SetBones( const msAnimation* pAnimation, float fFrame, vector<myBone_t> &vpBones );
vector<myBone_t> m_vpBones; vector<myBone_t> m_vpBones;
// If any vertex has a bone weight, then then render from m_pTempGeometry. // If any vertex has a bone weight, then then render from m_pTempGeometry.
// Otherwise, render directly from m_pGeometry. // Otherwise, render directly from m_pGeometry.
@@ -73,16 +71,16 @@ private:
/* Keep a copy of the mesh data only if m_pTempGeometry is in use. The normal and /* Keep a copy of the mesh data only if m_pTempGeometry is in use. The normal and
* position data will be changed; the rest is static and kept only to prevent making * position data will be changed; the rest is static and kept only to prevent making
* a complete copy. */ * a complete copy. */
vector<msMesh> m_vTempMeshes; vector<msMesh> m_vTempMeshes;
void DrawMesh( int i ) const; void DrawMesh( int i ) const;
void AdvanceFrame( float fDeltaTime ); void AdvanceFrame( float fDeltaTime );
float m_fCurFrame; float m_fCurFrame;
RString m_sDefaultAnimation; RString m_sDefaultAnimation;
float m_fDefaultAnimationRate; float m_fDefaultAnimationRate;
float m_fCurAnimationRate; float m_fCurAnimationRate;
bool m_bLoop; bool m_bLoop;
}; };
#endif #endif
src/RageUtil.h
+1 -1
View File
@@ -581,7 +581,7 @@ struct char_traits_char_nocase: public char_traits<char>
}; };
typedef basic_string<char,char_traits_char_nocase> istring; typedef basic_string<char,char_traits_char_nocase> istring;
/* Compatibility/convenience shortcuts. These are actually defined in RageFileManager.h, but /* Compatibility/convenience shortcuts. These are actually defined in RageFileManager.h, but
* declared here since they're used in many places. */ * declared here since they're used in many places. */
void GetDirListing( const RString &sPath, vector<RString> &AddTo, bool bOnlyDirs=false, bool bReturnPathToo=false ); void GetDirListing( const RString &sPath, vector<RString> &AddTo, bool bOnlyDirs=false, bool bReturnPathToo=false );
void GetDirListingRecursive( const RString &sDir, const RString &sMatch, vector<RString> &AddTo ); /* returns path too */ void GetDirListingRecursive( const RString &sDir, const RString &sMatch, vector<RString> &AddTo ); /* returns path too */