History

get rid of redundant _displayViewFrustum and use _viewFrustum

ZappoMan committed 11 years ago

Commit 9753c821 parent feab9424 files · +7 −9Browse files

Showing the changes to interface/src/MetavoxelSystem.cpp (1 of 4 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());
@@ -1896,7 +1896,7 @@ private: · 1697 unmodified lines
18961896 SpannerRenderVisitor::SpannerRenderVisitor(const MetavoxelLOD& lod) :
18971897 SpannerVisitor(QVector<AttributePointer>() << AttributeRegistry::getInstance()->getSpannersAttribute(),
18981898 QVector<AttributePointer>(), QVector<AttributePointer>(), lod,
1899− encodeOrder(Application::getInstance()->getDisplayViewFrustum()->getDirection())),
1899+ encodeOrder(Application::getInstance()->getViewFrustum()->getDirection())),
19001900 _containmentDepth(INT_MAX) {
19011901 }
19021902
@@ -1932,7 +1932,7 @@ private: · 29 unmodified lines
19321932
19331933 BufferRenderVisitor::BufferRenderVisitor(const AttributePointer& attribute) :
19341934 MetavoxelVisitor(QVector<AttributePointer>() << attribute),
1935− _order(encodeOrder(Application::getInstance()->getDisplayViewFrustum()->getDirection())),
1935+ _order(encodeOrder(Application::getInstance()->getViewFrustum()->getDirection())),
19361936 _containmentDepth(INT_MAX) {
19371937 }
19381938