Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-06 18:50:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #5399 from ZappoMan/fixJSRayPick

Browse source 
Fix JS calls to computePickRay() when mini-mirror is showing
This commit is contained in:
Brad Davis 2015-07-24 11:46:07 -04:00
commit 6899279d7d
1 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
interface/src/Application.cpp
View file

@ -2969,11 +2969,7 @@ PickRay Application::computePickRay(float x, float y) const {
if (isHMDMode()) { if (isHMDMode()) {
getApplicationCompositor().computeHmdPickRay(glm::vec2(x, y), result.origin, result.direction); getApplicationCompositor().computeHmdPickRay(glm::vec2(x, y), result.origin, result.direction);
} else { } else {
if (QThread::currentThread() == activeRenderingThread) { getViewFrustum()->computePickRay(x, y, result.origin, result.direction);
getDisplayViewFrustum()->computePickRay(x, y, result.origin, result.direction);
} else {
getViewFrustum()->computePickRay(x, y, result.origin, result.direction);
}
} }
return result; return result;
} }