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

simplify

Browse Source 
set size
This commit is contained in:
Glenn Maynard
2007-02-09 05:13:49 +00:00
parent 101bf0a85f
commit 98f9d9edaf
2 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/StreamDisplay.cpp
+11 -9
View File
@@ -6,7 +6,6 @@
StreamDisplay::StreamDisplay() StreamDisplay::StreamDisplay()
{ {
m_fMeterWidth = 1;
m_iNumStrips = 1; m_iNumStrips = 1;
m_iNumChambers = 1; m_iNumChambers = 1;
m_fPercent = 0; m_fPercent = 0;
@@ -29,13 +28,15 @@ void StreamDisplay::Load(
const apActorCommands &acPassingOnCommand const apActorCommands &acPassingOnCommand
) )
{ {
m_fMeterWidth = fMeterWidth; m_size.x = fMeterWidth;
m_size.y = 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( fMeterWidth );
m_quadMask.ZoomToHeight( fMeterHeight ); m_quadMask.ZoomToHeight( fMeterHeight );
RString sGraphicPath; RString sGraphicPath;
@@ -198,14 +199,15 @@ void StreamDisplay::DrawStrip( float fRightEdgePercent )
m_sprStreamPassing.SetHorizAlign( align_right ); m_sprStreamPassing.SetHorizAlign( align_right );
m_sprStreamHot.SetHorizAlign( align_right ); m_sprStreamHot.SetHorizAlign( align_right );
m_sprStreamNormal.SetX( -m_fMeterWidth/2 + m_fMeterWidth*fRightEdgePercent ); float fMeterWidth = this->GetUnzoomedWidth();
m_sprStreamPassing.SetX( -m_fMeterWidth/2 + m_fMeterWidth*fRightEdgePercent ); m_sprStreamNormal.SetX( -fMeterWidth/2 + fMeterWidth*fRightEdgePercent );
m_sprStreamHot.SetX( -m_fMeterWidth/2 + m_fMeterWidth*fRightEdgePercent ); m_sprStreamPassing.SetX( -fMeterWidth/2 + fMeterWidth*fRightEdgePercent );
m_sprStreamHot.SetX( -fMeterWidth/2 + fMeterWidth*fRightEdgePercent );
const float fMeterLeftEdgePixels = SCALE( 0.0f, 0.0f, 1.0f, -m_fMeterWidth/2, +m_fMeterWidth/2 ); const float fMeterLeftEdgePixels = SCALE( 0.0f, 0.0f, 1.0f, -fMeterWidth/2, +fMeterWidth/2 );
const float fMeterRightEdgePixels = SCALE( 1.0f, 0.0f, 1.0f, -m_fMeterWidth/2, +m_fMeterWidth/2 ); const float fMeterRightEdgePixels = SCALE( 1.0f, 0.0f, 1.0f, -fMeterWidth/2, +fMeterWidth/2 );
const float fStreamRightEdgePixels = SCALE( fRightEdgePercent, 0.0f, 1.0f, -m_fMeterWidth/2, +m_fMeterWidth/2 ); const float fStreamRightEdgePixels = SCALE( fRightEdgePercent, 0.0f, 1.0f, -fMeterWidth/2, +fMeterWidth/2 );
const float fStreamLeftEdgePixels = fStreamRightEdgePixels - m_sprStreamNormal.GetZoomedWidth(); const float fStreamLeftEdgePixels = fStreamRightEdgePixels - m_sprStreamNormal.GetZoomedWidth();
const float fLeftOverhangPixels = max( 0, fMeterLeftEdgePixels - fStreamLeftEdgePixels ); const float fLeftOverhangPixels = max( 0, fMeterLeftEdgePixels - fStreamLeftEdgePixels );
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_fMeterWidth;
int m_iNumStrips; int m_iNumStrips;
int m_iNumChambers; int m_iNumChambers;
float m_fPercent; float m_fPercent;