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

Added kart icons and time display.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3746 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
hikerstk 2009-07-13 12:25:38 +00:00
parent f51aa12fc0
commit e7d17ad201
3 changed files with 40 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/graphics/irr_driver.cpp
View File

@ -98,10 +98,10 @@ void IrrDriver::initDevice()
for(int driver_type=0; driver_type<3; driver_type++)
{
video::E_DRIVER_TYPE type = driver_type==0
? video::EDT_OPENGL
: (driver_type==1
? video::EDT_DIRECT3D9
: video::EDT_DIRECT3D8);
? video::EDT_OPENGL
: (driver_type==1
? video::EDT_DIRECT3D9
: video::EDT_DIRECT3D8);
// Try 32 and, upon failure, 24 then 16 bit per pixels
for(int bits=32; bits>15; bits -=8)
{
@ -131,6 +131,7 @@ void IrrDriver::initDevice()
m_device->setWindowCaption(L"SuperTuxKart");
m_scene_manager = m_device->getSceneManager();
m_gui_env = m_device->getGUIEnvironment();
m_video_driver = m_device->getVideoDriver();
const std::string &font = file_manager->getFontFile("DomesticManners.xml");
m_race_font = m_gui_env->getFont(font.c_str());
}

12
src/graphics/irr_driver.hpp
View File

@ -43,6 +43,8 @@ private:
scene::ISceneManager *m_scene_manager;
/** Irrlicht gui environment. */
gui::IGUIEnvironment *m_gui_env;
/** Irrlicht video driver. */
video::IVideoDriver *m_video_driver;
/** Irrlicht race font. */
irr::gui::IGUIFont *m_race_font;
@ -56,10 +58,16 @@ public:
~IrrDriver();
void initDevice();
/** Returns a list of all video modes supports by the graphics card. */
const std::vector<VideoMode>& getVideoModes() const { return m_modes; }
const core::dimension2d<s32> getFrameSize() const { return m_device->getVideoDriver()->getCurrentRenderTargetSize(); }
/** Returns the frame size. */
const core::dimension2d<s32> getFrameSize() const
{ return m_video_driver->getCurrentRenderTargetSize(); }
/** Returns the irrlicht device. */
IrrlichtDevice *getDevice() const { return m_device; }
/** Returns the irrlicht video driver. */
video::IVideoDriver *getVideoDriver() const { return m_video_driver; }
/** Returns the irrlicht scene manager. */
scene::ISceneManager *getSceneManager() const { return m_scene_manager; }
scene::IAnimatedMesh *getAnimatedMesh(const std::string &name);
scene::IMesh *getMesh(const std::string &name);

98
src/gui/race_gui.cpp
View File

@ -165,7 +165,7 @@ void RaceGUI::drawMap ()
} // drawMap
//-----------------------------------------------------------------------------
// Draw players position on the race
// Draw players icons and their times (if defined in the current mode).
void RaceGUI::drawPlayerIcons (const KartIconDisplayInfo* info)
{
assert(RaceManager::getWorld() != NULL);
@ -179,13 +179,8 @@ void RaceGUI::drawPlayerIcons (const KartIconDisplayInfo* info)
ICON_WIDTH = 27;
ICON_PLAYER_WIDTH = 35;
}
//glEnable(GL_TEXTURE_2D);
Material *last_players_gst = 0;
int bFirst = 1;
glDisable(GL_CULL_FACE);
gui::IGUIFont* font = irr_driver->getRaceFont();
const unsigned int kart_amount = race_manager->getNumKarts();
for(unsigned int i = 0; i < kart_amount ; i++)
{
@ -193,79 +188,36 @@ void RaceGUI::drawPlayerIcons (const KartIconDisplayInfo* info)
if(kart->isEliminated()) continue;
const int position = kart->getPosition();
y = UserConfigParams::m_height*7/8-20 - ( (position == -1 ? i : position-1)*(ICON_PLAYER_WIDTH+2));
y = 20 + ( (position == -1 ? i : position-1)*(ICON_PLAYER_WIDTH+2));
GLfloat COLOR[] = {info[i].r, info[i].g, info[i].b, 1.0f};
font_race->PrintShadow(info[i].time.c_str(), 30, ICON_PLAYER_WIDTH+x, y+5, COLOR);
if(info[i].time.length()>0)
{
static video::SColor color = video::SColor(255, (int)(255*info[i].r),
(int)(255*info[i].g),
(int)(255*info[i].b) );
core::rect<s32> pos(x+ICON_PLAYER_WIDTH, y+5, x+ICON_PLAYER_WIDTH, y+5);
core::stringw s=info[i].time.c_str();
font->draw(s.c_str(), pos, color);
}
if(info[i].special_title.length() >0)
{
GLfloat const RED[] = { 1.0f, 0, 0, 1.0f};
font_race->PrintShadow(info[i].special_title.c_str(), 30, ICON_PLAYER_WIDTH+x, y+5, RED );
static video::SColor color = video::SColor(255, 255, 0, 0);
core::rect<s32> pos(x+ICON_PLAYER_WIDTH, y+5, x+ICON_PLAYER_WIDTH, y+5);
core::stringw s(info[i].special_title.c_str());
font->draw(s.c_str(), pos, color);
}
glEnable(GL_CULL_FACE);
bFirst = 0;
// draw icon
Material* players_gst = kart->getKartProperties()->getIconMaterial();
// Hmm - if the same icon is displayed more than once in a row,
// plib does only do the first setTexture, therefore nothing is
// displayed for the remaining icons. So we have to call force() if
// the same icon is displayed more than once in a row.
if(last_players_gst==players_gst)
{
#ifndef HAVE_IRRLICHT
players_gst->getState()->force();
#endif
}
//The material of the icons should not have a non-zero alpha_ref value,
//because if so the next call can make the text look aliased.
#ifdef HAVE_IRRLICHT
#else
players_gst -> apply ();
#endif
last_players_gst = players_gst;
glBegin ( GL_QUADS ) ;
glColor4f ( 1, 1, 1, 1 ) ;
if (kart -> isPlayerKart ())
{
glTexCoord2f ( 0, 0 ) ; glVertex2i ( x , y ) ;
glTexCoord2f ( 1, 0 ) ; glVertex2i ( x+ICON_PLAYER_WIDTH, y ) ;
glTexCoord2f ( 1, 1 ) ; glVertex2i ( x+ICON_PLAYER_WIDTH, y+ICON_PLAYER_WIDTH ) ;
glTexCoord2f ( 0, 1 ) ; glVertex2i ( x , y+ICON_PLAYER_WIDTH ) ;
}
else
{
glTexCoord2f ( 0, 0 ) ; glVertex2i ( x , y ) ;
glTexCoord2f ( 1, 0 ) ; glVertex2i ( x+ICON_WIDTH, y ) ;
glTexCoord2f ( 1, 1 ) ; glVertex2i ( x+ICON_WIDTH, y+ICON_WIDTH ) ;
glTexCoord2f ( 0, 1 ) ; glVertex2i ( x , y+ICON_WIDTH ) ;
}
glEnd () ;
video::ITexture *icon = kart->getKartProperties()->getIconMaterial()->getTexture();
int w = kart->isPlayerKart() ? ICON_PLAYER_WIDTH : ICON_WIDTH;
const core::rect<s32> pos(x, y, x+w, y+w);
const core::rect<s32> rect(core::position2d<s32>(0,0), icon->getOriginalSize());
irr_driver->getVideoDriver()->draw2DImage(icon, pos, rect, 0,
&video::SColor(255,255,255,255), true);
// draw position (1st, 2nd...)
glDisable(GL_CULL_FACE);
char str[256];
if(position != -1)
{
sprintf(str, "%d", position);
font_race->PrintShadow(str, 33, x-7, y-4);
// FIXME: translation
if (kart->getPosition() == 1)
font_race->PrintShadow("st", 13, x-7+17, y-4+17);
else if (kart->getPosition() == 2)
font_race->PrintShadow("nd", 13, x-7+17, y-4+17);
else if (kart->getPosition() == 3)
font_race->PrintShadow("rd", 13, x-7+17, y-4+17);
else
font_race->PrintShadow("th", 13, x-7+17, y-4+17);
}
} // next kart
glEnable(GL_CULL_FACE);
} // drawPlayerIcons
//-----------------------------------------------------------------------------
@ -283,7 +235,7 @@ void RaceGUI::drawPowerupIcons ( Kart* player_kart, int offset_x,
int nSize=(int)(64.0f*std::min(ratio_x, ratio_y));
#ifdef HAVE_IRRLICHT
// m_attachment_icon->setImage(powerup->getIcon()->getTexture());
video::ITexture *t=powerup->getIcon()->getTexture();
#else
powerup->getIcon()->apply();
@ -726,7 +678,7 @@ void RaceGUI::drawStatusText()
KartIconDisplayInfo* info = RaceManager::getWorld()->getKartsDisplayInfo();
for(int pla = 0; pla < num_players; pla++)
for(unsigned int pla = 0; pla < num_players; pla++)
{
int offset_x = 0, offset_y = 0;
@ -799,6 +751,6 @@ void RaceGUI::drawStatusText()
}
//drawMap();
//drawPlayerIcons(info);
drawPlayerIcons(info);
} // drawStatusText