BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

Make the crosshair DPI-aware (#13772)

Browse Source
This commit is contained in:
Gregor Parzefall 2023-09-11 18:59:32 +02:00 committed by GitHub
parent 48ab1835da
commit 833c324498
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 34 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
src/client/hud.cpp
View File

@ -780,44 +780,52 @@ void Hud::drawHotbar(u16 playeritem)
void Hud::drawCrosshair() void Hud::drawCrosshair()
{ {
auto draw_image_crosshair = [this] (video::ITexture *tex) {
core::dimension2di orig_size(tex->getOriginalSize());
core::dimension2di scaled_size(
core::round32(orig_size.Width * m_scale_factor),
core::round32(orig_size.Height * m_scale_factor));
core::rect<s32> src_rect(orig_size);
core::position2d pos(m_displaycenter.X - scaled_size.Width / 2,
m_displaycenter.Y - scaled_size.Height / 2);
core::rect<s32> dest_rect(pos, scaled_size);
video::SColor colors[] = { crosshair_argb, crosshair_argb,
crosshair_argb, crosshair_argb };
draw2DImageFilterScaled(driver, tex, dest_rect, src_rect,
nullptr, colors, true);
};
if (pointing_at_object) { if (pointing_at_object) {
if (use_object_crosshair_image) { if (use_object_crosshair_image) {
video::ITexture *object_crosshair = tsrc->getTexture("object_crosshair.png"); draw_image_crosshair(tsrc->getTexture("object_crosshair.png"));
v2u32 size = object_crosshair->getOriginalSize();
v2s32 lsize = v2s32(m_displaycenter.X - (size.X / 2),
m_displaycenter.Y - (size.Y / 2));
driver->draw2DImage(object_crosshair, lsize,
core::rect<s32>(0, 0, size.X, size.Y),
nullptr, crosshair_argb, true);
} else { } else {
s32 line_size = core::round32(OBJECT_CROSSHAIR_LINE_SIZE * m_scale_factor);
driver->draw2DLine( driver->draw2DLine(
m_displaycenter - v2s32(OBJECT_CROSSHAIR_LINE_SIZE, m_displaycenter - v2s32(line_size, line_size),
OBJECT_CROSSHAIR_LINE_SIZE), m_displaycenter + v2s32(line_size, line_size),
m_displaycenter + v2s32(OBJECT_CROSSHAIR_LINE_SIZE, crosshair_argb);
OBJECT_CROSSHAIR_LINE_SIZE), crosshair_argb);
driver->draw2DLine( driver->draw2DLine(
m_displaycenter + v2s32(OBJECT_CROSSHAIR_LINE_SIZE, m_displaycenter + v2s32(line_size, -line_size),
-OBJECT_CROSSHAIR_LINE_SIZE), m_displaycenter + v2s32(-line_size, line_size),
m_displaycenter + v2s32(-OBJECT_CROSSHAIR_LINE_SIZE, crosshair_argb);
OBJECT_CROSSHAIR_LINE_SIZE), crosshair_argb);
} }
return; return;
} }
if (use_crosshair_image) { if (use_crosshair_image) {
video::ITexture *crosshair = tsrc->getTexture("crosshair.png"); draw_image_crosshair(tsrc->getTexture("crosshair.png"));
v2u32 size = crosshair->getOriginalSize();
v2s32 lsize = v2s32(m_displaycenter.X - (size.X / 2),
m_displaycenter.Y - (size.Y / 2));
driver->draw2DImage(crosshair, lsize,
core::rect<s32>(0, 0, size.X, size.Y),
nullptr, crosshair_argb, true);
} else { } else {
driver->draw2DLine(m_displaycenter - v2s32(CROSSHAIR_LINE_SIZE, 0), s32 line_size = core::round32(CROSSHAIR_LINE_SIZE * m_scale_factor);
m_displaycenter + v2s32(CROSSHAIR_LINE_SIZE, 0), crosshair_argb);
driver->draw2DLine(m_displaycenter - v2s32(0, CROSSHAIR_LINE_SIZE), driver->draw2DLine(m_displaycenter - v2s32(line_size, 0),
m_displaycenter + v2s32(0, CROSSHAIR_LINE_SIZE), crosshair_argb); m_displaycenter + v2s32(line_size, 0), crosshair_argb);
driver->draw2DLine(m_displaycenter - v2s32(0, line_size),
m_displaycenter + v2s32(0, line_size), crosshair_argb);
} }
} }