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

Add cursor position (screen coordinates) to mouse picking

Browse source
This commit is contained in:
Dan Paulat 2023-09-08 22:57:30 -05:00
parent f158c4174c
commit 9ebc859756
13 changed files with 55 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

8
scwx-qt/source/scwx/qt/gl/draw/placefile_icons.cpp
View file

@ -684,7 +684,9 @@ void PlacefileIcons::Impl::Update(bool textureAtlasChanged)
bool PlacefileIcons::RunMousePicking(
const QMapLibreGL::CustomLayerRenderParameters& params,
const glm::vec2& mousePos)
const QPointF& /* mouseLocalPos */,
const QPointF& /* mouseGlobalPos */,
const glm::vec2& mouseCoords)
{
std::unique_lock lock {p->iconMutex_};
@ -716,7 +718,7 @@ bool PlacefileIcons::RunMousePicking(
std::execution::par_unseq,
p->currentHoverIcons_.crbegin(),
p->currentHoverIcons_.crend(),
[&mapDistance, &selectedTime, &mapMatrix, &mousePos](const auto& icon)
[&mapDistance, &selectedTime, &mapMatrix, &mouseCoords](const auto& icon)
{
if ((
// Placefile is thresholded
@ -766,7 +768,7 @@ bool PlacefileIcons::RunMousePicking(
tr += otr;
// Test point against polygon bounds
return util::maplibre::IsPointInPolygon({tl, bl, br, tr}, mousePos);
return util::maplibre::IsPointInPolygon({tl, bl, br, tr}, mouseCoords);
});
if (it != p->currentHoverIcons_.crend())