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

simplify

Browse Source
This commit is contained in:
Glenn Maynard
2007-02-09 04:36:51 +00:00
parent 6cbc0577e9
commit edeb62afed
2 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/StreamDisplay.cpp
+5 -7
View File
@@ -6,7 +6,6 @@
StreamDisplay::StreamDisplay() StreamDisplay::StreamDisplay()
{ {
m_fMeterHeight = 1;
m_fMeterWidth = 1; m_fMeterWidth = 1;
m_iNumStrips = 1; m_iNumStrips = 1;
m_iNumChambers = 1; m_iNumChambers = 1;
@@ -31,14 +30,13 @@ void StreamDisplay::Load(
) )
{ {
m_fMeterWidth = fMeterWidth; m_fMeterWidth = fMeterWidth;
m_fMeterHeight = fMeterHeight;
m_iNumStrips = iNumStrips; m_iNumStrips = iNumStrips;
m_iNumChambers = iNumChambers; m_iNumChambers = iNumChambers;
m_quadMask.SetBlendMode( BLEND_NO_EFFECT ); m_quadMask.SetBlendMode( BLEND_NO_EFFECT );
m_quadMask.SetZWrite( true ); m_quadMask.SetZWrite( true );
m_quadMask.ZoomToWidth( m_fMeterWidth ); m_quadMask.ZoomToWidth( m_fMeterWidth );
m_quadMask.ZoomToHeight( m_fMeterHeight ); m_quadMask.ZoomToHeight( fMeterHeight );
RString sGraphicPath; RString sGraphicPath;
RageTextureID ID; RageTextureID ID;
@@ -47,16 +45,20 @@ void StreamDisplay::Load(
ID.filename = sNormalPath; ID.filename = sNormalPath;
m_sprStreamNormal.Load( ID ); m_sprStreamNormal.Load( ID );
m_sprStreamNormal.SetUseZBuffer( true ); m_sprStreamNormal.SetUseZBuffer( true );
m_sprStreamNormal.ZoomToHeight( fMeterHeight );
m_sprStreamNormal.RunCommands( acNormalOnCommand ); m_sprStreamNormal.RunCommands( acNormalOnCommand );
ID.filename = sHotPath; ID.filename = sHotPath;
m_sprStreamHot.Load( ID ); m_sprStreamHot.Load( ID );
m_sprStreamHot.SetUseZBuffer( true ); m_sprStreamHot.SetUseZBuffer( true );
m_sprStreamHot.ZoomToHeight( fMeterHeight );
m_sprStreamHot.RunCommands( acHotOnCommand ); m_sprStreamHot.RunCommands( acHotOnCommand );
ID.filename = sPassingPath; ID.filename = sPassingPath;
m_sprStreamPassing.Load( ID ); m_sprStreamPassing.Load( ID );
m_sprStreamPassing.SetUseZBuffer( true ); m_sprStreamPassing.SetUseZBuffer( true );
m_sprStreamPassing.ZoomToHeight( fMeterHeight );
m_sprStreamPassing.RunCommands( acPassingOnCommand ); m_sprStreamPassing.RunCommands( acPassingOnCommand );
} }
@@ -193,10 +195,6 @@ void StreamDisplay::DrawStrip( float fRightEdgePercent, float fStripWidthInPerce
m_sprStreamPassing.ZoomToWidth( m_fMeterWidth*fStripWidthInPercent ); m_sprStreamPassing.ZoomToWidth( m_fMeterWidth*fStripWidthInPercent );
m_sprStreamHot.ZoomToWidth( m_fMeterWidth*fStripWidthInPercent ); m_sprStreamHot.ZoomToWidth( m_fMeterWidth*fStripWidthInPercent );
m_sprStreamNormal.ZoomToHeight( m_fMeterHeight );
m_sprStreamPassing.ZoomToHeight( m_fMeterHeight );
m_sprStreamHot.ZoomToHeight( m_fMeterHeight );
m_sprStreamNormal.SetHorizAlign( align_right ); m_sprStreamNormal.SetHorizAlign( align_right );
m_sprStreamPassing.SetHorizAlign( align_right ); m_sprStreamPassing.SetHorizAlign( align_right );
m_sprStreamHot.SetHorizAlign( align_right ); m_sprStreamHot.SetHorizAlign( align_right );
stepmania/src/StreamDisplay.h
-1
View File
@@ -37,7 +37,6 @@ private:
Sprite m_sprStreamPassing; Sprite m_sprStreamPassing;
Quad m_quadMask; Quad m_quadMask;
float m_fMeterHeight;
float m_fMeterWidth; float m_fMeterWidth;
int m_iNumStrips; int m_iNumStrips;
int m_iNumChambers; int m_iNumChambers;