The pulse effect is now done using the center of teh widget as the center for the scale transformation, and removed a minor warning.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@1440 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
parent
56db981ece
commit
fa90139fc8
@ -44,7 +44,7 @@ public:
|
|||||||
void set(UserPointerType t, void* p)
|
void set(UserPointerType t, void* p)
|
||||||
{ m_user_pointer_type=t;
|
{ m_user_pointer_type=t;
|
||||||
m_pointer =p; }
|
m_pointer =p; }
|
||||||
UserPointer(): m_user_pointer_type(UP_UNDEF),m_pointer(NULL) {};
|
UserPointer(): m_pointer(NULL),m_user_pointer_type(UP_UNDEF) {};
|
||||||
UserPointer(UserPointerType t, void* p) {set(t,p);}
|
UserPointer(UserPointerType t, void* p) {set(t,p);}
|
||||||
};
|
};
|
||||||
#endif
|
#endif
|
||||||
|
@ -355,9 +355,11 @@ void Widget::update(const float DELTA)
|
|||||||
|
|
||||||
if( draw )
|
if( draw )
|
||||||
{
|
{
|
||||||
|
glScalef(m_text_scale, m_text_scale, 1.0f);
|
||||||
m_font->Print(m_text.substr(line_start, line_end - line_start).c_str(), m_text_size,
|
m_font->Print(m_text.substr(line_start, line_end - line_start).c_str(), m_text_size,
|
||||||
x_pos, y_pos - m_text_size / 2,
|
x_pos, y_pos - m_text_size / 2,
|
||||||
255, 255, 255, m_text_scale, m_text_scale);
|
255, 255, 255, 1.0f, 1.0f);
|
||||||
|
glScalef(1.0f/m_text_scale, 1.0f/m_text_scale, 1.0f);
|
||||||
}
|
}
|
||||||
|
|
||||||
y_pos -= m_text_size;
|
y_pos -= m_text_size;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user