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

load speedfore.png and speedback.png based on skin

Browse Source
This commit is contained in:
riso 2021-08-20 23:17:17 -05:00
parent e66110ae17
commit 26bb43dadd
4 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/states_screens/race_gui.cpp
View File

@ -91,10 +91,8 @@ RaceGUI::RaceGUI()
m_is_tutorial = (RaceManager::get()->getTrackName() == "tutorial");
// Load speedmeter texture before rendering the first frame
m_speed_meter_icon = material_manager->getMaterial("speedback.png");
m_speed_meter_icon->getTexture(false,false);
m_speed_bar_icon = material_manager->getMaterial("speedfore.png");
m_speed_bar_icon->getTexture(false,false);
m_speed_meter_icon = irr_driver->getTexture(FileManager::GUI_ICON, "speedback.png");
m_speed_bar_icon = irr_driver->getTexture(FileManager::GUI_ICON, "speedfore.png");
//createMarkerTexture();
// Load icon textures for later reuse
@ -1010,10 +1008,9 @@ void RaceGUI::drawSpeedEnergyRank(const AbstractKart* kart,
(int)(offset.Y-meter_height),
(int)(offset.X+meter_width),
(int)offset.Y);
video::ITexture *meter_texture = m_speed_meter_icon->getTexture();
const core::rect<s32> meter_texture_coords(core::position2d<s32>(0,0),
meter_texture->getSize());
draw2DImage(meter_texture, meter_pos, meter_texture_coords, NULL,
m_speed_meter_icon->getSize());
draw2DImage(m_speed_meter_icon, meter_pos, meter_texture_coords, NULL,
NULL, true);
// TODO: temporary workaround, shouldn't have to use
// draw2DVertexPrimitiveList to render a simple rectangle
@ -1104,7 +1101,7 @@ void RaceGUI::drawSpeedEnergyRank(const AbstractKart* kart,
speed_ratio, meter_width, meter_height, offset);
drawMeterTexture(m_speed_bar_icon->getTexture(), vertices, count);
drawMeterTexture(m_speed_bar_icon, vertices, count);
#endif
} // drawSpeedEnergyRank

7
src/states_screens/race_gui.hpp
View File

@ -41,9 +41,6 @@ class RaceGUI : public RaceGUIBase
{
private:
Material *m_speed_meter_icon;
Material *m_speed_bar_icon;
// Minimap related variables
// -------------------------
/** The size of a single marker on the screen for AI karts,
@ -103,6 +100,10 @@ private:
/** Texture for the hit limit icon*/
irr::video::ITexture* m_champion;
/** Texture for speedometer. */
irr::video::ITexture *m_speed_meter_icon;
irr::video::ITexture *m_speed_bar_icon;
/** Animation state: none, getting smaller (old value),
* getting bigger (new number). */
enum AnimationState {AS_NONE, AS_SMALLER, AS_BIGGER};

4
src/states_screens/race_gui_overworld.cpp
View File

@ -99,8 +99,8 @@ RaceGUIOverworld::RaceGUIOverworld()
calculateMinimapSize();
m_speed_meter_icon = material_manager->getMaterial("speedback.png");
m_speed_bar_icon = material_manager->getMaterial("speedfore.png");
m_speed_meter_icon = irr_driver->getTexture(FileManager::GUI_ICON, "speedback.png");
m_speed_bar_icon = irr_driver->getTexture(FileManager::GUI_ICON, "speedfore.png");
//createMarkerTexture();
m_active_challenge = NULL;

7
src/states_screens/race_gui_overworld.hpp
View File

@ -49,9 +49,6 @@ class RaceGUIOverworld : public RaceGUIBase
{
private:
Material *m_speed_meter_icon;
Material *m_speed_bar_icon;
bool m_close_to_a_challenge;
// Minimap related variables
@ -64,6 +61,10 @@ private:
video::ITexture* m_icons[7];
/** Texture for speedometer. */
irr::video::ITexture *m_speed_meter_icon;
irr::video::ITexture *m_speed_bar_icon;
/** The size of a single marker on the screen for AI karts,
* need not be a power of 2. */
int m_minimap_challenge_size;