Changeset 5717

Timestamp:

Jun 17, 2015, 2:14:44 AM (9 years ago)

Author:

ldelgass

Message:

Downsample volume if dims exceed hardware limits

Location:

nanovis/trunk

Files:

• VtkDataSetReader.cpp (modified) (2 diffs)
• nanovis.cpp (modified) (2 diffs)
• nanovis.h (modified) (1 diff)

nanovis/trunk/VtkDataSetReader.cpp

@@ -147 +147 @@
         print(dataSet);
 
-        int maxDim = 64;
-
         resampledDataSet = vtkImageData::SafeDownCast(dataSet.GetPointer());
         if (resampledDataSet != NULL) {
             // Have a uniform grid, check if we need to resample
 #ifdef DOWNSAMPLE_DATA
+            int maxDim = 64;
+#else
+            // This is the hardware limit
+            int maxDim = NanoVis::max3dTextureSize;
+#endif
             if (resampledDataSet->GetDimensions()[0] > maxDim ||
                 resampledDataSet->GetDimensions()[1] > maxDim ||
@@ -158 +161 @@
                 resampledDataSet = resampleVTKDataSet(dataSet, maxDim);
             }
-#endif
         } else {
+            int maxDim = 64;
             resampledDataSet = resampleVTKDataSet(dataSet, maxDim);
         }

nanovis/trunk/nanovis.cpp

@@ -77 +77 @@
 Camera *NanoVis::_camera = NULL;
 RenderContext *NanoVis::renderContext = NULL;
+GLint NanoVis::max3dTextureSize = 2048;
 
 NanoVis::TransferFunctionHashmap NanoVis::tfTable;
@@ -539 +540 @@
     _camera = new Camera(0, 0, winWidth, winHeight);
 
+    glGetIntegerv(GL_MAX_3D_TEXTURE_SIZE, &max3dTextureSize);
+    TRACE("Max 3D texture dim: %d", max3dTextureSize);
+
     glEnable(GL_TEXTURE_2D);
     glShadeModel(GL_FLAT);

nanovis/trunk/nanovis.h

@@ -139 +139 @@
     static util::Fonts *fonts;
     static graphics::RenderContext *renderContext;
+    static GLint max3dTextureSize;
 
     static TransferFunctionHashmap tfTable; ///< maps transfunc name to TransferFunction object