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:
Chris Danford
2005-05-02 03:06:56 +00:00
parent dd8e5e5cbb
commit 6facdccdfe
2 changed files with 46 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/StreamDisplay.cpp
+38 -34
View File
@@ -87,18 +87,25 @@ void StreamDisplay::DrawPrimitives()
DrawMask( m_fTrailingPercent ); // this is the "right endcap" to the life DrawMask( m_fTrailingPercent ); // this is the "right endcap" to the life
const float fChamberWidthInPercent = 1.0f/m_iNumChambers; const float fChamberWidthInPercent = 1.0f/m_iNumChambers;
float fStripWidthInPercent = 1.0f/m_iNumStrips;
float fPercentBetweenStrips = 1.0f/m_iNumStrips; float fPercentBetweenStrips = 1.0f/m_iNumStrips;
// round this so that the chamber overflows align
// round down so that the chamber overflows align
if( m_iNumChambers > 10 ) if( m_iNumChambers > 10 )
fPercentBetweenStrips = Quantize( fPercentBetweenStrips, fChamberWidthInPercent ); fPercentBetweenStrips = Quantize( fPercentBetweenStrips-fChamberWidthInPercent/2, fChamberWidthInPercent );
if( m_iNumChambers > 3 )
fPercentBetweenStrips -= 2*fChamberWidthInPercent;
float fPercentOffset = fmodf( GAMESTATE->m_fSongBeat/4+1000, fPercentBetweenStrips ); float fPercentOffset = fmodf( GAMESTATE->m_fSongBeat/4+1000, fPercentBetweenStrips );
ASSERT( fPercentOffset >= 0 && fPercentOffset <= fPercentBetweenStrips ); ASSERT( fPercentOffset >= 0 && fPercentOffset <= fPercentBetweenStrips );
for( float f=fPercentOffset+1; f>=0; f-=fPercentBetweenStrips ) // "+fPercentBetweenStrips" so that the whole area is overdrawn 2x
for( float f=fPercentOffset+1+fPercentBetweenStrips; f>=0; f-=fPercentBetweenStrips )
{ {
DrawMask( f ); DrawMask( f );
DrawStrip( f ); DrawStrip( f, fStripWidthInPercent );
} }
} }
@@ -151,47 +158,44 @@ float StreamDisplay::GetHeightPercent( int iChamber, float fChamberOverflowPerce
return 0; return 0;
} }
void StreamDisplay::DrawStrip( float fRightEdgePercent ) void StreamDisplay::DrawStrip( float fRightEdgePercent, float fStripWidthInPercent )
{ {
RectF rect; m_sprStreamNormal.ZoomToWidth( m_fMeterWidth*fStripWidthInPercent );
m_sprStreamPassing.ZoomToWidth( m_fMeterWidth*fStripWidthInPercent );
m_sprStreamHot.ZoomToWidth( m_fMeterWidth*fStripWidthInPercent );
const float fChamberWidthInPercent = 1.0f/m_iNumChambers; m_sprStreamNormal.ZoomToHeight( m_fMeterHeight );
const float fStripWidthInPercent = 1.0f/m_iNumStrips; m_sprStreamPassing.ZoomToHeight( m_fMeterHeight );
m_sprStreamHot.ZoomToHeight( m_fMeterHeight );
const float fCorrectedRightEdgePercent = fRightEdgePercent + fChamberWidthInPercent; m_sprStreamNormal.SetHorizAlign( Actor::align_right );
const float fCorrectedStripWidthInPercent = fStripWidthInPercent + 2*fChamberWidthInPercent; m_sprStreamPassing.SetHorizAlign( Actor::align_right );
const float fCorrectedLeftEdgePercent = fCorrectedRightEdgePercent - fCorrectedStripWidthInPercent; m_sprStreamHot.SetHorizAlign( Actor::align_right );
m_sprStreamNormal.SetX( -m_fMeterWidth/2 + m_fMeterWidth*fRightEdgePercent );
m_sprStreamPassing.SetX( -m_fMeterWidth/2 + m_fMeterWidth*fRightEdgePercent );
m_sprStreamHot.SetX( -m_fMeterWidth/2 + m_fMeterWidth*fRightEdgePercent );
// set size of streams const float fMeterLeftEdgePixels = SCALE( 0.0f, 0.0f, 1.0f, -m_fMeterWidth/2, +m_fMeterWidth/2 );
rect.left = -m_fMeterWidth/2 + m_fMeterWidth*max(0,fCorrectedLeftEdgePercent); const float fMeterRightEdgePixels = SCALE( 1.0f, 0.0f, 1.0f, -m_fMeterWidth/2, +m_fMeterWidth/2 );
rect.top = -m_fMeterHeight/2;
rect.right = -m_fMeterWidth/2 + m_fMeterWidth*min(1,fCorrectedRightEdgePercent);
rect.bottom = +m_fMeterHeight/2;
ASSERT( rect.left <= m_fMeterWidth/2 && rect.right <= m_fMeterWidth/2 ); const float fStreamRightEdgePixels = SCALE( fRightEdgePercent, 0.0f, 1.0f, -m_fMeterWidth/2, +m_fMeterWidth/2 );
const float fStreamLeftEdgePixels = fStreamRightEdgePixels - m_sprStreamNormal.GetZoomedWidth();
float fPercentCroppedFromLeft = max( 0, -fCorrectedLeftEdgePercent ); const float fLeftOverhangPixels = max( 0, fMeterLeftEdgePixels - fStreamLeftEdgePixels );
float fPercentCroppedFromRight = max( 0, fCorrectedRightEdgePercent-1 ); const float fStreamCropLeftPercent = SCALE( fLeftOverhangPixels, 0.0f, m_sprStreamNormal.GetZoomedWidth(), 0.0f, 1.0f );
const float fRightOverhangPixels = max( 0, fStreamRightEdgePixels - fMeterRightEdgePixels );
const float fStreamCropRightPercent = SCALE( fRightOverhangPixels, 0.0f, m_sprStreamNormal.GetZoomedWidth(), 0.0f, 1.0f );
m_sprStreamNormal.StretchTo( rect ); m_sprStreamNormal.SetCropLeft( fStreamCropLeftPercent );
m_sprStreamPassing.StretchTo( rect ); m_sprStreamPassing.SetCropLeft( fStreamCropLeftPercent );
m_sprStreamHot.StretchTo( rect ); m_sprStreamHot.SetCropLeft( fStreamCropLeftPercent );
m_sprStreamNormal.SetCropRight( fStreamCropRightPercent );
m_sprStreamPassing.SetCropRight(fStreamCropRightPercent );
m_sprStreamHot.SetCropRight( fStreamCropRightPercent );
// set custom texture coords
// float fPrecentOffset = fRightEdgePercent;
RectF frectCustomTexRect(
fPercentCroppedFromLeft,
0,
1-fPercentCroppedFromRight,
1);
m_sprStreamNormal.SetCustomTextureRect( frectCustomTexRect );
m_sprStreamPassing.SetCustomTextureRect( frectCustomTexRect );
m_sprStreamHot.SetCustomTextureRect( frectCustomTexRect );
float fOrigPassingAlpha = m_sprStreamPassing.GetDiffuse().a; float fOrigPassingAlpha = m_sprStreamPassing.GetDiffuse().a;
float fOrigHotAlpha = m_sprStreamHot.GetDiffuse().a; float fOrigHotAlpha = m_sprStreamHot.GetDiffuse().a;
stepmania/src/StreamDisplay.h
+1 -1
View File
@@ -61,7 +61,7 @@ private:
float GetChamberRightPercent( int iChamber ); float GetChamberRightPercent( int iChamber );
float GetRightEdgePercent( int iChamber, float fChamberOverflowPercent ); float GetRightEdgePercent( int iChamber, float fChamberOverflowPercent );
float GetHeightPercent( int iChamber, float fChamberOverflowPercent ); float GetHeightPercent( int iChamber, float fChamberOverflowPercent );
void DrawStrip( float fRightEdgePercent ); void DrawStrip( float fRightEdgePercent, float fStripWidthInPercent );
void DrawMask( float fPercent ); void DrawMask( float fPercent );
}; };