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
2319 _model->render(alpha);2319 _model->render(alpha);
2320}2320}
2321 2321
2322bool StaticModelRenderer::findRayIntersection(RayIntersectionInfo& intersection,2322bool StaticModelRenderer::findRayIntersection(const glm::vec3& origin, const glm::vec3& direction,
2323 const glm::vec3& clipMinimum, float clipSize) const {2323 const glm::vec3& clipMinimum, float clipSize, float& distance) const {
2324 return _model->findRayIntersection(intersection);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;
2325}2332}
2326 2333
2327void StaticModelRenderer::applyTranslation(const glm::vec3& translation) {2334void StaticModelRenderer::applyTranslation(const glm::vec3& translation) {