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

More work on scalable race GUI : race GUI will now be not so small on high resolutions (we need higher-definition weapon icons\!)

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5588 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
auria 2010-06-29 01:23:56 +00:00
parent 536bce6aa9
commit 6cb51e2492
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/states_screens/race_gui.cpp
View File

@ -378,7 +378,7 @@ void RaceGUI::drawGlobalPlayerIcons(const KartIconDisplayInfo* info)
int y;
int ICON_WIDTH=40;
int ICON_WIDTH=40*(UserConfigParams::m_width/800.0f);
int ICON_PLAYER_WIDTH=50;
if(UserConfigParams::m_height<600)
{
@ -447,12 +447,10 @@ void RaceGUI::drawPowerupIcons(const Kart* kart,
int nSize=(int)(64.0f*std::min(scaling.X, scaling.Y));
int x1 = (int)((UserConfigParams::m_width/2-32) * scaling.X)
+ viewport.UpperLeftCorner.X;
//int y1 = UserConfigParams::m_height - viewport.LowerRightCorner.Y
// + (int)(20 * scaling.Y)+nSize;
int y1 = viewport.UpperLeftCorner.Y
+ (int)(20 * scaling.Y);
int itemSpacing = std::min(scaling.X, scaling.Y)*30;
int x1 = viewport.UpperLeftCorner.X + viewport.getWidth()/2 - (n * itemSpacing)/2;
int y1 = viewport.UpperLeftCorner.Y + (int)(20 * scaling.Y);
assert(powerup != NULL);
assert(powerup->getIcon() != NULL);
@ -462,7 +460,7 @@ void RaceGUI::drawPowerupIcons(const Kart* kart,
for ( int i = 0 ; i < n ; i++ )
{
int x2=(int)(x1+i*std::min(scaling.X, scaling.Y)*30);
int x2=(int)(x1+i*itemSpacing);
core::rect<s32> pos(x2, y1, x2+nSize, y1+nSize);
irr_driver->getVideoDriver()->draw2DImage(t, pos, rect, NULL,
NULL, true);
@ -543,8 +541,6 @@ void RaceGUI::drawSpeed(const Kart* kart, const core::recti &viewport,
core::vector2di offset = viewport.UpperLeftCorner;
offset.X += viewport.getWidth() - meter_width - (int)(10*scaling.X);
offset.Y = viewport.LowerRightCorner.Y-(int)(10*scaling.Y);
std::cout << "speedometer : " << meter_width << "x" << meter_height << " @ " << offset.X << ", " << offset.Y << std::endl;
// First draw the meter (i.e. the background which contains the numbers etc.
// -------------------------------------------------------------------------