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

Represent alignment as a float; eliminates selects. (I havn't

Browse Source 
yet decided whether these should be -1.0 ... +1.0, indicating
"fully left aligned" and "fully right aligned", or 0.0 ... 1.0,
indicating "anchor to this fractional position in m_size".
It may become the latter.)
This commit is contained in:
Glenn Maynard
2007-03-01 02:19:49 +00:00
parent f6b792490a
commit be4efcd0c2
5 changed files with 40 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/BitmapText.cpp
+14 -20
View File
@@ -188,14 +188,12 @@ void BitmapText::BuildChars()
/* There's padding between every line: */
m_size.y += iPadding * int(m_wTextLines.size()-1);
int iY; // the top position of the first row of characters
switch( m_VertAlign )
{
case VertAlign_Top: iY = 0; break;
case VertAlign_Middle: iY = -lrintf(m_size.y/2.0f); break;
case VertAlign_Bottom: iY = -(int)m_size.y; break;
default: ASSERT( false );
}
RageVector2 center = m_size;
// center.x *= m_fHorizAlign*-0.5f;
center.y *= m_fVertAlign*-0.5f;
// the top position of the first row of characters
int iY = lrintf(center.y - m_size.y/2.0f);
for( unsigned i=0; i<m_wTextLines.size(); i++ ) // foreach line
{
@@ -206,14 +204,8 @@ void BitmapText::BuildChars()
reverse( sLine.begin(), sLine.end() );
const int iLineWidth = m_iLineWidths[i];
int iX;
switch( m_HorizAlign )
{
case HorizAlign_Left: iX = 0; break;
case HorizAlign_Center: iX = -lrintf(iLineWidth/2.0f); break;
case HorizAlign_Right: iX = -iLineWidth; break;
default: ASSERT( false );
}
float fCenterX = iLineWidth * m_fHorizAlign * -0.5f;
int iX = lrintf(fCenterX - iLineWidth/2.0f);
for( unsigned i = 0; i < sLine.size(); ++i )
{
@@ -613,17 +605,19 @@ void BitmapText::DrawPrimitives()
/* Rebuild when these change. */
void BitmapText::SetHorizAlign( HorizAlign ha )
{
if( ha == m_HorizAlign )
return;
float fHorizAlign = m_fHorizAlign;
Actor::SetHorizAlign(ha);
if( fHorizAlign == m_fHorizAlign )
return;
BuildChars();
}
void BitmapText::SetVertAlign( VertAlign va )
{
if( va == m_VertAlign )
return;
float fVertAlign = m_fVertAlign;
Actor::SetVertAlign(va);
if( fVertAlign == m_fVertAlign )
return;
BuildChars();
}