Changeset 854 for trunk/vizservers

Timestamp:

Jan 18, 2008, 6:39:54 PM (17 years ago)

Author:

vrinside

Message:

Fixed glPushMatrix/glPopMatrix calls

Location:

trunk/vizservers/nanovis

Files:

• NvColorTableRenderer.cpp (modified) (2 diffs)
• nanovis.cpp (modified) (3 diffs)

trunk/vizservers/nanovis/NvColorTableRenderer.cpp

@@ -20 +20 @@
 
     glViewport(0, 0, width, height);
+
     glMatrixMode(GL_PROJECTION);
     glPushMatrix();
     glLoadIdentity();
     gluOrtho2D(0, width, 0, height);
+
     glMatrixMode(GL_MODELVIEW);
     glPushMatrix();
@@ -44 +46 @@
         _fonts->resize(width, height);
         _fonts->begin();
+
         glPushMatrix();
-        glTranslatef(width - 110, 5, 0.0f);
-        _fonts->draw("Quantum dot lab - www.nanohub.org");
+            glTranslatef(width - 110, 5, 0.0f);
+            _fonts->draw("Quantum dot lab - www.nanohub.org");
         glPopMatrix();
+
         glPushMatrix();
-        glTranslatef(30, height - 25, 0.0f);
-        _fonts->draw("%.08lf", rangeMin);
+            glTranslatef(30, height - 25, 0.0f);
+            _fonts->draw("%.08lf", rangeMin);
         glPopMatrix();
+
         glPushMatrix();
-        glTranslatef(width - 110, height - 25, 0.0f);
-        _fonts->draw("%.08lf", rangeMax);
+            glTranslatef(width - 110, height - 25, 0.0f);
+            _fonts->draw("%.08lf", rangeMax);
+        glPopMatrix();
+
         _fonts->end();
     }

trunk/vizservers/nanovis/nanovis.cpp

@@ -1350 +1350 @@
     //assert(glGetError()==0);
     
-    //lic->convolve(); //flow line integral convolution
-    //psys->advect(); //advect particles
-    
     //start final rendering
     glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); //clear screen
@@ -1395 +1392 @@
         }
         
-        glPushMatrix();
+        // TBD : This will be removed after being sure that all the functions work well.
+        //glPushMatrix();
+        
         //now render things in the scene
         if (axis_on) {
@@ -1414 +1413 @@
             particleRenderer->render();
         }
-        //lic->render();        //display the line integral convolution result
         //soft_display_verts();
         //perf->enable();
-        //psys->render();
         //perf->disable();
         //fprintf(stderr, "particle pixels: %d\n", perf->get_pixel_count());
         //perf->reset();
         
-        perf->enable();
+        //perf->enable();
         vol_renderer->render_all();
+        //perf->disable();
         
-        perf->disable();
-        
-        for (unsigned int i = 0; i < heightMap.size(); ++i) {
+        for (unsigned int i = 0; i < heightMap.size(); ++i) 
+        {
             if (heightMap[i]->isVisible()) {
                 heightMap[i]->render(renderContext);
-            }
+                }
         }
         glPopMatrix();