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

Added sligh zoom-in effect for dialogs (effect is not perfect but better than nothing IMO)

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@4256 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
auria
2009-12-06 17:08:25 +00:00
parent 157d316fa5
commit 306fd93338
5 changed files with 93 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/guiengine/engine.hpp
View File

@@ -252,7 +252,8 @@ namespace GUIEngine
inline irr::gui::IGUIFont* getTitleFont() { return Private::g_title_font; }
inline Screen* getCurrentScreen() { return Private::g_current_screen; }
inline AbstractStateManager* getStateManager() { return Private::g_state_manager; }
inline Skin* getSkin() { return Private::g_skin; }
float getLatestDt();
/** Add a cutscene to the list of screens known by the gui engine */

7
src/guiengine/modaldialog.cpp
View File

@@ -50,11 +50,16 @@ ModalDialog::ModalDialog(const float percentWidth, const float percentHeight)
modalWindow = this;
m_irrlicht_window = GUIEngine::getGUIEnv()->addWindow ( m_area, true /* modal */ );
GUIEngine::getSkin()->m_dialog = true;
GUIEngine::getSkin()->m_dialog_size = 0.0f;
}
ModalDialog::~ModalDialog()
{
GUIEngine::getSkin()->m_dialog = false;
GUIEngine::getSkin()->m_dialog_size = 0.0f;
// irrLicht is to stupid to remove focus from deleted widgets
// so do it by hand
GUIEngine::getGUIEnv()->removeFocus( m_irrlicht_window );

90
src/guiengine/skin.cpp
View File

@@ -265,6 +265,9 @@ Skin::Skin(IGUISkin* fallback_skin)
m_fallback_skin = fallback_skin;
m_fallback_skin->grab();
assert(fallback_skin != NULL);
m_dialog = false;
m_dialog_size = 0.0f;
}
Skin::~Skin()
@@ -581,10 +584,30 @@ X##_yflip.LowerRightCorner.Y = w->dest_y + (w->dest_y2 - w->dest_y) - y1;}
void Skin::drawButton(Widget* w, const core::rect< s32 > &rect, const bool pressed, const bool focused)
{
if(focused)
drawBoxFromStretchableTexture(w, rect, SkinConfig::m_render_params["button::focused"]);
// if within an appearing dialog, grow
if (m_dialog && m_dialog_size < 1.0f && w->m_parent != NULL && w->m_parent->getType() == gui::EGUIET_WINDOW)
{
core::rect< s32 > sized_rect = rect;
core::position2d<u32> center = core::position2d<u32>(irr_driver->getFrameSize()/2);
const float size = sin(m_dialog_size*M_PI_2);
sized_rect.UpperLeftCorner.X = center.X + (int)(rect.UpperLeftCorner.X - center.X)*size;
sized_rect.UpperLeftCorner.Y = center.Y + (int)(rect.UpperLeftCorner.Y - center.Y)*size;
sized_rect.LowerRightCorner.X = center.X + (int)(rect.LowerRightCorner.X - center.X)*size;
sized_rect.LowerRightCorner.Y = center.Y + (int)(rect.LowerRightCorner.Y - center.Y)*size;
if (focused)
drawBoxFromStretchableTexture(w, sized_rect, SkinConfig::m_render_params["button::focused"]);
else
drawBoxFromStretchableTexture(w, sized_rect, SkinConfig::m_render_params["button::neutral"]);
}
else
drawBoxFromStretchableTexture(w, rect, SkinConfig::m_render_params["button::neutral"]);
{
if (focused)
drawBoxFromStretchableTexture(w, rect, SkinConfig::m_render_params["button::focused"]);
else
drawBoxFromStretchableTexture(w, rect, SkinConfig::m_render_params["button::neutral"]);
}
}
void Skin::drawRibbon(const core::rect< s32 > &rect, Widget* widget, const bool pressed, bool focused)
@@ -1112,16 +1135,43 @@ void Skin::draw3DSunkenPane (IGUIElement *element, video::SColor bgcolor, bool f
core::rect< s32 > borderArea = rect;
borderArea.UpperLeftCorner -= position2d< s32 >( 2, 2 );
borderArea.LowerRightCorner += position2d< s32 >( 2, 2 );
GUIEngine::getDriver()->draw2DRectangle( colorFocus, borderArea );
core::rect< s32 > innerArea = rect;
// if within an appearing dialog, grow
if (m_dialog && m_dialog_size < 1.0f && widget->m_parent != NULL && widget->m_parent->getType() == gui::EGUIET_WINDOW)
{
core::position2d<u32> center = core::position2d<u32>(irr_driver->getFrameSize()/2);
const float size = sin(m_dialog_size*M_PI_2);
borderArea.UpperLeftCorner.X = center.X + (int)(rect.UpperLeftCorner.X - center.X)*size;
borderArea.UpperLeftCorner.Y = center.Y + (int)(rect.UpperLeftCorner.Y - center.Y)*size;
borderArea.LowerRightCorner.X = center.X + (int)(rect.LowerRightCorner.X - center.X)*size;
borderArea.LowerRightCorner.Y = center.Y + (int)(rect.LowerRightCorner.Y - center.Y)*size;
}
GUIEngine::getDriver()->draw2DRectangle( colorFocus, borderArea );
core::rect< s32 > innerArea = borderArea;
innerArea.UpperLeftCorner += position2d< s32 >( 2, 2 );
innerArea.LowerRightCorner -= position2d< s32 >( 2, 2 );
GUIEngine::getDriver()->draw2DRectangle( color, innerArea );
}
else
{
GUIEngine::getDriver()->draw2DRectangle( color, rect );
// if within an appearing dialog, grow
if (m_dialog && m_dialog_size < 1.0f && widget->m_parent != NULL && widget->m_parent->getType() == gui::EGUIET_WINDOW)
{
core::position2d<u32> center = core::position2d<u32>(irr_driver->getFrameSize()/2);
const float size = sin(m_dialog_size*M_PI_2);
core::rect< s32 > sizedRect;
sizedRect.UpperLeftCorner.X = center.X + (int)(rect.UpperLeftCorner.X - center.X)*size;
sizedRect.UpperLeftCorner.Y = center.Y + (int)(rect.UpperLeftCorner.Y - center.Y)*size;
sizedRect.LowerRightCorner.X = center.X + (int)(rect.LowerRightCorner.X - center.X)*size;
sizedRect.LowerRightCorner.Y = center.Y + (int)(rect.LowerRightCorner.Y - center.Y)*size;
GUIEngine::getDriver()->draw2DRectangle( color, sizedRect );
}
else
{
GUIEngine::getDriver()->draw2DRectangle( color, rect );
}
}
return;
}
@@ -1139,17 +1189,37 @@ void Skin::draw3DSunkenPane (IGUIElement *element, video::SColor bgcolor, bool f
void Skin::drawBGFadeColor()
{
// fade out background
SColor& color = SkinConfig::m_colors["dialog_background::neutral"];
SColor color = SkinConfig::m_colors["dialog_background::neutral"];
if (m_dialog_size < 1.0f) color.setAlpha( color.getAlpha()*m_dialog_size );
GUIEngine::getDriver()->draw2DRectangle( color,
core::rect< s32 >(position2d< s32 >(0,0) , GUIEngine::getDriver()->getCurrentRenderTargetSize()) );
core::rect< s32 >(position2d< s32 >(0,0) ,
GUIEngine::getDriver()->getCurrentRenderTargetSize()) );
}
core::rect< s32 > Skin::draw3DWindowBackground (IGUIElement *element, bool drawTitleBar, video::SColor titleBarColor, const core::rect< s32 > &rect, const core::rect< s32 > *clip)
{
{
drawBGFadeColor();
// draw frame
drawBoxFromStretchableTexture( ModalDialog::getCurrent(), rect, SkinConfig::m_render_params["window::neutral"]);
if (m_dialog_size < 1.0f)
{
core::rect< s32 > sized_rect = rect;
core::position2d<s32> center = sized_rect.getCenter();
const int w = sized_rect.getWidth();
const int h = sized_rect.getHeight();
const float size = sin(m_dialog_size*M_PI_2);
sized_rect.UpperLeftCorner.X = (int)(center.X - (w/2.0f)*size);
sized_rect.UpperLeftCorner.Y = (int)(center.Y - (h/2.0f)*size);
sized_rect.LowerRightCorner.X = (int)(center.X + (w/2.0f)*size);
sized_rect.LowerRightCorner.Y = (int)(center.Y + (h/2.0f)*size);
drawBoxFromStretchableTexture( ModalDialog::getCurrent(), sized_rect, SkinConfig::m_render_params["window::neutral"]);
m_dialog_size += GUIEngine::getLatestDt()*5;
}
else
{
drawBoxFromStretchableTexture( ModalDialog::getCurrent(), rect, SkinConfig::m_render_params["window::neutral"]);
}
return rect;
}

4
src/guiengine/skin.hpp
View File

@@ -232,6 +232,10 @@ namespace GUIEngine
void drawListSelection(const irr::core::rect< irr::s32 > &rect, Widget* widget, bool focused);
public:
// dirty way to have dialogs that zoom in
bool m_dialog;
float m_dialog_size;
Skin(irr::gui::IGUISkin* fallback_skin);
~Skin();

2
src/guiengine/widgets/list_widget.cpp
View File

@@ -84,6 +84,6 @@ void ListWidget::unfocused(const int playerID)
IGUIListBox* list = getIrrlichtElement<IGUIListBox>();
// remove selection when leaving list
list->setSelected(-1);
if (list != NULL) list->setSelected(-1);
}