ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replaced the previous method of clipping the text outside of the bounds of a widget using the scissor test, and changed it for an stencil test, since the stencil test doesn't needs to be rectangular, thus, it doesn't shows text outside of the rounded borders or while rotating.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@1438 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
cosmosninja 2008-02-03 08:34:41 +00:00
parent 7d2e056752
commit 768c16ed38
3 changed files with 38 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/sdldrv.cpp
View File

@ -68,6 +68,14 @@ void drv_init()
{
SDL_Init(SDL_INIT_VIDEO | SDL_INIT_JOYSTICK | SDL_INIT_TIMER);
SDL_GL_SetAttribute(SDL_GL_RED_SIZE, 8);
SDL_GL_SetAttribute(SDL_GL_GREEN_SIZE, 8);
SDL_GL_SetAttribute(SDL_GL_BLUE_SIZE, 8);
SDL_GL_SetAttribute(SDL_GL_ALPHA_SIZE, 8);
SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
SDL_GL_SetAttribute(SDL_GL_DEPTH_SIZE, 24);
SDL_GL_SetAttribute(SDL_GL_STENCIL_SIZE, 1);
flags = SDL_OPENGL | SDL_HWSURFACE;
//detect if previous resolution crashed STK

50
src/widget.cpp
View File

@ -102,6 +102,7 @@ void Widget::update(const float DELTA)
* done first, till the one at the bottom.
*/
glClear( GL_STENCIL_BUFFER_BIT );
glTranslatef ( (GLfloat)(m_x + m_width * 0.5f), (GLfloat)(m_y + m_height * 0.5f), 0);
m_rotation_angle += m_rotation_speed * DELTA;
@ -139,18 +140,35 @@ void Widget::update(const float DELTA)
glDisable(GL_TEXTURE_2D);
}
if(m_enable_rect)
if(glIsList(m_rect_list))
{
if(glIsList(m_rect_list))
//FIXME: maybe there is some sort of stacking method to disable/enable
//color masking
if(!m_enable_rect)
{
glColor4fv(m_rect_color);
glCallList(m_rect_list);
glColorMask(GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE);
}
else
{
std::cerr << "Warning: widget tried to draw null rect list.\n";
std::cerr << "(Did you created the rect?)\n";
glColor4fv(m_rect_color);
}
//FIXME: I should probably revert the values to the defaults within the widget manager
//(if glPushAttrib() doesn't), but right now this is the only thing using the
//stencil test anyways.
glStencilFunc(GL_ALWAYS, 0x1, 0x1);
glStencilOp(GL_KEEP, GL_KEEP, GL_REPLACE);
glCallList(m_rect_list);
if(!m_enable_rect)
{
glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
}
}
else
{
std::cerr << "Warning: widget tried to draw null rect list.\n";
std::cerr << "(Did you created the rect?)\n";
}
if( m_enable_track )
@ -318,29 +336,19 @@ void Widget::update(const float DELTA)
size_t line_start = 0;
bool draw;
bool out_of_rect = false;
glEnable( GL_SCISSOR_TEST );
glStencilFunc(GL_EQUAL,0x1,0x1);
glStencilOp(GL_KEEP, GL_KEEP, GL_KEEP);
do
{
draw = true;
if(y_pos + m_text_size / 2 > m_height / 2 )
{
if(y_pos - m_text_size / 2 > m_height / 2) draw = false;
else
{
out_of_rect = true;
glScissor(m_x, m_y, m_width, m_height);
}
}
else if(y_pos + (m_height - m_text_size) / 2 < 0)
{
if(y_pos + (m_height + m_text_size) / 2 < 0) draw = false;
else
{
out_of_rect = true;
glScissor(m_x, m_y, m_width, m_height);
}
}
line_end = m_text.find_first_of('\n', line_start);
@ -355,13 +363,7 @@ void Widget::update(const float DELTA)
y_pos -= m_text_size;
line_start = line_end + 1;
if( out_of_rect )
{
out_of_rect = false;
glScissor(0, 0, user_config->m_width, user_config->m_height);
}
} while( line_end != std::string::npos );
glDisable( GL_SCISSOR_TEST );
}
glPopMatrix();
}

7
src/widget_manager.cpp
View File

@ -237,17 +237,18 @@ void WidgetManager::update(const float DELTA)
glOrtho(0.0, user_config->m_width, 0.0, user_config->m_height, -1.0, 1.0);
glMatrixMode(GL_MODELVIEW);
glPushAttrib(GL_LIGHTING_BIT |
GL_COLOR_BUFFER_BIT |
GL_DEPTH_BUFFER_BIT);
GL_DEPTH_BUFFER_BIT |
GL_STENCIL_BUFFER_BIT);
glEnable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
glEnable(GL_COLOR_MATERIAL);
glDisable(GL_LIGHTING);
glDisable(GL_DEPTH_TEST);
glDisable(GL_CULL_FACE ) ;
glDisable(GL_CULL_FACE);
glEnable (GL_STENCIL_TEST);
const int NUM_WIDGETS = (int)m_widgets.size();
for( int i = 0; i < NUM_WIDGETS; ++i)