Changeset 780 for trunk/vizservers

Timestamp:

Jul 10, 2007, 7:55:13 AM (17 years ago)

Author:

vrinside

Message:

Add changing the color of linecontour

Location:

trunk/vizservers/nanovis

Files:

• ContourLineFilter.cpp (modified) (3 diffs)
• HeightMap.cpp (modified) (1 diff)
• HeightMap.h (modified) (2 diffs)
• R2/src/R2Geometry.cpp (modified) (1 diff)
• nanovis.cpp (modified) (2 diffs)

trunk/vizservers/nanovis/ContourLineFilter.cpp

@@ -52 +52 @@
 
         Vector3* vertexSet = (Vector3*) malloc(sizeof(Vector3) * totalNumOfPoints);
-        Vector3* colorSet = (Vector3*) malloc(sizeof(Vector3) * totalNumOfPoints);
+        Vector3* colorSet = 0;
+    if (_colorMap) 
+    {
+        colorSet = (Vector3*) malloc(sizeof(Vector3) * totalNumOfPoints);
+    }
         
         ContourLineFilter::ContourLineList::iterator iter;
@@ -68 +72 @@
                         else
                         {
-                                colorSet[index].set((*iter)->_value, (*iter)->_value, (*iter)->_value);
+                                //colorSet[index].set((*iter)->_value, (*iter)->_value, (*iter)->_value);
                         }
                         vertexSet[index] = (*iter2);
@@ -76 +80 @@
         R2VertexBuffer* vertexBuffer = new R2VertexBuffer(R2VertexBuffer::POSITION3, totalNumOfPoints,
                                                                                 totalNumOfPoints * sizeof(Vector3), vertexSet, false);
-        R2VertexBuffer* colorBuffer = new R2VertexBuffer(R2VertexBuffer::COLOR4, totalNumOfPoints,
+        R2VertexBuffer* colorBuffer = 0;
+        R2Geometry* geometry = 0;
+    if (_colorMap)
+    {
+        colorBuffer  = new R2VertexBuffer(R2VertexBuffer::COLOR4, totalNumOfPoints,
                                                                                 totalNumOfPoints * sizeof(Vector3), colorSet, false);
-        R2Geometry* geometry = new R2Geometry(R2Geometry::LINES, vertexBuffer, colorBuffer, 0);
+    }
+
+        geometry = new R2Geometry(R2Geometry::LINES, vertexBuffer, colorBuffer, 0);
 
         clear();

trunk/vizservers/nanovis/HeightMap.cpp

@@ -11 +11 @@
 HeightMap::HeightMap()
 : _contour(0), _colorMap(0), _indexBuffer(0), _vertexBufferObjectID(0), _vertexCount(0), _textureBufferObjectID(0),
-  _contourVisible(true), _scale(1.0f, 1.0f, 1.0f), _contourColor(0.0f, 0.0f, 0.0f)
+  _contourVisible(true), _scale(1.0f, 1.0f, 1.0f), _contourColor(1.0f, 0.0f, 0.0f)
 {
         _shader = new NvShader();

trunk/vizservers/nanovis/HeightMap.h

@@ -44 +44 @@
         bool isVisible() const;
         void setLineContourVisible(bool visible);
+    void setLineContourColor(float r, float g, float b);
 };
 
@@ -61 +62 @@
 }
 
+inline void HeightMap::setLineContourColor(float r, float g, float b)
+{
+    _contourColor.x = r;
+    _contourColor.y = g;
+    _contourColor.z = b;
+}
 #endif

trunk/vizservers/nanovis/R2/src/R2Geometry.cpp

@@ -20 +20 @@
 void R2Geometry::render()
 {
+        //glDisableClientState(GL_NORMAL_ARRAY);
+        //glDisableClientState(GL_TEXTURE_COORD_ARRAY);
         glEnableClientState(GL_VERTEX_ARRAY);
         glBindBuffer(GL_ARRAY_BUFFER, _vertexBuffer->getGraphicObjectID());

trunk/vizservers/nanovis/nanovis.cpp

@@ -1125 +1125 @@
         srand( (unsigned)time( NULL ) );
         int size = 20 * 20;
+        float sigma = 5.0f;
+        float mean = exp(0.0f) / (sigma * sqrt(2.0f));
         float* data = (float*) malloc(sizeof(float) * size);
+
+        float x;
         for (int i = 0; i < size; ++i)
         {
-            data[i] = rand() * 1.0f / RAND_MAX;
+            x = - 10 + i%20;
+            data[i] = exp(- (x * x)/(2 * sigma * sigma)) / (sigma * sqrt(2.0f)) / mean;
         }
 
@@ -1195 +1200 @@
                 }
             }
+            return TCL_OK;
+        }
+        else if (strcmp(argv[2],"color") == 0) 
+        {
+            double r, g, b;
+            if ((Tcl_GetDouble(interp, argv[3], &r) == TCL_OK) &&
+                (Tcl_GetDouble(interp, argv[4], &g) == TCL_OK) &&
+                (Tcl_GetDouble(interp, argv[5], &b) == TCL_OK)) {
+                r = r / 255.0;
+                g = g / 255.0;
+                b = b / 255.0;
+            }
+            else 
+            {
+                return TCL_ERROR;
+            }
+
+            vector<int> indices;
+            if (GetIndices(interp, argc-6, argv+6, &indices) != TCL_OK) 
+            {
+                return TCL_ERROR;
+            }
+            for (int i = 0; i < indices.size(); ++i)
+            {
+                if ((indices[i] < g_heightMap.size()) && (g_heightMap[indices[i]] != NULL))
+                {
+                    g_heightMap[indices[i]]->setLineContourColor(r, g, b);
+                }
+            }
+
             return TCL_OK;
         }