From b769b53fd286b72f9a43440f70854a0a8392109d Mon Sep 17 00:00:00 2001 From: AJ Kelly Date: Fri, 30 Apr 2010 12:37:19 -0500 Subject: [PATCH] cleanup/comment --- src/GameCommand.cpp | 4 ++-- src/Model.h | 18 ++++++++---------- src/RageUtil.h | 2 +- 3 files changed, 11 insertions(+), 13 deletions(-) diff --git a/src/GameCommand.cpp b/src/GameCommand.cpp index 40f08f7060..41781eb7c1 100644 --- a/src/GameCommand.cpp +++ b/src/GameCommand.cpp @@ -259,7 +259,7 @@ void GameCommand::LoadOne( const Command& cmd ) { RString sSteps = sValue; - /* This must be processed after "song" and "style" commands. */ + // This must be processed after "song" and "style" commands. if( !m_bInvalid ) { Song *pSong = (m_pSong != NULL)? m_pSong:GAMESTATE->m_pCurSong; @@ -294,7 +294,7 @@ void GameCommand::LoadOne( const Command& cmd ) { RString sTrail = sValue; - /* This must be processed after "course" and "style" commands. */ + // This must be processed after "course" and "style" commands. if( !m_bInvalid ) { Course *pCourse = (m_pCourse != NULL)? m_pCourse:GAMESTATE->m_pCurCourse; diff --git a/src/Model.h b/src/Model.h index 74b857d1d6..e332892fbf 100644 --- a/src/Model.h +++ b/src/Model.h @@ -50,9 +50,7 @@ public: bool MaterialsNeedNormals() const; - // // Lua - // virtual void PushSelf( lua_State *L ); private: @@ -63,26 +61,26 @@ private: const msAnimation* m_pCurAnimation; static void SetBones( const msAnimation* pAnimation, float fFrame, vector &vpBones ); - vector m_vpBones; + vector m_vpBones; // If any vertex has a bone weight, then then render from m_pTempGeometry. // Otherwise, render directly from m_pGeometry. RageCompiledGeometry* m_pTempGeometry; void UpdateTempGeometry(); - + /* 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 * a complete copy. */ - vector m_vTempMeshes; + vector m_vTempMeshes; void DrawMesh( int i ) const; void AdvanceFrame( float fDeltaTime ); - float m_fCurFrame; - RString m_sDefaultAnimation; - float m_fDefaultAnimationRate; - float m_fCurAnimationRate; - bool m_bLoop; + float m_fCurFrame; + RString m_sDefaultAnimation; + float m_fDefaultAnimationRate; + float m_fCurAnimationRate; + bool m_bLoop; }; #endif diff --git a/src/RageUtil.h b/src/RageUtil.h index 1978dfb54d..e96a026c29 100644 --- a/src/RageUtil.h +++ b/src/RageUtil.h @@ -581,7 +581,7 @@ struct char_traits_char_nocase: public char_traits }; typedef basic_string 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. */ void GetDirListing( const RString &sPath, vector &AddTo, bool bOnlyDirs=false, bool bReturnPathToo=false ); void GetDirListingRecursive( const RString &sDir, const RString &sMatch, vector &AddTo ); /* returns path too */