Changeset 4612 for nanovis/branches/1.1/HeightMap.cpp

Timestamp:

Aug 2, 2014 11:06:20 AM (10 years ago)

Author:

ldelgass

Message:

merge r3597 from trunk

Location:

nanovis/branches/1.1

Files:

• . (modified) (1 prop)
• HeightMap.cpp (modified) (10 diffs)

nanovis/branches/1.1/HeightMap.cpp

@@ -23 +23 @@
 
 HeightMap::HeightMap() : 
-    _vertexBufferObjectID(0), 
-    _texcoordBufferObjectID(0), 
-    _vertexCount(0), 
-    _contour(0), 
-    _tfPtr(0), 
+    _vertexBufferObjectID(0),
+    _texcoordBufferObjectID(0),
+    _vertexCount(0),
+    _contour(NULL),
+    _transferFunc(NULL),
     _opacity(0.5f),
-    _indexBuffer(0), 
-    _indexCount(0), 
-    _contourColor(1.0f, 0.0f, 0.0f), 
-    _contourVisible(false), 
+    _indexBuffer(NULL),
+    _indexCount(0),
+    _contourColor(1.0f, 0.0f, 0.0f),
+    _contourVisible(false),
     _visible(false),
-    _scale(1.0f, 1.0f, 1.0f), 
+    _scale(1.0f, 1.0f, 1.0f),
     _centerPoint(0.0f, 0.0f, 0.0f),
     _heights(NULL)
@@ -93 +93 @@
         glDisableClientState(GL_NORMAL_ARRAY);
 
-        if (_tfPtr) {
+        if (_transferFunc) {
             // PUT vertex program here
             //
             //
             _shader->bind();
-            _shader->setFPTextureParameter("tf", _tfPtr->id());
+            _shader->setFPTextureParameter("tf", _transferFunc->id());
             _shader->setFPParameter1f("opacity", _opacity);
 
             glEnable(GL_TEXTURE_1D);
-            _tfPtr->getTexture()->activate();
+            _transferFunc->getTexture()->activate();
  
             glEnableClientState(GL_TEXTURE_COORD_ARRAY);
@@ -125 +125 @@
 
         glDisableClientState(GL_VERTEX_ARRAY);
-        if (_tfPtr != NULL) {
-            _tfPtr->getTexture()->deactivate();
+        if (_transferFunc != NULL) {
+            _transferFunc->getTexture()->deactivate();
             glDisableClientState(GL_TEXTURE_COORD_ARRAY);
 
@@ -384 +384 @@
     }
     ContourLineFilter lineFilter;
-    //lineFilter.transferFunction(_tfPtr);
+    //lineFilter.transferFunction(_transferFunc);
     _contour = lineFilter.create(0.0f, 1.0f, 10, map, xNum, yNum);
 
@@ -398 +398 @@
     Vector3f* vertices = new Vector3f[xNum * yNum];
 
-    Vector3f* dstDataPtr = vertices;
-    float* srcDataPtr = height;
+    Vector3f* dstData = vertices;
+    float* srcData = height;
     
     for (int y = 0; y < yNum; ++y) {
@@ -409 +409 @@
 
             xCoord = xMin + ((xMax - xMin) * x) / (xNum - 1); 
-            dstDataPtr->set(xCoord, *srcDataPtr, yCoord);
-
-            ++dstDataPtr;
-            ++srcDataPtr;
+            dstData->set(xCoord, *srcData, yCoord);
+
+            ++dstData;
+            ++srcData;
         }
     }
@@ -422 +422 @@
  */
 void 
-HeightMap::mapToGrid(Grid *gridPtr)
+HeightMap::mapToGrid(Grid *grid)
 {
     int count = _xNum * _yNum;
@@ -432 +432 @@
     // this surface's y-values (heights) into the grid's axis coordinates.
 
-    float yScale = 1.0 / (gridPtr->yAxis.max() - gridPtr->yAxis.min());
+    float yScale = 1.0 / (grid->yAxis.max() - grid->yAxis.min());
     float *p, *q, *pend;
     float *normHeights = new float[count];
     for (p = _heights, pend = p + count, q = normHeights; p < pend; p++, q++) {
-        *q = (*p - gridPtr->yAxis.min()) * yScale;
+        *q = (*p - grid->yAxis.min()) * yScale;
     }
     Vector3f *t, *texcoord;
@@ -450 +450 @@
     float xMin, xMax, zMin, zMax;
 
-    xScale = 1.0 / (gridPtr->xAxis.max() - gridPtr->xAxis.min());
-    xMin = (xAxis.min() - gridPtr->xAxis.min()) * xScale;
-    xMax = (xAxis.max() - gridPtr->xAxis.min()) * xScale;
-    zScale = 1.0 / (gridPtr->zAxis.max() - gridPtr->zAxis.min());
-    zMin = (zAxis.min() - gridPtr->zAxis.min()) * zScale;
-    zMax = (zAxis.max() - gridPtr->zAxis.min()) * zScale;
+    xScale = 1.0 / (grid->xAxis.max() - grid->xAxis.min());
+    xMin = (xAxis.min() - grid->xAxis.min()) * xScale;
+    xMax = (xAxis.max() - grid->xAxis.min()) * xScale;
+    zScale = 1.0 / (grid->zAxis.max() - grid->zAxis.min());
+    zMin = (zAxis.min() - grid->zAxis.min()) * zScale;
+    zMax = (zAxis.max() - grid->zAxis.min()) * zScale;
 
     Vector3f* vertices;
@@ -477 +477 @@
     }
     ContourLineFilter lineFilter;
-    //lineFilter.transferFunction(_tfPtr);
+    //lineFilter.transferFunction(_transferFunc);
     _contour = lineFilter.create(0.0f, 1.0f, 10, vertices, _xNum, _yNum);