Changeset 820

Timestamp:

Nov 26, 2007, 11:34:00 AM (17 years ago)

Author:

vrinside

Message:

NaN values in a data set is taken into account.

Location:

trunk/vizservers/nanovis

Files:

• HeightMap.cpp (modified) (5 diffs)
• HeightMap.h (modified) (2 diffs)

trunk/vizservers/nanovis/HeightMap.cpp

@@ -8 +8 @@
 #include <memory.h>
 #include <R2/R2FilePath.h>
+#include "RpField1D.h"
+#include <sys/time.h>
+#include <sys/types.h>
+#include <unistd.h>
+#include <fcntl.h>
 
 HeightMap::HeightMap()
@@ -104 +109 @@
 }
 
-void HeightMap::createIndexBuffer(int xCount, int zCount, int*& indexBuffer, int& indexCount)
+void HeightMap::createIndexBuffer(int xCount, int zCount, int*& indexBuffer, int& indexCount, float* heights)
 {
         indexCount = (xCount - 1) * (zCount - 1) * 6;
@@ -114 +119 @@
     int boundaryHeight = zCount - 1;
     int* ptr = indexBuffer;
-    for (i = 0; i < boundaryHeight; ++i)
+    int index1, index2, index3, index4;
+    bool index1Valid, index2Valid, index3Valid, index4Valid;
+    index1Valid = index2Valid = index3Valid = index4Valid = true;
+
+    if (heights)
     {
-        for (j = 0; j < boundaryWidth; ++j)
+        int ic = 0;
+        for (i = 0; i < boundaryHeight; ++i)
         {
-            *ptr = i * xCount + j; ++ptr;
-            *ptr = (i + 1) * xCount + j; ++ptr;
-            *ptr = (i + 1) * xCount + j + 1; ++ptr;
-
-                        *ptr = i * xCount + j; ++ptr;
-                        *ptr = (i + 1) * xCount + j + 1; ++ptr;
-            *ptr = i * xCount + j + 1; ++ptr;
+            for (j = 0; j < boundaryWidth; ++j)
+            {
+                index1 = i * xCount +j;
+                if (isnan(heights[index1])) index1Valid = false;
+                index2 = (i + 1) * xCount + j;
+                if (isnan(heights[index2])) index2Valid = false;
+                index3 = (i + 1) * xCount + j + 1;
+                if (isnan(heights[index3])) index3Valid = false;
+                index4 = i * xCount + j + 1;
+                if (isnan(heights[index4])) index4Valid = false;
+
+        
+            
+                if (index1Valid && index2Valid && index3Valid) 
+                {
+                    *ptr = index1; ++ptr;
+                    *ptr = index2; ++ptr;
+                    *ptr = index3; ++ptr;
+                    ++ic;
+                }
+                if (index1Valid && index3Valid && index4Valid) 
+                {
+                    *ptr = index1; ++ptr;
+                    *ptr = index3; ++ptr;
+                    *ptr = index4; ++ptr;
+                    ++ic;
+                }
+            }
         }
     }
+    else 
+    {
+        for (i = 0; i < boundaryHeight; ++i)
+        {
+            for (j = 0; j < boundaryWidth; ++j)
+            {
+                *ptr = i * xCount + j; ++ptr;
+                *ptr = (i + 1) * xCount + j; ++ptr;
+                *ptr = (i + 1) * xCount + j + 1; ++ptr;
+
+                        *ptr = i * xCount + j; ++ptr;
+                            *ptr = (i + 1) * xCount + j + 1; ++ptr;
+                *ptr = i * xCount + j + 1; ++ptr;
+            }
+        }
+    }
+
 }
 
@@ -195 +243 @@
                 }
 
-                this->createIndexBuffer(xCount, yCount, _indexBuffer, _indexCount);
+                this->createIndexBuffer(xCount, yCount, _indexBuffer, _indexCount, 0);
         //}
         //else
@@ -258 +306 @@
                 }
 
-                this->createIndexBuffer(xCount, yCount, _indexBuffer, _indexCount);
+                this->createIndexBuffer(xCount, yCount, _indexBuffer, _indexCount, heights);
         //}
         //else

trunk/vizservers/nanovis/HeightMap.h

@@ -9 +9 @@
 #include "Vector3.h"
 
+/**
+ *@class HeightMap
+ *@brief Create a surface from height map and line contour of the generated surface
+ */
 class HeightMap {
         unsigned int _vertexBufferObjectID;
@@ -28 +32 @@
 
 public :
+    /**
+     *@brief Constructor
+     */
         HeightMap();
+    /**
+     *@brief Destructor
+     */
         ~HeightMap();
 
 private :
-        void createIndexBuffer(int xCount, int zCount, int*& indexBuffer, int& indexCount);
+        void createIndexBuffer(int xCount, int zCount, int*& indexBuffer, int& indexCount, float* heights);
         Vector3* createHeightVertices(float startX, float startY, float endX, float endY, int xCount, int yCount, float* height);
         void reset();
 public :
         void render();
+    /**
+     *@brief Create a height map with heigh values
+     *@param startX a x position of the first height value
+     *@param startY a y position of the first height value
+     *@param endX a x position of the last height value
+     *@param endY a y position of the last height value
+     *@param xCount the number of columns of height values
+     *@param yCount the number of rows of height values
+     *@param height a pointer value adrressing xCount * yCount values of heights
+     */
         void setHeight(float startX, float startY, float endX, float endY, int xCount, int yCount, float* height);
+
+    /**
+     *@brief Create a height map with a set of points
+     *@param xCount the number of columns of height values
+     *@param yCount the number of rows of height values
+     */
         void setHeight(int xCount, int yCount, Vector3* heights);
+
+    /**
+     *@brief Define a color map for color shading of heighmap
+     */
         void setColorMap(TransferFunction* colorMap);
 
+    /**
+     *@brief Set the visibility of the height map
+     */
         void setVisible(bool visible);
+
+    /**
+     *@brief Return the status of the visibility
+     */
         bool isVisible() const;
+
+    /**
+     *@brief Set the visibility of the line contour
+     */
         void setLineContourVisible(bool visible);
+
+    /**
+     *@brief Defind the color of the line contour
+     */
     void setLineContourColor(float r, float g, float b);
 };