Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-20 03:24:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update billboard and planar overlays to use new findRayRectangleIntersection signature

Browse source
This commit is contained in:
Ryan Huffman 2015-02-25 10:27:11 -08:00
parent 14ec9b431e
commit c499352ad8
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/src/ui/overlays/BillboardOverlay.cpp
View file

@ -209,7 +209,7 @@ bool BillboardOverlay::findRayIntersection(const glm::vec3& origin, const glm::v
float maxSize = glm::max(width, height);
glm::vec2 dimensions = _scale * glm::vec2(width / maxSize, height / maxSize);
return findRayRectangleIntersection(origin, direction, rotation, _position, dimensions);
return findRayRectangleIntersection(origin, direction, rotation, _position, dimensions, distance);
}
return false;

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

@ -95,5 +95,5 @@ QScriptValue Planar3DOverlay::getProperty(const QString& property) {
bool Planar3DOverlay::findRayIntersection(const glm::vec3& origin, const glm::vec3& direction,
float& distance, BoxFace& face) {
return findRayRectangleIntersection(origin, direction, _rotation, _position, _dimensions);
return findRayRectangleIntersection(origin, direction, _rotation, _position, _dimensions, distance);
}