Menu
▾
▴
[Supertuxkart-commit] SF.net SVN: supertuxkart:[3375] main/branches/irrlicht
|
From: <au...@us...> - 2009-04-11 16:43:34
|
Revision: 3375
http://supertuxkart.svn.sourceforge.net/supertuxkart/?rev=3375&view=rev
Author: auria
Date: 2009-04-11 16:43:24 +0000 (Sat, 11 Apr 2009)
Log Message:
-----------
Added basic skinning to spinners
Modified Paths:
--------------
main/branches/irrlicht/data/gui/glassspinner.png
main/branches/irrlicht/data/gui/glassspinner_focus.png
main/branches/irrlicht/data/gui/karts.stkgui
main/branches/irrlicht/src/gui/skin.cpp
main/branches/irrlicht/src/gui/skin.hpp
main/branches/irrlicht/src/gui/widget.cpp
Modified: main/branches/irrlicht/data/gui/glassspinner.png
===================================================================
(Binary files differ)
Modified: main/branches/irrlicht/data/gui/glassspinner_focus.png
===================================================================
(Binary files differ)
Modified: main/branches/irrlicht/data/gui/karts.stkgui
===================================================================
--- main/branches/irrlicht/data/gui/karts.stkgui 2009-04-11 16:07:41 UTC (rev 3374)
+++ main/branches/irrlicht/data/gui/karts.stkgui 2009-04-11 16:43:24 UTC (rev 3375)
@@ -4,7 +4,7 @@
<label width="100%" height="25" text="(P1) Keyboard 1" align="center" text_align="center" />
- <spinner id="player" width="40%" height="25" min_value="0" max_value="8" align="center"/>
+ <spinner id="player" width="40%" height="40" min_value="0" max_value="8" align="center"/>
<model id="modelview" width="40%" proportion="3" align="center"/>
<label width="100%" height="25" text="Wilber" align="center" text_align="center" />
Modified: main/branches/irrlicht/src/gui/skin.cpp
===================================================================
--- main/branches/irrlicht/src/gui/skin.cpp 2009-04-11 16:07:41 UTC (rev 3374)
+++ main/branches/irrlicht/src/gui/skin.cpp 2009-04-11 16:43:24 UTC (rev 3375)
@@ -47,7 +47,8 @@
void Skin::drawBoxFromStretchableTexture(const core::rect< s32 > &dest, ITexture* source,
const int left_border, const int right_border,
- const int top_border, const int bottom_border)
+ const int top_border, const int bottom_border,
+ const float border_out_portion)
{
// FIXME? - lots of things here will be re-calculated every frame, which is useless since
// widgets won't move, so they'd only need to be calculated once.
@@ -91,8 +92,9 @@
core::rect<s32> source_area_bottom_right = core::rect<s32>(dx, dy, texture_w, texture_h);
/*
- The dest area is split this way. Borders will go a bit beyond the
- given area so components inside don't go over the borders (by half their size)
+ The dest area is split this way. Borders can go a bit beyond the given area so
+ components inside don't go over the borders
+ (how much it exceeds horizontally is specified in 'border_out_portion'. vertically is always the totality)
a----b--------------------c----+
| | | |
@@ -111,22 +113,24 @@
const int dest_y2 = dest.LowerRightCorner.Y;
const float scale = (float)(dest_y2-dest_y)/texture_h;
- const int dest_left_border_half = left_border*scale*0.5f;
- const int dest_right_border_half = right_border*scale*0.5f;
- const int dest_top_border_half = top_border*scale*0.5f;
- const int dest_bottom_border_half = bottom_border*scale*0.5f;
+ const int dest_left_border = left_border*scale;
+ const int dest_right_border = right_border*scale;
+ const int dest_top_border = top_border*scale;
+ const int dest_bottom_border = bottom_border*scale;
- const int ax = dest_x - dest_left_border_half;
- const int ay = dest_y - dest_top_border_half;
+ const float border_in_portion = 1 - border_out_portion;
- const int bx = dest_x + dest_left_border_half;
+ const int ax = dest_x - dest_left_border*border_out_portion;
+ const int ay = dest_y - dest_top_border;
+
+ const int bx = dest_x + dest_left_border*border_in_portion;
const int by = ay;
- const int cx = dest_x2 - dest_right_border_half;
+ const int cx = dest_x2 - dest_right_border*border_in_portion;
const int cy = ay;
const int dx = ax;
- const int dy = dest_y + dest_top_border_half;
+ const int dy = dest_y;
const int ex = bx;
const int ey = dy;
@@ -134,11 +138,11 @@
const int fx = cx;
const int fy = dy;
- const int gx = dest_x2 + dest_right_border_half;
+ const int gx = dest_x2 + dest_right_border*border_out_portion;
const int gy = dy;
const int hx = ax;
- const int hy = dest_y2 - dest_bottom_border_half;
+ const int hy = dest_y2;
const int ix = bx;
const int iy = hy;
@@ -150,7 +154,7 @@
const int ky = hy;
const int lx = bx;
- const int ly = dest_y2 + dest_bottom_border_half;
+ const int ly = dest_y2 + dest_bottom_border;
const int mx = cx;
const int my = ly;
@@ -268,20 +272,33 @@
void Skin::drawSpinnerBody(const core::rect< s32 > &rect, const Widget* widget, const bool pressed, const bool focused)
{
+ // FIXME - move these numbers to a config file
+ const int left_border = 110;
+ const int right_border = 110;
+ const int border_above = 0;
+ const int border_below = 36;
+
+ drawBoxFromStretchableTexture(rect, (focused || pressed ? m_tex_fspinner : m_tex_spinner),
+ left_border, right_border,
+ border_above, border_below, 0);
+ /*
if(focused)
GUIEngine::getDriver()->draw2DRectangle( SColor(255, 255, 0, 0), rect );
else
GUIEngine::getDriver()->draw2DRectangle( SColor(255, 150, 0, 0), rect );
+ */
}
void Skin::drawSpinnerChild(const core::rect< s32 > &rect, const Widget* widget, const bool pressed, bool focused)
{
+ /*
if(pressed)
GUIEngine::getDriver()->draw2DRectangle( SColor(255, 255, 0, 0), rect );
else if(focused)
GUIEngine::getDriver()->draw2DRectangle( SColor(255, 150, 0, 0), rect );
else
GUIEngine::getDriver()->draw2DRectangle( SColor(255, 0, 150, 0), rect );
+ */
}
void Skin::process3DPane(IGUIElement *element, const core::rect< s32 > &rect, const bool pressed)
Modified: main/branches/irrlicht/src/gui/skin.hpp
===================================================================
--- main/branches/irrlicht/src/gui/skin.hpp 2009-04-11 16:07:41 UTC (rev 3374)
+++ main/branches/irrlicht/src/gui/skin.hpp 2009-04-11 16:43:24 UTC (rev 3375)
@@ -29,7 +29,8 @@
void drawBoxFromStretchableTexture(const core::rect< s32 > &dest, ITexture* source,
const int left_border, const int right_border,
- const int top_border, const int bottom_border);
+ const int top_border, const int bottom_border,
+ const float border_out_portion = 0.5);
public:
Skin(IGUISkin* fallback_skin);
Modified: main/branches/irrlicht/src/gui/widget.cpp
===================================================================
--- main/branches/irrlicht/src/gui/widget.cpp 2009-04-11 16:07:41 UTC (rev 3374)
+++ main/branches/irrlicht/src/gui/widget.cpp 2009-04-11 16:43:24 UTC (rev 3375)
@@ -115,11 +115,6 @@
int abs_y = -1, percent_y = -1;
if(convertToCoord(y, &abs_y, &percent_y ))
{
- if(abs_y < -1)
- {
- std::cout << "abs_y = " << abs_y << ", y=" << (parent_y + (parent_h - abs_y)) << std::endl;
- }
-
if(abs_y > -1) this->y = parent_y + abs_y;
else if(abs_y < -1) this->y = parent_y + (parent_h + abs_y);
else if(percent_y > -1) this->y = parent_y + parent_h*percent_y/100;
@@ -617,7 +612,7 @@
// left arrow
rect<s32> subsize_left_arrow = rect<s32>(0 ,0, h, h);
- IGUIButton * left_arrow = GUIEngine::getGUIEnv()->addButton(subsize_left_arrow, btn, ++id_counter_2, L"<<");
+ IGUIButton * left_arrow = GUIEngine::getGUIEnv()->addButton(subsize_left_arrow, btn, ++id_counter_2, L" ");
m_children[0].m_element = left_arrow;
m_children[0].m_type = WTYPE_BUTTON;
left_arrow->setTabStop(false);
@@ -659,7 +654,7 @@
// right arrow
rect<s32> subsize_right_arrow = rect<s32>(w-h, 0, w, h);
- IGUIButton * right_arrow = GUIEngine::getGUIEnv()->addButton(subsize_right_arrow, btn, ++id_counter_2, L">>");
+ IGUIButton * right_arrow = GUIEngine::getGUIEnv()->addButton(subsize_right_arrow, btn, ++id_counter_2, L" ");
right_arrow->setTabStop(false);
m_children[2].m_element = right_arrow;
m_children[2].m_type = WTYPE_BUTTON;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|