mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-01 17:20:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fixed edge case and cleanup

Browse Source 
Fixed picking edge case, where we now will sort our elements as before
Also used another ray-sphere intersect fn as we did not use everything
from the other one.
This commit is contained in:
Mikael Pettersson
2019-12-11 09:56:45 +01:00
parent 43296979d8
commit 69fb1eec20
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
modules/touch/src/touchinteraction.cpp
View File

@@ -594,12 +594,13 @@ void TouchInteraction::findSelectedNode(const std::vector<TuioCursor>& list) {
long id = c.getSessionID();
for (SceneGraphNode* node : selectableNodes) {
double boundingSphere = node->boundingSphere();
double boundingSphereSquared = double(node->boundingSphere()) * double(node->boundingSphere());
glm::dvec3 camToSelectable = node->worldPosition() - camPos;
glm::dvec3 intersectionPos = {};
glm::dvec3 intersectionNormal = {};
bool intersected = glm::intersectRaySphere(camPos, raytrace, node->worldPosition(), boundingSphere, intersectionPos, intersectionNormal);
double intersectionDist = 0.0;
bool intersected = glm::intersectRaySphere(camPos, raytrace, node->worldPosition(),
boundingSphereSquared, intersectionDist);
if (intersected) {
glm::dvec3 intersectionPos = camPos + raytrace * intersectionDist;
glm::dvec3 pointInModelView = glm::inverse(node->worldRotationMatrix()) *
(intersectionPos - node->worldPosition());
@@ -660,7 +661,7 @@ void TouchInteraction::findSelectedNode(const std::vector<TuioCursor>& list) {
"Picking candidate based on proximity"
);
#endif //#ifdef TOUCH_DEBUG_NODE_PICK_MESSAGES
double dist = length(intersectionPos - camPos);
double dist = length(camToSelectable);
if (dist < std::get<1>(currentlyPicked)) {
currentlyPicked = {
node,