X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fhud.cpp;h=dbc4a01a3a63093652442883e7a8dc15547c8098;hb=a953ff4dfc9f786ee379643b6b498a5699203ff1;hp=a74d926d7353e35f9d9af2ab16274a1d9f53d632;hpb=e201620ee1051545ed7856fb18f805c67adccc85;p=minetest.git diff --git a/src/hud.cpp b/src/hud.cpp index a74d926d7..dbc4a01a3 100644 --- a/src/hud.cpp +++ b/src/hud.cpp @@ -20,18 +20,18 @@ with this program; if not, write to the Free Software Foundation, Inc., */ #include "hud.h" -#include "main.h" #include "settings.h" #include "util/numeric.h" #include "log.h" #include "gamedef.h" #include "itemdef.h" #include "inventory.h" -#include "tile.h" +#include "client/tile.h" #include "localplayer.h" #include "camera.h" #include "porting.h" #include "fontengine.h" +#include "guiscalingfilter.h" #include #ifdef HAVE_TOUCHSCREENGUI @@ -58,22 +58,22 @@ Hud::Hud(video::IVideoDriver *driver, scene::ISceneManager* smgr, for (unsigned int i=0; i < 4; i++ ){ hbar_colors[i] = hbar_color; } - + tsrc = gamedef->getTextureSource(); - + v3f crosshair_color = g_settings->getV3F("crosshair_color"); u32 cross_r = rangelim(myround(crosshair_color.X), 0, 255); u32 cross_g = rangelim(myround(crosshair_color.Y), 0, 255); u32 cross_b = rangelim(myround(crosshair_color.Z), 0, 255); u32 cross_a = rangelim(g_settings->getS32("crosshair_alpha"), 0, 255); crosshair_argb = video::SColor(cross_a, cross_r, cross_g, cross_b); - + v3f selectionbox_color = g_settings->getV3F("selectionbox_color"); u32 sbox_r = rangelim(myround(selectionbox_color.X), 0, 255); u32 sbox_g = rangelim(myround(selectionbox_color.Y), 0, 255); u32 sbox_b = rangelim(myround(selectionbox_color.Z), 0, 255); selectionbox_argb = video::SColor(255, sbox_r, sbox_g, sbox_b); - + use_crosshair_image = tsrc->isKnownSourceImage("crosshair.png"); hotbar_image = ""; @@ -94,7 +94,7 @@ void Hud::drawItem(const ItemStack &item, const core::rect& rect, bool sele imgrect2.LowerRightCorner.Y += (m_padding*2); video::ITexture *texture = tsrc->getTexture(hotbar_selected_image); core::dimension2di imgsize(texture->getOriginalSize()); - driver->draw2DImage(texture, imgrect2, + draw2DImageFilterScaled(driver, texture, imgrect2, core::rect(core::position2d(0,0), imgsize), NULL, hbar_colors, true); } else { @@ -200,7 +200,7 @@ void Hud::drawItems(v2s32 upperleftpos, s32 itemcount, s32 offset, core::rect rect2 = imgrect2 + pos; video::ITexture *texture = tsrc->getTexture(hotbar_image); core::dimension2di imgsize(texture->getOriginalSize()); - driver->draw2DImage(texture, rect2, + draw2DImageFilterScaled(driver, texture, rect2, core::rect(core::position2d(0,0), imgsize), NULL, hbar_colors, true); } @@ -244,7 +244,7 @@ void Hud::drawLuaElements(v3s16 camera_offset) { HudElement *e = player->getHud(i); if (!e) continue; - + v2s32 pos(floor(e->pos.X * (float) m_screensize.X + 0.5), floor(e->pos.Y * (float) m_screensize.Y + 0.5)); switch (e->type) { @@ -266,7 +266,7 @@ void Hud::drawLuaElements(v3s16 camera_offset) { (e->align.Y - 1.0) * dstsize.Y / 2); core::rect rect(0, 0, dstsize.X, dstsize.Y); rect += pos + offset + v2s32(e->offset.X, e->offset.Y); - driver->draw2DImage(texture, rect, + draw2DImageFilterScaled(driver, texture, rect, core::rect(core::position2d(0,0), imgsize), NULL, colors, true); break; } @@ -275,7 +275,7 @@ void Hud::drawLuaElements(v3s16 camera_offset) { (e->number >> 8) & 0xFF, (e->number >> 0) & 0xFF); core::rect size(0, 0, e->scale.X, text_height * e->scale.Y); - std::wstring text = narrow_to_wide(e->text); + std::wstring text = utf8_to_wide(e->text); core::dimension2d textsize = font->getDimension(text.c_str()); v2s32 offset((e->align.X - 1.0) * (textsize.Width / 2), (e->align.Y - 1.0) * (textsize.Height / 2)); @@ -310,11 +310,11 @@ void Hud::drawLuaElements(v3s16 camera_offset) { (e->number >> 8) & 0xFF, (e->number >> 0) & 0xFF); core::rect size(0, 0, 200, 2 * text_height); - std::wstring text = narrow_to_wide(e->name); + std::wstring text = utf8_to_wide(e->name); font->draw(text.c_str(), size + pos, color); std::ostringstream os; - os<text; - text = narrow_to_wide(os.str()); + os << distance << e->text; + text = utf8_to_wide(os.str()); pos.Y += text_height; font->draw(text.c_str(), size + pos, color); break; } @@ -331,26 +331,22 @@ void Hud::drawStatbar(v2s32 pos, u16 corner, u16 drawdir, std::string texture, { const video::SColor color(255, 255, 255, 255); const video::SColor colors[] = {color, color, color, color}; - + video::ITexture *stat_texture = tsrc->getTexture(texture); if (!stat_texture) return; - + core::dimension2di srcd(stat_texture->getOriginalSize()); core::dimension2di dstd; if (size == v2s32()) { dstd = srcd; } else { - dstd.Height = size.Y * g_settings->getFloat("hud_scaling") * - porting::getDisplayDensity(); - dstd.Width = size.X * g_settings->getFloat("hud_scaling") * - porting::getDisplayDensity(); - - offset.X *= g_settings->getFloat("hud_scaling") * - porting::getDisplayDensity(); - - offset.Y *= g_settings->getFloat("hud_scaling") * + double size_factor = g_settings->getFloat("hud_scaling") * porting::getDisplayDensity(); + dstd.Height = size.Y * size_factor; + dstd.Width = size.X * size_factor; + offset.X *= size_factor; + offset.Y *= size_factor; } v2s32 p = pos; @@ -375,24 +371,24 @@ void Hud::drawStatbar(v2s32 pos, u16 corner, u16 drawdir, std::string texture, } steppos.X *= dstd.Width; steppos.Y *= dstd.Height; - + for (s32 i = 0; i < count / 2; i++) { core::rect srcrect(0, 0, srcd.Width, srcd.Height); core::rect dstrect(0,0, dstd.Width, dstd.Height); dstrect += p; - driver->draw2DImage(stat_texture, dstrect, srcrect, NULL, colors, true); + draw2DImageFilterScaled(driver, stat_texture, dstrect, srcrect, NULL, colors, true); p += steppos; } - + if (count % 2 == 1) { core::rect srcrect(0, 0, srcd.Width / 2, srcd.Height); core::rect dstrect(0,0, dstd.Width / 2, dstd.Height); dstrect += p; - driver->draw2DImage(stat_texture, dstrect, srcrect, NULL, colors, true); + draw2DImageFilterScaled(driver, stat_texture, dstrect, srcrect, NULL, colors, true); } } @@ -406,7 +402,7 @@ void Hud::drawHotbar(u16 playeritem) { //silently ignore this we may not be initialized completely return; } - + s32 hotbar_itemcount = player->hud_hotbar_itemcount; s32 width = hotbar_itemcount * (m_hotbar_imagesize + m_padding * 2); v2s32 pos = centerlowerpos - v2s32(width / 2, m_hotbar_imagesize + m_padding * 3); @@ -432,24 +428,26 @@ void Hud::drawHotbar(u16 playeritem) { //////////////////////////// compatibility code to be removed ////////////// // this is ugly as hell but there's no other way to keep compatibility to // old servers - if ( player->hud_flags & HUD_FLAG_HEALTHBAR_VISIBLE) - drawStatbar(v2s32(floor(0.5 * (float) m_screensize.X + 0.5), - floor(1 * (float) m_screensize.Y + 0.5)), - HUD_CORNER_UPPER, 0, "heart.png", - player->hp, v2s32((-10*24)-25,-(48+24+10)), v2s32(24,24)); + if ((player->hud_flags & HUD_FLAG_HEALTHBAR_VISIBLE)) { + drawStatbar(v2s32(floor(0.5 * (float)m_screensize.X + 0.5), + floor(1 * (float) m_screensize.Y + 0.5)), + HUD_CORNER_UPPER, 0, "heart.png", + player->hp, v2s32((-10*24)-25,-(48+24+10)), v2s32(24,24)); + } if ((player->hud_flags & HUD_FLAG_BREATHBAR_VISIBLE) && - (player->getBreath() < 11)) - drawStatbar(v2s32(floor(0.5 * (float) m_screensize.X + 0.5), - floor(1 * (float) m_screensize.Y + 0.5)), - HUD_CORNER_UPPER, 0, "heart.png", - player->getBreath(), v2s32(25,-(48+24+10)), v2s32(24,24)); + (player->getBreath() < 11)) { + drawStatbar(v2s32(floor(0.5 * (float)m_screensize.X + 0.5), + floor(1 * (float) m_screensize.Y + 0.5)), + HUD_CORNER_UPPER, 0, "bubble.png", + player->getBreath(), v2s32(25,-(48+24+10)), v2s32(24,24)); + } //////////////////////////////////////////////////////////////////////////// } void Hud::drawCrosshair() { - + if (use_crosshair_image) { video::ITexture *crosshair = tsrc->getTexture("crosshair.png"); v2u32 size = crosshair->getOriginalSize(); @@ -495,7 +493,7 @@ void drawItemStack(video::IVideoDriver *driver, { if(item.empty()) return; - + const ItemDefinition &def = item.getDefinition(gamedef->idef()); video::ITexture *texture = gamedef->idef()->getInventoryTexture(def.name, gamedef); @@ -504,7 +502,7 @@ void drawItemStack(video::IVideoDriver *driver, { const video::SColor color(255,255,255,255); const video::SColor colors[] = {color,color,color,color}; - driver->draw2DImage(texture, rect, + draw2DImageFilterScaled(driver, texture, rect, core::rect(core::position2d(0,0), core::dimension2di(texture->getOriginalSize())), clip, colors, true); @@ -554,7 +552,7 @@ void drawItemStack(video::IVideoDriver *driver, { // Get the item count as a string std::string text = itos(item.count); - v2u32 dim = font->getDimension(narrow_to_wide(text).c_str()); + v2u32 dim = font->getDimension(utf8_to_wide(text).c_str()); v2s32 sdim(dim.X,dim.Y); core::rect rect2(