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

more bitmap font work

Browse Source
This commit is contained in:
Glenn Maynard
2003-01-04 05:17:51 +00:00
parent 4bb452404c
commit db04a85622
2 changed files with 98 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/BitmapText.cpp
+7 -15
View File
@@ -55,7 +55,7 @@ BitmapText::BitmapText()
BitmapText::~BitmapText()
{
if( m_pFont )
FONT->UnloadFont( m_pFont->m_sTexturePath );
FONT->UnloadFont( m_pFont );
}
bool BitmapText::LoadFromFont( CString sFontFilePath )
@@ -63,7 +63,7 @@ bool BitmapText::LoadFromFont( CString sFontFilePath )
LOG->Trace( "BitmapText::LoadFromFontName(%s)", sFontFilePath.GetString() );
if( m_pFont ) {
FONT->UnloadFont( m_pFont->m_sTexturePath );
FONT->UnloadFont( m_pFont );
m_pFont = NULL;
}
@@ -79,7 +79,7 @@ bool BitmapText::LoadFromTextureAndChars( CString sTexturePath, CString sChars )
LOG->Trace( "BitmapText::LoadFromTextureAndChars(%s)", sTexturePath.GetString() );
if( m_pFont ) {
FONT->UnloadFont( m_pFont->m_sTexturePath );
FONT->UnloadFont( m_pFont );
m_pFont = NULL;
}
@@ -96,9 +96,6 @@ void BitmapText::SetText( CString sText )
{
ASSERT( m_pFont );
if( m_pFont->m_bCapitalsOnly )
sText.MakeUpper();
m_szText = sText;
/* Break the string into lines. */
@@ -139,7 +136,8 @@ void BitmapText::DrawPrimitives()
if( m_szTextLines.empty() )
return;
RageTexture* pTexture = m_pFont->m_pTexture;
/* XXX */
RageTexture* pTexture = m_pFont->GetGlyph('0').Texture;
static RageVertex *v = NULL;
static int vcnt = 0;
@@ -189,13 +187,7 @@ void BitmapText::DrawPrimitives()
for( unsigned j=0; j<szLine.size(); j++ ) // for each character in the line
{
const char c = szLine[j];
if(m_pFont->m_iCharToFrameNo.find(c) == m_pFont->m_iCharToFrameNo.end())
RageException::Throw( "The font '%s' does not implement the character '%c'", m_sFontFilePath.GetString(), c );
const int iFrameNo = m_pFont->m_iCharToFrameNo[ (unsigned char)c ];
const glyph &g = m_pFont->GetGlyph(iFrameNo);
const glyph &g = m_pFont->GetGlyph(szLine[j]);
/* set vertex positions */
v[iNumV++].p = RageVector3( (float)iX+g.hshift, iY+g.vshift, 0 ); // top left
@@ -204,7 +196,7 @@ void BitmapText::DrawPrimitives()
v[iNumV++].p = RageVector3( (float)iX+g.hshift+g.width, iY+g.vshift, 0 ); // top right
/* Advance the cursor. */
iX += g.advance;
iX += g.hadvance;
/* set texture coordinates */
iNumV -= 4;