History

Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels

Andrzej Kapolka committed 11 years ago

Commit ace415b2 parents 9819658 dbf64b229 files · +2293 −5998Browse files

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

Unified · Split

interface/src/MetavoxelSystem.cpp+3−3
@@ -192,7 +192,7 @@ static const float EIGHT_BIT_MAXIMUM_RECIPROCAL = 1.0f / EIGHT_BIT_MAXIMUM; · 191 unmodified lines
192192
193193 void MetavoxelSystem::render() {
194194 // update the frustum
195− ViewFrustum* viewFrustum = Application::getInstance()->getDisplayViewFrustum();
195+ ViewFrustum* viewFrustum = Application::getInstance()->getViewFrustum();
196196 _frustum.set(viewFrustum->getFarTopLeft(), viewFrustum->getFarTopRight(), viewFrustum->getFarBottomLeft(),
197197 viewFrustum->getFarBottomRight(), viewFrustum->getNearTopLeft(), viewFrustum->getNearTopRight(),
198198 viewFrustum->getNearBottomLeft(), viewFrustum->getNearBottomRight());
@@ -600,7 +600,7 @@ protected: · 401 unmodified lines
600600 SpannerRenderVisitor::SpannerRenderVisitor(const MetavoxelLOD& lod) :
601601 SpannerVisitor(QVector<AttributePointer>() << AttributeRegistry::getInstance()->getSpannersAttribute(),
602602 QVector<AttributePointer>(), QVector<AttributePointer>(), lod,
603− encodeOrder(Application::getInstance()->getDisplayViewFrustum()->getDirection())),
603+ encodeOrder(Application::getInstance()->getViewFrustum()->getDirection())),
604604 _containmentDepth(INT_MAX) {
605605 }
606606
@@ -1953,7 +1953,7 @@ private: · 1346 unmodified lines
19531953
19541954 BufferRenderVisitor::BufferRenderVisitor(const AttributePointer& attribute) :
19551955 MetavoxelVisitor(QVector<AttributePointer>() << attribute),
1956− _order(encodeOrder(Application::getInstance()->getDisplayViewFrustum()->getDirection())),
1956+ _order(encodeOrder(Application::getInstance()->getViewFrustum()->getDirection())),
19571957 _containmentDepth(INT_MAX) {
19581958 }
19591959