Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-25 17:14:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

PR feedback

Browse source
This commit is contained in:
Brad Davis 2016-06-10 10:09:09 -07:00 committed by Brad Davis
parent bb3722d915
commit 130c0dda31
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.h
View file

@ -152,7 +152,7 @@ protected:
}
private:
// Any resource shared by the main thread and the presntaion thread must
// Any resource shared by the main thread and the presentation thread must
// be serialized through this mutex
mutable Mutex _presentMutex;
ProgramPtr _activeProgram;

3
libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.cpp
View file

@ -408,9 +408,11 @@ bool HmdDisplayPlugin::setHandLaser(uint32_t hands, HandLaserMode mode, const ve
}
});
// FIXME defer to a child class plugin to determine if hand lasers are actually
// available based on the presence or absence of hand controllers
return true;
}
// FIXME try to consolidate the duplication of logic between this function and a similar one in CompsitorHelper.
static float calculateRayUiCollisionDistance(const glm::mat4& headPose, const glm::vec3& position, const glm::vec3& direction) {
auto relativePosition4 = glm::inverse(headPose) * vec4(position, 1);
auto relativePosition = vec3(relativePosition4) / relativePosition4.w;
@ -418,6 +420,7 @@ static float calculateRayUiCollisionDistance(const glm::mat4& headPose, const gl
if (glm::abs(glm::length2(relativeDirection) - 1.0f) > EPSILON) {
relativeDirection = glm::normalize(relativeDirection);
}
// FIXME fetch the actual UI radius from... somewhere?
float uiRadius = 1.0f;
float instersectionDistance;
if (!glm::intersectRaySphere(relativePosition, relativeDirection, vec3(0), uiRadius * uiRadius, instersectionDistance)) {