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

cleanup

Browse Source
This commit is contained in:
Glenn Maynard
2005-07-05 23:55:42 +00:00
parent 73da8c0445
commit 0137a20389
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/Model.cpp
+1 -1
View File
@@ -5,7 +5,7 @@
#include "RageDisplay.h" #include "RageDisplay.h"
#include "RageUtil.h" #include "RageUtil.h"
#include "RageTextureManager.h" #include "RageTextureManager.h"
#include "IniFile.h" #include "XmlFile.h"
#include "RageFile.h" #include "RageFile.h"
#include "RageLog.h" #include "RageLog.h"
#include "ActorUtil.h" #include "ActorUtil.h"
stepmania/src/Model.h
+6 -4
View File
@@ -8,7 +8,9 @@
#include "ModelTypes.h" #include "ModelTypes.h"
#include <vector> #include <vector>
#include <map> #include <map>
#include "RageModelGeometry.h"
class RageModelGeometry;
class RageCompiledGeometry;
class Model : public Actor class Model : public Actor
{ {
@@ -32,7 +34,6 @@ public:
virtual bool EarlyAbortDraw(); virtual bool EarlyAbortDraw();
virtual void DrawPrimitives(); virtual void DrawPrimitives();
void AdvanceFrame (float dt);
void DrawCelShaded(); void DrawCelShaded();
virtual int GetNumStates() const; virtual int GetNumStates() const;
@@ -40,14 +41,14 @@ public:
virtual float GetAnimationLengthSeconds() const; virtual float GetAnimationLengthSeconds() const;
virtual void SetSecondsIntoAnimation( float fSeconds ); virtual void SetSecondsIntoAnimation( float fSeconds );
CString GetDefaultAnimation() { return m_sDefaultAnimation; }; CString GetDefaultAnimation() const { return m_sDefaultAnimation; };
void SetDefaultAnimation( CString sAnimation, float fPlayRate = 1 ); void SetDefaultAnimation( CString sAnimation, float fPlayRate = 1 );
bool m_bRevertToDefaultAnimation; bool m_bRevertToDefaultAnimation;
bool MaterialsNeedNormals() const; bool MaterialsNeedNormals() const;
// //
// Commands // Lua
// //
virtual void PushSelf( lua_State *L ); virtual void PushSelf( lua_State *L );
@@ -72,6 +73,7 @@ private:
vector<msMesh> m_vTempMeshes; vector<msMesh> m_vTempMeshes;
void DrawMesh( int i ) const; void DrawMesh( int i ) const;
void AdvanceFrame( float fDeltaTime );
float m_fCurFrame; float m_fCurFrame;
CString m_sDefaultAnimation; CString m_sDefaultAnimation;