From 8021f98c9c9a300f64b833c35187035e2aa28752 Mon Sep 17 00:00:00 2001 From: Pierre Kraemer Date: Fri, 13 Sep 2013 16:32:53 +0200 Subject: [PATCH] selection follows map frame --- .../surface_selection/src/surface_selection.cpp | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/SCHNApps/Plugins/surface_selection/src/surface_selection.cpp b/SCHNApps/Plugins/surface_selection/src/surface_selection.cpp index 224b2d971..d27a11b83 100644 --- a/SCHNApps/Plugins/surface_selection/src/surface_selection.cpp +++ b/SCHNApps/Plugins/surface_selection/src/surface_selection.cpp @@ -132,8 +132,11 @@ void Surface_Selection_Plugin::mousePress(View* view, QMouseEvent* event) qglviewer::Vec dir; view->camera()->convertClickToLine(pixel, orig, dir); - PFP2::VEC3 rayA(orig.x, orig.y, orig.z); - PFP2::VEC3 AB(dir.x, dir.y, dir.z); + qglviewer::Vec orig_inv = mh->getFrame()->coordinatesOf(orig); + qglviewer::Vec dir_inv = mh->getFrame()->transformOf(dir); + + PFP2::VEC3 rayA(orig_inv.x, orig_inv.y, orig_inv.z); + PFP2::VEC3 AB(dir_inv.x, dir_inv.y, dir_inv.z); Dart d; PFP2::MAP* map = static_cast*>(mh)->getMap(); @@ -182,8 +185,11 @@ void Surface_Selection_Plugin::mouseMove(View* view, QMouseEvent* event) qglviewer::Vec dir; view->camera()->convertClickToLine(pixel, orig, dir); - PFP2::VEC3 rayA(orig.x, orig.y, orig.z); - PFP2::VEC3 AB(dir.x, dir.y, dir.z); + qglviewer::Vec orig_inv = mh->getFrame()->coordinatesOf(orig); + qglviewer::Vec dir_inv = mh->getFrame()->transformOf(dir); + + PFP2::VEC3 rayA(orig_inv.x, orig_inv.y, orig_inv.z); + PFP2::VEC3 AB(dir_inv.x, dir_inv.y, dir_inv.z); Dart d; PFP2::MAP* map = static_cast*>(mh)->getMap(); -- GitLab