Changeset 2663 for GTP/trunk/Lib/Vis/Preprocessing/src/QtInterface

Timestamp:

04/29/08 11:19:06 (17 years ago)

Author:

mattausch

Message:

debugging vp evaluation

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/QtInterface/QtGlRenderer.cpp (modified) (7 diffs)

GTP/trunk/Lib/Vis/Preprocessing/src/QtInterface/QtGlRenderer.cpp

@@ -101 +101 @@
 QtGlRendererBuffer::RenderPvs(const ObjectPvs &pvs)
 {
-#if TEST_PVS_RENDERING 
-
-  // Render PVS
-  ObjectPvsIterator it = pvs.GetIterator();
-  
-  Intersectable::NewMail();
-  mCurrentFrame++;
-  while (it.HasMoreEntries()) 
-        {
-          RenderIntersectable(it.Next());
-        }
-
-#else
-  
-  PreparePvs(pvs);
-
-  int offset = (int)mObjects.size() * 3;
-  char *arrayPtr = mUseVbos ? NULL : (char *)mData;
-
-  glVertexPointer(3, GL_FLOAT, 0, (char *)arrayPtr);
-  glNormalPointer(GL_FLOAT, 0, (char *)arrayPtr + offset * sizeof(Vector3));
-  glDrawElements(GL_TRIANGLES, mIndexBufferSize, GL_UNSIGNED_INT, mIndices);
-  
-#endif
+        PreparePvs(pvs);
+
+        int offset = (int)mObjects.size() * 3;
+        char *arrayPtr = mUseVbos ? NULL : (char *)mData;
+
+        glVertexPointer(3, GL_FLOAT, 0, (char *)arrayPtr);
+        glNormalPointer(GL_FLOAT, 0, (char *)arrayPtr + offset * sizeof(Vector3));
+        glDrawElements(GL_TRIANGLES, mIndexBufferSize, GL_UNSIGNED_INT, mIndices);
 }
 
@@ -136 +120 @@
         float pErrorPixels = -1.0f;
 
-
         mUseFalseColors = false;
-        unsigned int pixelCount;
+        unsigned int pixelCount = 0;
 
 
@@ -153 +136 @@
         if (!evaluateFilter) 
                 pvs = viewcell->GetPvs();
-        else {
-
-                mViewCellsManager->ApplyFilter2(viewcell,
-                        false,
-                        mViewCellsManager->GetFilterWidth(),
-                        pvs);
-        }
+        else 
+                mViewCellsManager->ApplyFilter2(viewcell, false, mViewCellsManager->GetFilterWidth(), pvs);
+
 
         mUseForcedColors = true;
@@ -168 +147 @@
         glColor3f(0,1,0);
 
+        glDepthFunc(GL_LESS);
+        glDepthMask(GL_TRUE);
+        glEnable(GL_DEPTH_TEST);
 
         glStencilFunc(GL_EQUAL, 0x0, 0x1);
@@ -182 +164 @@
 
 
-        OcclusionQuery *query = mOcclusionQueries[0];
+        OcclusionQuery *query = mOcclusionQueries[1];
 
         Intersectable::NewMail();
@@ -193 +175 @@
         glDisable(GL_STENCIL_TEST); 
 
+
         // reenable other state
-        //  int wait=0;
-        //  while (!query.ResultAvailable()) {
-        //      wait++;
-        //  }
+        int wait = 0;
+        
+        while (0 && !query->ResultAvailable()) 
+        {
+                wait ++;
+        }
 
 
@@ -1648 +1633 @@
                                                                                                  const ViewCellInfoContainer &compareInfo)
 {
-        //cout << "comparing " << viewcells.size() << " view cells to " << compareInfo.size() << " values" << endl;
-
         if (viewcells.size() > compareInfo.size())
         {
-                cerr << "loaded size (" << (int)compareInfo.size() << ") does not fit to view cells size (" << (int)viewcells.size() << ")" << endl;
+                cerr << "loaded size (" << (int)compareInfo.size() 
+                         << ") does not fit to view cells size (" << (int)viewcells.size() << ")" << endl;
                 return;
         }