remove unused StrokeIsUnder
This commit is contained in:
@@ -537,17 +537,6 @@ bool BitmapText::EarlyAbortDraw() const
|
||||
return m_wTextLines.empty();
|
||||
}
|
||||
|
||||
#define DRAW_STROKE \
|
||||
if( m_StrokeColor.a > 0 ) \
|
||||
{ \
|
||||
RageColor c = m_StrokeColor; \
|
||||
c.a *= m_pTempState->diffuse[0].a; \
|
||||
for( unsigned i=0; i<m_aVertices.size(); i++ ) \
|
||||
m_aVertices[i].c = c; \
|
||||
DrawChars( true ); \
|
||||
}
|
||||
|
||||
|
||||
// draw text at x, y using colorTop blended down to colorBottom, with size multiplied by scale
|
||||
void BitmapText::DrawPrimitives()
|
||||
{
|
||||
@@ -577,9 +566,13 @@ void BitmapText::DrawPrimitives()
|
||||
//
|
||||
// render the stroke
|
||||
//
|
||||
if( m_pFont->GetStrokeIsUnder() )
|
||||
if( m_StrokeColor.a > 0 )
|
||||
{
|
||||
DRAW_STROKE;
|
||||
RageColor c = m_StrokeColor;
|
||||
c.a *= m_pTempState->diffuse[0].a;
|
||||
for( unsigned i=0; i<m_aVertices.size(); i++ )
|
||||
m_aVertices[i].c = c;
|
||||
DrawChars( true );
|
||||
}
|
||||
|
||||
//
|
||||
@@ -668,14 +661,6 @@ void BitmapText::DrawPrimitives()
|
||||
m_aVertices[i+3].p -= jitter; // top right
|
||||
}
|
||||
}
|
||||
|
||||
//
|
||||
// render the stroke
|
||||
//
|
||||
if( !m_pFont->GetStrokeIsUnder() )
|
||||
{
|
||||
DRAW_STROKE;
|
||||
}
|
||||
}
|
||||
|
||||
/* render the glow pass */
|
||||
|
||||
@@ -229,7 +229,6 @@ Font::Font()
|
||||
m_pDefault = NULL;
|
||||
m_bRightToLeft = false;
|
||||
m_DefaultStrokeColor = RageColor(1,1,1,1);
|
||||
m_bStrokeIsUnder = true;
|
||||
}
|
||||
|
||||
Font::~Font()
|
||||
@@ -694,7 +693,6 @@ void Font::Load( const RString &sIniPath, RString sChars )
|
||||
RString s;
|
||||
if( ini.GetValue( "main", "DefaultStrokeColor", s ) )
|
||||
m_DefaultStrokeColor.FromString( s );
|
||||
ini.GetValue( "main", "StrokeIsUnder", m_bStrokeIsUnder );
|
||||
}
|
||||
|
||||
{
|
||||
|
||||
@@ -148,7 +148,6 @@ public:
|
||||
|
||||
bool IsRightToLeft() const { return m_bRightToLeft; };
|
||||
const RageColor &GetDefaultStrokeColor() const { return m_DefaultStrokeColor; };
|
||||
const bool GetStrokeIsUnder() const { return m_bStrokeIsUnder; };
|
||||
|
||||
private:
|
||||
/* List of pages and fonts that we use (and are responsible for freeing). */
|
||||
@@ -168,7 +167,6 @@ private:
|
||||
bool m_bRightToLeft;
|
||||
|
||||
RageColor m_DefaultStrokeColor;
|
||||
bool m_bStrokeIsUnder; // draw stroke under if true, over if false
|
||||
|
||||
/* We keep this around only for reloading. */
|
||||
RString m_sChars;
|
||||
|
||||
Reference in New Issue
Block a user