History

Warning fixes.

Andrzej Kapolka committed 12 years ago

Commit 18cb15e1 parent e6b0dc53 files · +13 −6Browse files

Showing the changes to interface/src/MetavoxelSystem.cpp (1 of 3 files). Show all

Unified · Split

interface/src/MetavoxelSystem.cpp+10−3
@@ -2319,9 +2319,16 @@ void StaticModelRenderer::renderUnclipped(float alpha, Mode mode) { · 2318 unmodified lines
23192319 _model->render(alpha);
23202320 }
23212321
2322−bool StaticModelRenderer::findRayIntersection(RayIntersectionInfo& intersection,
2323− const glm::vec3& clipMinimum, float clipSize) const {
2324− return _model->findRayIntersection(intersection);
2322+bool StaticModelRenderer::findRayIntersection(const glm::vec3& origin, const glm::vec3& direction,
2323+ const glm::vec3& clipMinimum, float clipSize, float& distance) const {
2324+ RayIntersectionInfo info;
2325+ info._rayStart = origin;
2326+ info._rayDirection = direction;
2327+ if (!_model->findRayIntersection(info)) {
2328+ return false;
2329+ }
2330+ distance = info._hitDistance;
2331+ return true;
23252332 }
23262333
23272334 void StaticModelRenderer::applyTranslation(const glm::vec3& translation) {