blakeridgway/supercell-wx
1
0
Fork 0
mirror of https://github.com/ciphervance/supercell-wx.git synced 2025-10-31 06:10:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Adjust the compass icon to always appear below the sweep time window

Browse source
This commit is contained in:
Dan Paulat 2024-01-13 23:50:48 -06:00
parent 9c7e3eb7e6
commit dfe1695385
1 changed files with 20 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

20
scwx-qt/source/scwx/qt/map/overlay_layer.cpp
View file

@ -72,6 +72,7 @@ public:
double lastWidth_ {0.0}; double lastWidth_ {0.0};
double lastHeight_ {0.0}; double lastHeight_ {0.0};
float lastFontSize_ {0.0f};
std::string sweepTimeString_ {}; std::string sweepTimeString_ {};
bool sweepTimeNeedsUpdate_ {true}; bool sweepTimeNeedsUpdate_ {true};
@ -142,6 +143,7 @@ void OverlayLayer::Initialize()
switch (ev->type()) switch (ev->type())
{ {
case QEvent::Type::Enter: case QEvent::Type::Enter:
// Highlight icon on mouse enter
gl::draw::Icons::SetIconModulate( gl::draw::Icons::SetIconModulate(
p->compassIcon_, p->compassIcon_,
boost::gil::rgba32f_pixel_t {1.5f, 1.5f, 1.5f, 1.0f}); boost::gil::rgba32f_pixel_t {1.5f, 1.5f, 1.5f, 1.0f});
@ -149,6 +151,7 @@ void OverlayLayer::Initialize()
break; break;
case QEvent::Type::Leave: case QEvent::Type::Leave:
// Restore icon on mouse leave
gl::draw::Icons::SetIconModulate( gl::draw::Icons::SetIconModulate(
p->compassIcon_, p->compassIcon_,
boost::gil::rgba32f_pixel_t {1.0f, 1.0f, 1.0f, 1.0f}); boost::gil::rgba32f_pixel_t {1.0f, 1.0f, 1.0f, 1.0f});
@ -157,6 +160,7 @@ void OverlayLayer::Initialize()
case QEvent::Type::MouseButtonPress: case QEvent::Type::MouseButtonPress:
{ {
// Reset bearing on mouse button press
QMouseEvent* mouseEvent = reinterpret_cast<QMouseEvent*>(ev); QMouseEvent* mouseEvent = reinterpret_cast<QMouseEvent*>(ev);
if (mouseEvent->buttons() == Qt::MouseButton::LeftButton && if (mouseEvent->buttons() == Qt::MouseButton::LeftButton &&
p->lastBearing_ != 0.0) p->lastBearing_ != 0.0)
@ -247,16 +251,21 @@ void OverlayLayer::Render(
p->positionManager_->IsLocationTracked()); p->positionManager_->IsLocationTracked());
// Compass Icon // Compass Icon
if (params.width != p->lastWidth_ || params.height != p->lastHeight_) if (params.width != p->lastWidth_ || params.height != p->lastHeight_ ||
ImGui::GetFontSize() != p->lastFontSize_)
{ {
gl::draw::Icons::SetIconLocation( // Set the compass icon in the upper right, below the sweep time window
p->compassIcon_, params.width - 24, params.height - 48); gl::draw::Icons::SetIconLocation(p->compassIcon_,
params.width - 24,
params.height -
(ImGui::GetFontSize() + 32));
p->compassIconDirty_ = true; p->compassIconDirty_ = true;
} }
if (params.bearing != p->lastBearing_) if (params.bearing != p->lastBearing_)
{ {
if (params.bearing == 0.0) if (params.bearing == 0.0)
{ {
// Use cardinal point icon when bearing is oriented north-up
gl::draw::Icons::SetIconTexture( gl::draw::Icons::SetIconTexture(
p->compassIcon_, p->cardinalPointIconName_, 0); p->compassIcon_, p->cardinalPointIconName_, 0);
gl::draw::Icons::SetIconAngle(p->compassIcon_, gl::draw::Icons::SetIconAngle(p->compassIcon_,
@ -264,16 +273,20 @@ void OverlayLayer::Render(
} }
else else
{ {
// Use rotated compass icon when bearing is rotated away from north-up
gl::draw::Icons::SetIconTexture( gl::draw::Icons::SetIconTexture(
p->compassIcon_, p->compassIconName_, 0); p->compassIcon_, p->compassIconName_, 0);
gl::draw::Icons::SetIconAngle( gl::draw::Icons::SetIconAngle(
p->compassIcon_, p->compassIcon_,
units::angle::degrees<double> {-45 - params.bearing}); units::angle::degrees<double> {-45 - params.bearing});
} }
// Mark icon for re-drawing
p->compassIconDirty_ = true; p->compassIconDirty_ = true;
} }
if (p->compassIconDirty_) if (p->compassIconDirty_)
{ {
// Update icon render buffers
p->icons_->FinishIcons(); p->icons_->FinishIcons();
} }
@ -343,6 +356,7 @@ void OverlayLayer::Render(
p->lastWidth_ = params.width; p->lastWidth_ = params.width;
p->lastHeight_ = params.height; p->lastHeight_ = params.height;
p->lastBearing_ = params.bearing; p->lastBearing_ = params.bearing;
p->lastFontSize_ = ImGui::GetFontSize();
SCWX_GL_CHECK_ERROR(); SCWX_GL_CHECK_ERROR();
} }