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

Implement dimensions test for 3D planar overlay intersection

Browse source
This commit is contained in:
David Rowe 2015-02-05 09:38:45 -08:00
parent 056365932b
commit 2f6749ff69
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
interface/src/ui/overlays/Planar3DOverlay.cpp
View file

@ -93,7 +93,6 @@ QScriptValue Planar3DOverlay::getProperty(const QString& property) {
bool Planar3DOverlay::findRayIntersection(const glm::vec3& origin, const glm::vec3& direction, bool Planar3DOverlay::findRayIntersection(const glm::vec3& origin, const glm::vec3& direction,
float& distance, BoxFace& face) { float& distance, BoxFace& face) {
RayIntersectionInfo rayInfo; RayIntersectionInfo rayInfo;
rayInfo._rayStart = origin; rayInfo._rayStart = origin;
rayInfo._rayDirection = direction; rayInfo._rayDirection = direction;
@ -110,9 +109,13 @@ bool Planar3DOverlay::findRayIntersection(const glm::vec3& origin, const glm::ve
if (intersects) { if (intersects) {
distance = rayInfo._hitDistance; distance = rayInfo._hitDistance;
// TODO: if it intersects, we want to check to see if the intersection point is within our dimensions
// glm::vec3 hitAt = origin + direction * distance; glm::vec3 hitPosition = origin + (distance * direction);
// _dimensions glm::vec3 localHitPosition = glm::inverse(_rotation) * (hitPosition - _position);
glm::vec2 halfDimensions = _dimensions / 2.0f;
intersects = -halfDimensions.x <= localHitPosition.x && localHitPosition.x <= halfDimensions.x
&& -halfDimensions.y <= localHitPosition.y && localHitPosition.y <= halfDimensions.y;
} }
return intersects; return intersects;
} }