Changeset 5718 for nanovis/branches

Timestamp:

Jun 17, 2015 2:23:37 AM (6 years ago)

Author:

ldelgass

Message:

Merge from trunk

Location:

nanovis/branches/1.2

Files:

• . (modified) (1 prop)
• ConvexPolygon.cpp (modified) (2 diffs)
• ConvexPolygon.h (modified) (1 diff)
• HeightMap.cpp (modified) (5 diffs)
• ParticleAdvectionShader.h (modified) (1 diff)
• ParticleRenderer.h (modified) (1 diff)
• VtkDataSetReader.cpp (modified) (2 diffs)
• nanovis.cpp (modified) (4 diffs)
• nanovis.h (modified) (2 diffs)

nanovis/branches/1.2/ConvexPolygon.cpp

@@ -136 +136 @@
 
 void
-ConvexPolygon::emit(bool useTexture)
+ConvexPolygon::emit(bool emitTexcoords)
 {
     if (vertices.size() >= 3) {
         for (unsigned int i = 0; i < vertices.size(); i++) {
-            if (useTexture) {
+            if (emitTexcoords) {
                 glTexCoord4fv((float *)&(texcoords[i]));
-                //glTexCoord4fv((float *)&(vertices[i]));
             }
             glVertex4fv((float *)&(vertices[i]));
@@ -150 +149 @@
     }
 }
-
-void 
-ConvexPolygon::emit(bool useTexture, const Vector3f& shift, const Vector3f& scale) 
-{
-    if (vertices.size() >= 3) {
-        for (unsigned int i = 0; i < vertices.size(); i++) {
-            if (useTexture) {
-                glTexCoord4fv((float *)&(vertices[i]));
-            }
-            Vector4f tmp = (vertices[i]);
-            Vector4f shift_4d = Vector4f(shift.x, shift.y, shift.z, 0);
-            tmp = tmp + shift_4d;
-            tmp.x = tmp.x * scale.x;
-            tmp.y = tmp.y * scale.y;
-            tmp.z = tmp.z * scale.z;
-            glVertex4fv((float *)(&tmp));
-        }
-    } else {
-        WARN("No polygons to render");
-    }
-}

nanovis/branches/1.2/ConvexPolygon.h

@@ -38 +38 @@
     bool clip(nv::Plane& clipPlane, bool copyToTexcoords);
 
-    void emit(bool useTexture);
-
-    void emit(bool useTexture, const vrmath::Vector3f& shift, const vrmath::Vector3f& scale);
+    void emit(bool emitTexcoords);
 
     void copyVerticesToTexcoords();

nanovis/branches/1.2/HeightMap.cpp

@@ -76 +76 @@
     glPushMatrix();
 
-#ifndef notdef
     if (_scale.x != 0.0) {
         glScalef(1 / _scale.x, 1 / _scale.y , 1 / _scale.z);
     }
-#endif
     glTranslatef(-_centerPoint.x, -_centerPoint.y, -_centerPoint.z);
 
@@ -304 +302 @@
     _contour = lineFilter.create(0.0f, 1.0f, 10, heights, xCount, yCount);
 
-    //if (heightMap)
-    //{
-    //  VertexBuffer* vertexBuffer = new VertexBuffer(VertexBuffer::POSITION3, xCount * yCount, sizeof(Vector3f) * xCount * yCount, heightMap, false);
+    //if (heightMap) {
+    //    VertexBuffer* vertexBuffer = new VertexBuffer(VertexBuffer::POSITION3, xCount * yCount,
+    //        sizeof(Vector3f) * xCount * yCount, heightMap, false);
     this->createIndexBuffer(xCount, yCount, 0);
-    //}
-    //else
-    //{
-    //ERROR("HeightMap::setHeight");
+    //} else {
+    //    ERROR("HeightMap::setHeight");
     //}
 }
@@ -334 +330 @@
         }
     }
-#ifdef notdef
-    if (retainScale_) {
-        // Check the units of each axis.  If they are the same, we want to
-        // retain the surface's aspect ratio when transforming coordinates to
-        // the grid. Use the range of the longest axis when the units are the
-        // same.
-        if (xAxis.units() != NULL) && (xAxis.units() == yAxis.units()) {
-        }
-        if (yAxis.units() != NULL) && (yAxis.units() == zAxis.units()) {
-        }
-    }
-#endif
 
     wAxis.setRange(min, max);
@@ -362 +346 @@
     _centerPoint.set(0.5, 0.5, 0.5);
 
-#ifndef notdef
     Vector3f* texcoord = new Vector3f[_vertexCount];
     for (int i = 0; i < _vertexCount; ++i) {
@@ -394 +377 @@
     this->createIndexBuffer(xNum, yNum, heights);
     delete [] map;
-#endif
 }
 

nanovis/branches/1.2/ParticleAdvectionShader.h

@@ -34 +34 @@
         _max = max;
         /* FIXME: _max is the maximum displacement in world coords per
-         * time step.  Need to determine a scale factor to get an 
+         * time step.  Need to determine a scale factor to get an
          * appropriate animation speed
          */

nanovis/branches/1.2/ParticleRenderer.h

@@ -118 +118 @@
     bool _flip;
 
+    /// Maximum number of frame iterations before reset
     unsigned int _maxLife;
 

nanovis/branches/1.2/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/branches/1.2/nanovis.cpp

@@ -77 +77 @@
 Camera *NanoVis::_camera = NULL;
 RenderContext *NanoVis::renderContext = NULL;
+GLint NanoVis::max3dTextureSize = 2048;
 
 NanoVis::TransferFunctionHashmap NanoVis::tfTable;
@@ -285 +286 @@
 int
 NanoVis::renderLegend(TransferFunction *tf, double min, double max,
-                      int width, int height, const char *volArg)
+                      int width, int height, const char *tag)
 {
     TRACE("Enter");
@@ -313 +314 @@
         char prefix[200];
 
-        TRACE("Sending ppm legend image %s min:%g max:%g", volArg, min, max);
-        sprintf(prefix, "nv>legend %s %g %g", volArg, min, max);
+        TRACE("Sending ppm legend image %s min:%g max:%g", tag, min, max);
+        sprintf(prefix, "nv>legend %s %g %g", tag, min, max);
 #ifdef USE_THREADS
         queuePPM(g_queue, prefix, screenBuffer, width, height);
@@ -545 +546 @@
     _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/branches/1.2/nanovis.h

@@ -94 +94 @@
 
     static int renderLegend(TransferFunction *tf, double min, double max, 
-                            int width, int height, const char *volArg);
+                            int width, int height, const char *tag);
 
     static Volume *loadVolume(const char *tag, int width, int height, int depth,
@@ -139 +139 @@
     static util::Fonts *fonts;
     static graphics::RenderContext *renderContext;
+    static GLint max3dTextureSize;
 
     static TransferFunctionHashmap tfTable; ///< maps transfunc name to TransferFunction object