LocalPlayer::accelerateHorizontal: cleanups
[oweals/minetest.git] / src / hud.cpp
index 6bdbafc06033c935905b27b40b4b2b5de7ed9ece..70903ce15e895422aba53b25d8043a270ef29d70 100644 (file)
@@ -34,26 +34,24 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "mesh.h"
 #include "wieldmesh.h"
 #include <IGUIStaticText.h>
+#include "client/renderingengine.h"
 
 #ifdef HAVE_TOUCHSCREENGUI
 #include "touchscreengui.h"
 #endif
 
-Hud::Hud(video::IVideoDriver *driver, scene::ISceneManager* smgr,
-               gui::IGUIEnvironment* guienv, Client *client, LocalPlayer *player,
+Hud::Hud(gui::IGUIEnvironment *guienv, Client *client, LocalPlayer *player,
                Inventory *inventory)
 {
-       this->driver      = driver;
-       this->smgr        = smgr;
+       driver            = RenderingEngine::get_video_driver();
        this->guienv      = guienv;
        this->client      = client;
        this->player      = player;
        this->inventory   = inventory;
 
        m_hud_scaling      = g_settings->getFloat("hud_scaling");
-       m_screensize       = v2u32(0, 0);
-       m_displaycenter    = v2s32(0, 0);
-       m_hotbar_imagesize = floor(HOTBAR_IMAGE_SIZE * porting::getDisplayDensity() + 0.5);
+       m_hotbar_imagesize = floor(HOTBAR_IMAGE_SIZE *
+               RenderingEngine::getDisplayDensity() + 0.5f);
        m_hotbar_imagesize *= m_hud_scaling;
        m_padding = m_hotbar_imagesize / 12;
 
@@ -77,16 +75,9 @@ Hud::Hud(video::IVideoDriver *driver, scene::ISceneManager* smgr,
 
        use_crosshair_image = tsrc->isKnownSourceImage("crosshair.png");
 
-       hotbar_image = "";
-       use_hotbar_image = false;
-       hotbar_selected_image = "";
-       use_hotbar_selected_image = false;
-
-       m_selection_mesh = NULL;
        m_selection_boxes.clear();
        m_halo_boxes.clear();
 
-       m_selection_pos = v3f(0.0, 0.0, 0.0);
        std::string mode_setting = g_settings->get("node_highlighting");
 
        if (mode_setting == "halo") {
@@ -129,79 +120,79 @@ void Hud::drawItem(const ItemStack &item, const core::rect<s32>& rect,
                bool selected)
 {
        if (selected) {
-                       /* draw hihlighting around selected item */
-                       if (use_hotbar_selected_image) {
-                               core::rect<s32> imgrect2 = rect;
-                               imgrect2.UpperLeftCorner.X  -= (m_padding*2);
-                               imgrect2.UpperLeftCorner.Y  -= (m_padding*2);
-                               imgrect2.LowerRightCorner.X += (m_padding*2);
-                               imgrect2.LowerRightCorner.Y += (m_padding*2);
-                                       video::ITexture *texture = tsrc->getTexture(hotbar_selected_image);
-                                       core::dimension2di imgsize(texture->getOriginalSize());
-                               draw2DImageFilterScaled(driver, texture, imgrect2,
-                                               core::rect<s32>(core::position2d<s32>(0,0), imgsize),
-                                               NULL, hbar_colors, true);
-                       } else {
-                               video::SColor c_outside(255,255,0,0);
-                               //video::SColor c_outside(255,0,0,0);
-                               //video::SColor c_inside(255,192,192,192);
-                               s32 x1 = rect.UpperLeftCorner.X;
-                               s32 y1 = rect.UpperLeftCorner.Y;
-                               s32 x2 = rect.LowerRightCorner.X;
-                               s32 y2 = rect.LowerRightCorner.Y;
-                               // Black base borders
-                               driver->draw2DRectangle(c_outside,
-                                       core::rect<s32>(
-                                       v2s32(x1 - m_padding, y1 - m_padding),
-                                       v2s32(x2 + m_padding, y1)
-                                       ), NULL);
-                               driver->draw2DRectangle(c_outside,
-                                       core::rect<s32>(
-                                       v2s32(x1 - m_padding, y2),
-                                       v2s32(x2 + m_padding, y2 + m_padding)
-                                       ), NULL);
-                               driver->draw2DRectangle(c_outside,
-                                       core::rect<s32>(
-                                       v2s32(x1 - m_padding, y1),
-                                               v2s32(x1, y2)
-                                       ), NULL);
-                               driver->draw2DRectangle(c_outside,
-                                       core::rect<s32>(
-                                               v2s32(x2, y1),
-                                       v2s32(x2 + m_padding, y2)
-                                       ), NULL);
-                               /*// Light inside borders
-                               driver->draw2DRectangle(c_inside,
-                                       core::rect<s32>(
-                                               v2s32(x1 - padding/2, y1 - padding/2),
-                                               v2s32(x2 + padding/2, y1)
-                                       ), NULL);
-                               driver->draw2DRectangle(c_inside,
-                                       core::rect<s32>(
-                                               v2s32(x1 - padding/2, y2),
-                                               v2s32(x2 + padding/2, y2 + padding/2)
-                                       ), NULL);
-                               driver->draw2DRectangle(c_inside,
-                                       core::rect<s32>(
-                                               v2s32(x1 - padding/2, y1),
-                                               v2s32(x1, y2)
-                                       ), NULL);
-                               driver->draw2DRectangle(c_inside,
-                                       core::rect<s32>(
-                                               v2s32(x2, y1),
-                                               v2s32(x2 + padding/2, y2)
-                                       ), NULL);
-                               */
-                       }
+               /* draw hihlighting around selected item */
+               if (use_hotbar_selected_image) {
+                       core::rect<s32> imgrect2 = rect;
+                       imgrect2.UpperLeftCorner.X  -= (m_padding*2);
+                       imgrect2.UpperLeftCorner.Y  -= (m_padding*2);
+                       imgrect2.LowerRightCorner.X += (m_padding*2);
+                       imgrect2.LowerRightCorner.Y += (m_padding*2);
+                               video::ITexture *texture = tsrc->getTexture(hotbar_selected_image);
+                               core::dimension2di imgsize(texture->getOriginalSize());
+                       draw2DImageFilterScaled(driver, texture, imgrect2,
+                                       core::rect<s32>(core::position2d<s32>(0,0), imgsize),
+                                       NULL, hbar_colors, true);
+               } else {
+                       video::SColor c_outside(255,255,0,0);
+                       //video::SColor c_outside(255,0,0,0);
+                       //video::SColor c_inside(255,192,192,192);
+                       s32 x1 = rect.UpperLeftCorner.X;
+                       s32 y1 = rect.UpperLeftCorner.Y;
+                       s32 x2 = rect.LowerRightCorner.X;
+                       s32 y2 = rect.LowerRightCorner.Y;
+                       // Black base borders
+                       driver->draw2DRectangle(c_outside,
+                               core::rect<s32>(
+                               v2s32(x1 - m_padding, y1 - m_padding),
+                               v2s32(x2 + m_padding, y1)
+                               ), NULL);
+                       driver->draw2DRectangle(c_outside,
+                               core::rect<s32>(
+                               v2s32(x1 - m_padding, y2),
+                               v2s32(x2 + m_padding, y2 + m_padding)
+                               ), NULL);
+                       driver->draw2DRectangle(c_outside,
+                               core::rect<s32>(
+                               v2s32(x1 - m_padding, y1),
+                                       v2s32(x1, y2)
+                               ), NULL);
+                       driver->draw2DRectangle(c_outside,
+                               core::rect<s32>(
+                                       v2s32(x2, y1),
+                               v2s32(x2 + m_padding, y2)
+                               ), NULL);
+                       /*// Light inside borders
+                       driver->draw2DRectangle(c_inside,
+                               core::rect<s32>(
+                                       v2s32(x1 - padding/2, y1 - padding/2),
+                                       v2s32(x2 + padding/2, y1)
+                               ), NULL);
+                       driver->draw2DRectangle(c_inside,
+                               core::rect<s32>(
+                                       v2s32(x1 - padding/2, y2),
+                                       v2s32(x2 + padding/2, y2 + padding/2)
+                               ), NULL);
+                       driver->draw2DRectangle(c_inside,
+                               core::rect<s32>(
+                                       v2s32(x1 - padding/2, y1),
+                                       v2s32(x1, y2)
+                               ), NULL);
+                       driver->draw2DRectangle(c_inside,
+                               core::rect<s32>(
+                                       v2s32(x2, y1),
+                                       v2s32(x2 + padding/2, y2)
+                               ), NULL);
+                       */
                }
-
-               video::SColor bgcolor2(128, 0, 0, 0);
-               if (!use_hotbar_image)
-                       driver->draw2DRectangle(bgcolor2, rect, NULL);
-               drawItemStack(driver, g_fontengine->getFont(), item, rect, NULL,
-                       client, selected ? IT_ROT_SELECTED : IT_ROT_NONE);
        }
 
+       video::SColor bgcolor2(128, 0, 0, 0);
+       if (!use_hotbar_image)
+               driver->draw2DRectangle(bgcolor2, rect, NULL);
+       drawItemStack(driver, g_fontengine->getFont(), item, rect, NULL,
+               client, selected ? IT_ROT_SELECTED : IT_ROT_NONE);
+}
+
 //NOTE: selectitem = 0 -> no selected; selectitem 1-based
 void Hud::drawItems(v2s32 upperleftpos, v2s32 screen_offset, s32 itemcount,
                s32 inv_offset, InventoryList *mainlist, u16 selectitem, u16 direction)
@@ -222,8 +213,8 @@ void Hud::drawItems(v2s32 upperleftpos, v2s32 screen_offset, s32 itemcount,
 
        // Position of upper left corner of bar
        v2s32 pos = screen_offset;
-       pos.X *= m_hud_scaling * porting::getDisplayDensity();
-       pos.Y *= m_hud_scaling * porting::getDisplayDensity();
+       pos.X *= m_hud_scaling * RenderingEngine::getDisplayDensity();
+       pos.Y *= m_hud_scaling * RenderingEngine::getDisplayDensity();
        pos += upperleftpos;
 
        // Store hotbar_image in member variable, used by drawItem()
@@ -346,7 +337,8 @@ void Hud::drawLuaElements(const v3s16 &camera_offset)
                                v3f p_pos = player->getPosition() / BS;
                                v3f w_pos = e->world_pos * BS;
                                float distance = floor(10 * p_pos.getDistanceFrom(e->world_pos)) / 10;
-                               scene::ICameraSceneNode* camera = smgr->getActiveCamera();
+                               scene::ICameraSceneNode* camera =
+                                       RenderingEngine::get_scene_manager()->getActiveCamera();
                                w_pos -= intToFloat(camera_offset, BS);
                                core::matrix4 trans = camera->getProjectionMatrix();
                                trans *= camera->getViewMatrix();
@@ -393,7 +385,7 @@ void Hud::drawStatbar(v2s32 pos, u16 corner, u16 drawdir, std::string texture,
        if (size == v2s32()) {
                dstd = srcd;
        } else {
-               float size_factor = m_hud_scaling * porting::getDisplayDensity();
+               float size_factor = m_hud_scaling * RenderingEngine::getDisplayDensity();
                dstd.Height = size.Y * size_factor;
                dstd.Width  = size.X * size_factor;
                offset.X *= size_factor;
@@ -458,7 +450,8 @@ void Hud::drawHotbar(u16 playeritem) {
        s32 width = hotbar_itemcount * (m_hotbar_imagesize + m_padding * 2);
        v2s32 pos = centerlowerpos - v2s32(width / 2, m_hotbar_imagesize + m_padding * 3);
 
-       if ( (float) width / (float) porting::getWindowSize().X <=
+       const v2u32 &window_size = RenderingEngine::get_instance()->getWindowSize();
+       if ( (float) width / (float) window_size.X <=
                        g_settings->getFloat("hud_hotbar_max_width")) {
                if (player->hud_flags & HUD_FLAG_HOTBAR_VISIBLE) {
                        drawItems(pos, v2s32(0, 0), hotbar_itemcount, 0, mainlist, playeritem + 1, 0);
@@ -616,11 +609,14 @@ void Hud::updateSelectionMesh(const v3s16 &camera_offset)
 }
 
 void Hud::resizeHotbar() {
-       if (m_screensize != porting::getWindowSize()) {
-               m_hotbar_imagesize = floor(HOTBAR_IMAGE_SIZE * porting::getDisplayDensity() + 0.5);
+       const v2u32 &window_size = RenderingEngine::get_instance()->getWindowSize();
+
+       if (m_screensize != window_size) {
+               m_hotbar_imagesize = floor(HOTBAR_IMAGE_SIZE *
+                       RenderingEngine::getDisplayDensity() + 0.5);
                m_hotbar_imagesize *= m_hud_scaling;
                m_padding = m_hotbar_imagesize / 12;
-               m_screensize = porting::getWindowSize();
+               m_screensize = window_size;
                m_displaycenter = v2s32(m_screensize.X/2,m_screensize.Y/2);
        }
 }