Changeset 997 for GTP/trunk/Lib/Vis/Preprocessing/src/GlRenderer.cpp

Timestamp:

05/31/06 10:04:05 (18 years ago)

Author:

mattausch

Message:

fixed bug for histogram
improved samplerenderer
todo: difference detectempty true / false

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/GlRenderer.cpp (modified) (5 diffs)

GTP/trunk/Lib/Vis/Preprocessing/src/GlRenderer.cpp

@@ -444 +444 @@
 
 void
+GlRendererBuffer::EvalQueryWithItemBuffer(
+                                                                           //RenderCostSample &sample
+                                                                           )
+{
+        // read back the texture
+        glReadPixels(0, 0,
+                                GetWidth(), GetHeight(),
+                                GL_RGBA,
+                                GL_UNSIGNED_BYTE,
+                                mPixelBuffer);
+                
+                        
+        unsigned int *p = mPixelBuffer;
+                        
+        for (int y = 0; y < GetHeight(); y++)
+        {
+                for (int x = 0; x < GetWidth(); x++, p++) 
+                {
+                        unsigned int id = (*p) & 0xFFFFFF;
+
+                        if (id != 0xFFFFFF)
+                                ++ mObjects[id]->mCounter;
+                }
+        }
+}
+
+
+void
+GlRendererBuffer::EvalQueryWithOcclusionQueries(
+                                                                           //RenderCostSample &sample
+                                                                           )
+{
+        glDepthFunc(GL_LEQUAL);
+                
+        glColorMask(GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE);
+        glDepthMask(GL_FALSE);
+                
+        // now issue queries for all objects
+        for (int j = 0; j < mObjects.size(); ++ j) 
+        {
+                for (int q = 0; j + q < mObjects.size() && q < mOcclusionQueries.size(); ++ q) 
+                {
+                        glBeginOcclusionQueryNV(mOcclusionQueries[q]);
+                                        
+                        RenderIntersectable(mObjects[j + q]);
+                        glEndOcclusionQueryNV();
+                }
+                
+                // collect results of the queries
+                for (int q = 0; j + q < mObjects.size() && q < mOcclusionQueries.size(); ++ q) 
+                {
+                        unsigned int pixelCount;
+                                        
+                        //-- reenable other state
+#if 1
+                        do 
+                        {
+                                glGetOcclusionQueryuivNV(mOcclusionQueries[q],
+                                                                                GL_PIXEL_COUNT_AVAILABLE_NV,
+                                                                                &pixelCount);
+                                        
+                                if (0 && !pixelCount) cout << "W";
+                        } 
+                        while (!pixelCount);
+#endif
+
+                        glGetOcclusionQueryuivNV(mOcclusionQueries[q],
+                                                                        GL_PIXEL_COUNT_NV,
+                                                                        &pixelCount);
+
+                        // if (pixelCount)
+                        // cout<<"q="<<mOcclusionQueries[q]<<" pc="<<pixelCount<<" ";
+                        
+                        mObjects[j + q]->mCounter += pixelCount;
+                }
+
+                j += q;
+        }
+                
+        glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
+        glDepthMask(GL_TRUE);
+}
+
+
+void
 GlRendererBuffer::EvalRenderCostSample(
                                                                            RenderCostSample &sample
                                                                            )
 {
-  mViewCellsManager->GetViewPoint(mViewPoint);
-  sample.mPosition = mViewPoint;
-
-  cout << mViewPoint << endl;
-  
-  // take a render cost sample by rendering a cube
-  Vector3 directions[6];
-  directions[0] = Vector3(1,0,0);
-  directions[1] = Vector3(0,1,0);
-  directions[2] = Vector3(0,0,1);
-  directions[3] = Vector3(-1,0,0);
-  directions[4] = Vector3(0,-1,0);
-  directions[5] = Vector3(0,0,-1);
-
-  sample.mVisibleObjects = 0;
-
-  int i, j;
-  
-  // reset object visibility
-  for (i=0; i < mObjects.size(); i++) {
-        mObjects[i]->mCounter = 0;
-  }
-  mFrame++;
-  for (i=0; i < 6; i++) {
-        mViewDirection = directions[i];
-        SetupCamera();
-        glClearColor(1.0f, 1.0f, 1.0f, 1.0f);
-        glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-        
-        glDepthFunc( GL_LESS );
-
-        mUseFalseColors = true;
-
-        RenderScene();
-
-        if (1) {
-          char filename[256];
-          sprintf(filename, "snap/frame-%04d-%d.png", mFrame, i);
-          QImage im = toImage();
-          im.save(filename, "PNG");
-        }
-        
-        bool useItemBuffer = false;
-        
-        if (useItemBuffer) {
-          // read back the texture
-          glReadPixels(0, 0,
-                                   GetWidth(), GetHeight(),
-                                   GL_RGBA,
-                                   GL_UNSIGNED_BYTE,
-                                   mPixelBuffer);
-          
-          int x, y;
-          unsigned int *p = mPixelBuffer;
-          for (y = 0; y < GetHeight(); y++)
-                for (x = 0; x < GetWidth(); x++, p++) {
-                  unsigned int id = (*p) & 0xFFFFFF;
-                  if (id != 0xFFFFFF)
-                        mObjects[id]->mCounter++;
+        // choose a random view point
+        mViewCellsManager->GetViewPoint(mViewPoint);
+        sample.mPosition = mViewPoint;
+        //cout << "viewpoint: " << mViewPoint << endl;
+
+        // take a render cost sample by rendering a cube
+        Vector3 directions[6];
+
+        directions[0] = Vector3(1,0,0);
+        directions[1] = Vector3(0,1,0);
+        directions[2] = Vector3(0,0,1);
+        directions[3] = Vector3(-1,0,0);
+        directions[4] = Vector3(0,-1,0);
+        directions[5] = Vector3(0,0,-1);
+
+        sample.mVisibleObjects = 0;
+
+        int i, j;
+
+        // reset object visibility
+        for (i=0; i < mObjects.size(); i++) 
+        {
+                mObjects[i]->mCounter = 0;
+        }
+
+        ++ mFrame;
+
+        // either use occlusion queries or item buffer
+        bool useOcclusionQueries;
+        environment->GetBoolValue("RenderSampler.useOcclusionQueries", useOcclusionQueries);
+
+        //if (useOcclusionQueries) cout << "using occlusion queries" << endl;
+        //else cout << "using item buffer" << endl;
+        
+        glCullFace(GL_FRONT);
+
+        if (mDetectEmptyViewSpace) 
+        {
+                glEnable(GL_CULL_FACE);
+                cout << "culling" << endl;
+        }
+        else
+        {
+                cout << "not culling" << endl;
+                glDisable(GL_CULL_FACE);
+        }
+
+        for (i = 0; i < 6; ++ i) 
+        {
+                mViewDirection = directions[i];
+                SetupCamera();
+
+                glClearColor(1.0f, 1.0f, 1.0f, 1.0f);
+                glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+                glDepthFunc(GL_LESS);
+                mUseFalseColors = true;
+
+
+                // the actual scene rendering
+
+                RenderScene();
+
+
+                if (0) 
+                {
+                        char filename[256];
+                        sprintf(filename, "snap/frame-%04d-%d.png", mFrame, i);
+                        QImage im = toImage();
+                        im.save(filename, "PNG");
                 }
-          
-        } else {
-        
-          //      glDepthFunc( GL_LEQUAL );
-          glDepthFunc( GL_LEQUAL );
-          
-          glColorMask(GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE);
-          glDepthMask(GL_FALSE);
-          
-          // now issue queries for all objects
-          for (j = 0; j < mObjects.size(); j++) {
-                int q;
-                for (q = 0; j + q < mObjects.size() && q < mOcclusionQueries.size(); q++) {
-                  glBeginOcclusionQueryNV(mOcclusionQueries[q]);
-                  RenderIntersectable(mObjects[j+q]);
-                  glEndOcclusionQueryNV();
+         
+                if (useOcclusionQueries) 
+                {
+                        EvalQueryWithOcclusionQueries();
                 }
-                
-                
-                // collect results of the queries
-                for (q = 0; j + q < mObjects.size() && q < mOcclusionQueries.size(); q++) {
-                  unsigned int pixelCount;
-                  // reenable other state
-
-#if 1
-                  do {
-                        glGetOcclusionQueryuivNV(mOcclusionQueries[q],
-                                                                         GL_PIXEL_COUNT_AVAILABLE_NV,
-                                                                         &pixelCount);
-                        if (!pixelCount)
-                          cout<<"W";
-                  } while(!pixelCount);
-#endif
-
-                  glGetOcclusionQueryuivNV(mOcclusionQueries[q],
-                                                                   GL_PIXEL_COUNT_NV,
-                                                                   &pixelCount);
-                  //            if (pixelCount)
-                  //              cout<<"q="<<mOcclusionQueries[q]<<" pc="<<pixelCount<<" ";
-                  mObjects[j+q]->mCounter += pixelCount;
+                else 
+                {
+                        EvalQueryWithItemBuffer();
                 }
-                j += q;
-          }
-          
-          glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
-          glDepthMask(GL_TRUE);
-        }
-          
-        
-  }  
-  // now evaluate the statistics over that sample
-  // currently only the number of visible objects is taken into account
-  sample.Reset();
-  for (j = 0; j < mObjects.size(); j++) {
-        if (mObjects[j]->mCounter) {
-          sample.mVisibleObjects++;
-          sample.mVisiblePixels += mObjects[j]->mCounter;
-        }
-  }
-  cout<<"RS="<<sample.mVisibleObjects<<" ";
+        }  
+
+        // now evaluate the statistics over that sample
+        // currently only the number of visible objects is taken into account
+        sample.Reset();
+
+        for (j = 0; j < mObjects.size(); j++) 
+        {
+                if (mObjects[j]->mCounter) 
+                {
+                        ++ sample.mVisibleObjects;
+                        sample.mVisiblePixels += mObjects[j]->mCounter;
+                }
+        }
+
+        cout << "RS=" << sample.mVisibleObjects << " ";
 }
 
@@ -575 +635 @@
                                                                    vector<RenderCostSample> &samples
                                                                    )
-{cout << "here1" << endl;
+{
   makeCurrent();
 
   if (mPixelBuffer == NULL)
-        mPixelBuffer = new unsigned int[GetWidth()*GetHeight()];
+          mPixelBuffer = new unsigned int[GetWidth()*GetHeight()];
   
   SetupProjection(GetHeight(), GetHeight(), 90.0f);
@@ -589 +649 @@
   int numQ = 500;
 
-  cout << "here2988" << endl;
 
   if (mOcclusionQueries.size() < numQ) 
@@ -605 +664 @@
           mOcclusionQueries.resize(numQ);
         
-          for (i=0; i < numQ; ++ i)
+          for (i = 0; i < numQ; ++ i)
           {
                   mOcclusionQueries[i] = queries[i];
@@ -613 +672 @@
   }
   
-  for (i=0; i < n; ++ i)
+  for (i = 0; i < n; ++ i)
   {
-          cout << i << " ";
           EvalRenderCostSample(samples[i]);
   }