History

Revert "get rid of redundant _displayViewFrustum and use _viewFrustum"

This reverts commit 6d385d9a75de786e0d1f583ad8448c30a9df2492.

ZappoMan committed 11 years ago

Commit e68e3fe1 parent 9753c824 files · +9 −7Browse 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
192 192
193void MetavoxelSystem::render() {193void MetavoxelSystem::render() {
194 // update the frustum194 // update the frustum
195 ViewFrustum* viewFrustum = Application::getInstance()->getViewFrustum();195 ViewFrustum* viewFrustum = Application::getInstance()->getDisplayViewFrustum();
196 _frustum.set(viewFrustum->getFarTopLeft(), viewFrustum->getFarTopRight(), viewFrustum->getFarBottomLeft(),196 _frustum.set(viewFrustum->getFarTopLeft(), viewFrustum->getFarTopRight(), viewFrustum->getFarBottomLeft(),
197 viewFrustum->getFarBottomRight(), viewFrustum->getNearTopLeft(), viewFrustum->getNearTopRight(),197 viewFrustum->getFarBottomRight(), viewFrustum->getNearTopLeft(), viewFrustum->getNearTopRight(),
198 viewFrustum->getNearBottomLeft(), viewFrustum->getNearBottomRight());198 viewFrustum->getNearBottomLeft(), viewFrustum->getNearBottomRight());
@@ -1896,7 +1896,7 @@ private: · 1697 unmodified lines
1896SpannerRenderVisitor::SpannerRenderVisitor(const MetavoxelLOD& lod) :1896SpannerRenderVisitor::SpannerRenderVisitor(const MetavoxelLOD& lod) :
1897 SpannerVisitor(QVector<AttributePointer>() << AttributeRegistry::getInstance()->getSpannersAttribute(),1897 SpannerVisitor(QVector<AttributePointer>() << AttributeRegistry::getInstance()->getSpannersAttribute(),
1898 QVector<AttributePointer>(), QVector<AttributePointer>(), lod,1898 QVector<AttributePointer>(), QVector<AttributePointer>(), lod,
1899 encodeOrder(Application::getInstance()->getViewFrustum()->getDirection())),1899 encodeOrder(Application::getInstance()->getDisplayViewFrustum()->getDirection())),
1900 _containmentDepth(INT_MAX) {1900 _containmentDepth(INT_MAX) {
1901}1901}
1902 1902
@@ -1932,7 +1932,7 @@ private: · 29 unmodified lines
1932 1932
1933BufferRenderVisitor::BufferRenderVisitor(const AttributePointer& attribute) :1933BufferRenderVisitor::BufferRenderVisitor(const AttributePointer& attribute) :
1934 MetavoxelVisitor(QVector<AttributePointer>() << attribute),1934 MetavoxelVisitor(QVector<AttributePointer>() << attribute),
1935 _order(encodeOrder(Application::getInstance()->getViewFrustum()->getDirection())),1935 _order(encodeOrder(Application::getInstance()->getDisplayViewFrustum()->getDirection())),
1936 _containmentDepth(INT_MAX) {1936 _containmentDepth(INT_MAX) {
1937}1937}
1938 1938