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

const stuff

Browse Source
This commit is contained in:
Glenn Maynard
2002-08-29 21:30:16 +00:00
parent e28dca7fe1
commit e96941e288
2 changed files with 17 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/RageDisplay.cpp
+6 -6
View File
@@ -626,7 +626,7 @@ void RageDisplay::PopMatrix()
m_MatrixStack.RemoveAt( m_MatrixStack.GetSize()-1 ); m_MatrixStack.RemoveAt( m_MatrixStack.GetSize()-1 );
} }
void RageDisplay::Translate( const float x, const float y, const float z ) void RageDisplay::Translate( float x, float y, float z )
{ {
D3DXMATRIX matTemp; D3DXMATRIX matTemp;
D3DXMatrixTranslation( &matTemp, x, y, z ); D3DXMatrixTranslation( &matTemp, x, y, z );
@@ -634,7 +634,7 @@ void RageDisplay::Translate( const float x, const float y, const float z )
matTop = matTemp * matTop; matTop = matTemp * matTop;
} }
void RageDisplay::TranslateLocal( const float x, const float y, const float z ) void RageDisplay::TranslateLocal( float x, float y, float z )
{ {
D3DXMATRIX matTemp; D3DXMATRIX matTemp;
D3DXMatrixTranslation( &matTemp, x, y, z ); D3DXMatrixTranslation( &matTemp, x, y, z );
@@ -642,7 +642,7 @@ void RageDisplay::TranslateLocal( const float x, const float y, const float z )
matTop = matTop * matTemp; matTop = matTop * matTemp;
} }
void RageDisplay::Scale( const float x, const float y, const float z ) void RageDisplay::Scale( float x, float y, float z )
{ {
D3DXMATRIX matTemp; D3DXMATRIX matTemp;
D3DXMatrixScaling( &matTemp, x, y, z ); D3DXMatrixScaling( &matTemp, x, y, z );
@@ -650,7 +650,7 @@ void RageDisplay::Scale( const float x, const float y, const float z )
matTop = matTemp * matTop; matTop = matTemp * matTop;
} }
void RageDisplay::RotateX( const float r ) void RageDisplay::RotateX( float r )
{ {
D3DXMATRIX matTemp; D3DXMATRIX matTemp;
D3DXMatrixRotationX( &matTemp, r ); D3DXMatrixRotationX( &matTemp, r );
@@ -658,7 +658,7 @@ void RageDisplay::RotateX( const float r )
matTop = matTemp * matTop; matTop = matTemp * matTop;
} }
void RageDisplay::RotateY( const float r ) void RageDisplay::RotateY( float r )
{ {
D3DXMATRIX matTemp; D3DXMATRIX matTemp;
D3DXMatrixRotationY( &matTemp, r ); D3DXMatrixRotationY( &matTemp, r );
@@ -666,7 +666,7 @@ void RageDisplay::RotateY( const float r )
matTop = matTemp * matTop; matTop = matTemp * matTop;
} }
void RageDisplay::RotateZ( const float r ) void RageDisplay::RotateZ( float r )
{ {
D3DXMATRIX matTemp; D3DXMATRIX matTemp;
D3DXMatrixRotationZ( &matTemp, r ); D3DXMatrixRotationZ( &matTemp, r );
stepmania/src/RageDisplay.h
+11 -13
View File
@@ -55,7 +55,7 @@ public:
// LPDIRECT3D8 GetD3D() { return m_pd3d; }; // LPDIRECT3D8 GetD3D() { return m_pd3d; };
// inline LPDIRECT3DDEVICE8 GetDevice() { return m_pd3dDevice; }; // inline LPDIRECT3DDEVICE8 GetDevice() { return m_pd3dDevice; };
const D3DCAPS8& GetDeviceCaps() { return m_DeviceCaps; }; const D3DCAPS8& GetDeviceCaps() const { return m_DeviceCaps; };
HRESULT Reset(); HRESULT Reset();
HRESULT BeginFrame(); HRESULT BeginFrame();
@@ -80,17 +80,17 @@ public:
void ResetMatrixStack(); void ResetMatrixStack();
void PushMatrix(); void PushMatrix();
void PopMatrix(); void PopMatrix();
void Translate( const float x, const float y, const float z ); void Translate( float x, float y, float z );
void TranslateLocal( const float x, const float y, const float z ); void TranslateLocal( float x, float y, float z );
void Scale( const float x, const float y, const float z ); void Scale( float x, float y, float z );
void RotateX( const float r ); void RotateX( float r );
void RotateY( const float r ); void RotateY( float r );
void RotateZ( const float r ); void RotateZ( float r );
// void RotateYawPitchRoll( const float x, const float y, const float z ); // void RotateYawPitchRoll( const float x, const float y, const float z );
int GetFPS() { return m_iFPS; }; int GetFPS() const { return m_iFPS; };
int GetTPF() { return m_iTPF; }; int GetTPF() const { return m_iTPF; };
int GetDPF() { return m_iDPF; }; int GetDPF() const { return m_iDPF; };
void GetHzAtResolution(int width, int height, int bpp, CArray<int,int> &add) const; void GetHzAtResolution(int width, int height, int bpp, CArray<int,int> &add) const;
@@ -123,9 +123,7 @@ private:
int m_iFramesRenderedSinceLastCheck; int m_iFramesRenderedSinceLastCheck;
int m_iTrianglesRenderedSinceLastCheck; int m_iTrianglesRenderedSinceLastCheck;
int m_iDrawsSinceLastCheck; int m_iDrawsSinceLastCheck;
int m_iFPS; int m_iFPS, m_iTPF, m_iDPF;
int m_iTPF;
int m_iDPF;
// //