History

Ray intersections for models, don't load resources if there's no network manager installed.

Andrzej Kapolka committed 12 years ago

Commit ae6a59e1 parent 78957e45 files · +23 −4Browse files

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

Unified · Split

interface/src/MetavoxelSystem.cpp+4−0
@@ -360,6 +360,10 @@ void StaticModelRenderer::render(float alpha) { · 359 unmodified lines
360 _model->render(alpha);360 _model->render(alpha);
361}361}
362 362
363bool StaticModelRenderer::findRayIntersection(const glm::vec3& origin, const glm::vec3& direction, float& distance) const {
364 return _model->findRayIntersection(origin, direction, distance);
365}
366
363void StaticModelRenderer::applyTranslation(const glm::vec3& translation) {367void StaticModelRenderer::applyTranslation(const glm::vec3& translation) {
364 _model->setTranslation(translation);368 _model->setTranslation(translation);
365}369}