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-05-25 04:44:32 +00:00
parent 8ac202f9f6
commit a49bfd5e74
2 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/GraphDisplay.cpp
+14 -14
View File
@@ -134,7 +134,7 @@ void GraphDisplay::UpdateVerts()
int NumSlices = VALUE_RESOLUTION-1; int NumSlices = VALUE_RESOLUTION-1;
for( int i = 0; i < 4*NumSlices; ++i ) for( int i = 0; i < 4*NumSlices; ++i )
Slices[i].c = RageColor(1,1,1,1); m_Slices[i].c = RageColor(1,1,1,1);
for( int i = 0; i < NumSlices; ++i ) for( int i = 0; i < NumSlices; ++i )
{ {
@@ -143,23 +143,23 @@ void GraphDisplay::UpdateVerts()
const float LeftTop = SCALE( float(m_CurValues[i]), 0.0f, 1.0f, m_quadVertices.bottom, m_quadVertices.top ); const float LeftTop = SCALE( float(m_CurValues[i]), 0.0f, 1.0f, m_quadVertices.bottom, m_quadVertices.top );
const float RightTop = SCALE( float(m_CurValues[i+1]), 0.0f, 1.0f, m_quadVertices.bottom, m_quadVertices.top ); const float RightTop = SCALE( float(m_CurValues[i+1]), 0.0f, 1.0f, m_quadVertices.bottom, m_quadVertices.top );
Slices[i*4+0].p = RageVector3( Left, LeftTop, 0 ); // top left m_Slices[i*4+0].p = RageVector3( Left, LeftTop, 0 ); // top left
Slices[i*4+1].p = RageVector3( Left, m_quadVertices.bottom, 0 ); // bottom left m_Slices[i*4+1].p = RageVector3( Left, m_quadVertices.bottom, 0 ); // bottom left
Slices[i*4+2].p = RageVector3( Right, m_quadVertices.bottom, 0 ); // bottom right m_Slices[i*4+2].p = RageVector3( Right, m_quadVertices.bottom, 0 ); // bottom right
Slices[i*4+3].p = RageVector3( Right, RightTop, 0 ); // top right m_Slices[i*4+3].p = RageVector3( Right, RightTop, 0 ); // top right
// Slices[i*4+0].c = RageColor(.2,.2,.2,1); // m_Slices[i*4+0].c = RageColor(.2,.2,.2,1);
// Slices[i*4+1].c = RageColor(1,1,1,1); // m_Slices[i*4+1].c = RageColor(1,1,1,1);
// Slices[i*4+2].c = RageColor(1,1,1,1); // m_Slices[i*4+2].c = RageColor(1,1,1,1);
// Slices[i*4+3].c = RageColor(.2,.2,.2,1); // m_Slices[i*4+3].c = RageColor(.2,.2,.2,1);
} }
const RectF *tex = m_pTexture->GetTextureCoordRect( 0 ); const RectF *tex = m_pTexture->GetTextureCoordRect( 0 );
for( unsigned i = 0; i < ARRAYSIZE(Slices); ++i ) for( unsigned i = 0; i < ARRAYSIZE(m_Slices); ++i )
{ {
Slices[i].t = RageVector2( m_Slices[i].t = RageVector2(
SCALE( Slices[i].p.x, m_quadVertices.left, m_quadVertices.right, tex->left, tex->right ), SCALE( m_Slices[i].p.x, m_quadVertices.left, m_quadVertices.right, tex->left, tex->right ),
SCALE( Slices[i].p.y, m_quadVertices.top, m_quadVertices.bottom, tex->top, tex->bottom ) SCALE( m_Slices[i].p.y, m_quadVertices.top, m_quadVertices.bottom, tex->top, tex->bottom )
); );
} }
} }
@@ -187,7 +187,7 @@ void GraphDisplay::DrawPrimitives()
// don't bother setting texture render states for a null texture // don't bother setting texture render states for a null texture
//Actor::SetTextureRenderStates(); //Actor::SetTextureRenderStates();
DISPLAY->DrawQuads( Slices, ARRAYSIZE(Slices) ); DISPLAY->DrawQuads( m_Slices, ARRAYSIZE(m_Slices) );
DISPLAY->SetTexture( 0, NULL ); DISPLAY->SetTexture( 0, NULL );
ActorFrame::DrawPrimitives(); ActorFrame::DrawPrimitives();
stepmania/src/GraphDisplay.h
+1 -1
View File
@@ -30,7 +30,7 @@ private:
float m_Position; float m_Position;
RectF m_quadVertices; RectF m_quadVertices;
RageSpriteVertex Slices[4*(VALUE_RESOLUTION-1)]; RageSpriteVertex m_Slices[4*(VALUE_RESOLUTION-1)];
RageTexture *m_pTexture; RageTexture *m_pTexture;