History

Add RayIntersectionInfo and use for shape-vs-ray

Andrew Meadows committed 12 years ago

Commit 4da1ca21 parent c9d550819 files · +222 −197Browse files

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

Unified · Split

interface/src/MetavoxelSystem.cpp+3−3
@@ -2468,9 +2468,9 @@ void StaticModelRenderer::renderUnclipped(float alpha, Mode mode) { · 2467 unmodified lines
2468 _model->render(alpha);2468 _model->render(alpha);
2469}2469}
2470 2470
2471bool StaticModelRenderer::findRayIntersection(const glm::vec3& origin, const glm::vec3& direction,2471bool StaticModelRenderer::findRayIntersection(RayIntersectionInfo& intersection,
2472 const glm::vec3& clipMinimum, float clipSize, float& distance) const {2472 const glm::vec3& clipMinimum, float clipSize) const {
2473 return _model->findRayIntersection(origin, direction, distance);2473 return _model->findRayIntersection(intersection);
2474}2474}
2475 2475
2476void StaticModelRenderer::applyTranslation(const glm::vec3& translation) {2476void StaticModelRenderer::applyTranslation(const glm::vec3& translation) {