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

Add: allow limiting of restricting # of lines to display. Also, fix colors for restricted lines.

Browse Source
This commit is contained in:
Charles Lohr
2005-05-04 22:26:21 +00:00
parent 9af4ab306e
commit 7f69da7a00
1 changed files with 35 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/BitmapText.cpp
+35 -2
View File
@@ -367,9 +367,24 @@ void BitmapText::SetText( const CString& _sText, const CString& _sAlternateText,
m_vColors.clear(); m_vColors.clear();
int i = m_sText.Find( "|c0", 0 ); int i = m_sText.Find( "|c0", 0 );
int last = 0; int last = 0, iNewlineCount = -3;
while ( ( i > -1 ) && ( i < ( int( m_sText.length() ) - 9 ) ) ) while ( ( i > -1 ) && ( i < ( int( m_sText.length() ) - 9 ) ) )
{ {
int j = m_sText.Find( CString("\n"), last+1 );
//Count \n's from previous to now.
LOG->Info("M4");
while ( ( j < i ) && ( j >= 0 ) )
{
j = m_sText.Find( CString("\n"), j+1 );
iNewlineCount+=2;
}
LOG->Info("M5");
sEndText += m_sText.substr( last, i-last ); sEndText += m_sText.substr( last, i-last );
ColorChange change; ColorChange change;
int k; int k;
@@ -377,7 +392,7 @@ void BitmapText::SetText( const CString& _sText, const CString& _sAlternateText,
sscanf( m_sText.substr( i+5, 2 ).c_str(), "%x", &k ); change.c.g = float( k ) / 255.0f; sscanf( m_sText.substr( i+5, 2 ).c_str(), "%x", &k ); change.c.g = float( k ) / 255.0f;
sscanf( m_sText.substr( i+7, 2 ).c_str(), "%x", &k ); change.c.b = float( k ) / 255.0f; sscanf( m_sText.substr( i+7, 2 ).c_str(), "%x", &k ); change.c.b = float( k ) / 255.0f;
change.c.a = 1; change.c.a = 1;
change.l = sEndText.length(); change.l = sEndText.length() - MAX( iNewlineCount, 0 );
m_vColors.push_back( change ); m_vColors.push_back( change );
last = i+9; last = i+9;
if ( last < (int)m_sText.length() ) if ( last < (int)m_sText.length() )
@@ -595,6 +610,24 @@ void BitmapText::SetMaxLines( int iNumLines, int iDirection )
} }
else else
{ {
//Because colors are relative to the beginning, we have to crop them back
unsigned shift = 0;
LOG->Info("M1");
for ( unsigned i = 0; i < m_wTextLines.size() - iNumLines; i++ )
shift += m_wTextLines[i].length();
for ( unsigned i = 0; i < m_vColors.size(); i++ )
{
m_vColors[i].l -= shift;
if ( m_vColors[i].l < 0 )
{
m_vColors.erase( m_vColors.begin() + i );
i--;
}
}
LOG->Info("M2");
m_wTextLines.erase( m_wTextLines.begin(), m_wTextLines.end() - iNumLines ); m_wTextLines.erase( m_wTextLines.begin(), m_wTextLines.end() - iNumLines );
m_iLineWidths.erase( m_iLineWidths.begin(), m_iLineWidths.end() - iNumLines ); m_iLineWidths.erase( m_iLineWidths.begin(), m_iLineWidths.end() - iNumLines );
} }