Changeset 572 for trunk

Timestamp:

01/23/06 21:37:50 (19 years ago)

Author:

bittner

Message:

gl render error estimation changes for backface culling empty viewspace detection

Location:

trunk/VUT/GtpVisibilityPreprocessor/src

Files:

• GlRenderer.cpp (modified) (11 diffs)
• GlRenderer.h (modified) (2 diffs)
• RssPreprocessor.cpp (modified) (3 diffs)
• ViewCellsManager.cpp (modified) (2 diffs)

trunk/VUT/GtpVisibilityPreprocessor/src/GlRenderer.cpp

@@ -46 +46 @@
   mFrame = 0;
   mWireFrame = false;
+  environment->GetBoolValue("Preprocessor.detectEmptyViewSpace", mDetectEmptyViewSpace);
+
 }
 
@@ -69 +71 @@
 {
 
-  SetupFalseColor(object->mId);
+  glPushAttrib(GL_CURRENT_BIT);
+  if (mUseFalseColors)
+        SetupFalseColor(object->mId);
+  
 
   switch (object->Type()) {
@@ -82 +87 @@
         break;
   }
+
+  glPopAttrib();
 }
 
@@ -88 +95 @@
 GlRenderer::RenderViewCell(ViewCell *vc)
 {
-        if (vc->GetMesh())
-                RenderMesh(vc->GetMesh());
+  if (vc->GetMesh()) {
+
+        if (vc->GetValid()) 
+          glColor3f(0,1,0);
+        else
+          glColor3f(0,0,1);
+        
+        RenderMesh(vc->GetMesh());
+  }
 }
 
@@ -117 +131 @@
   if (m)
         glColor3fv(&(m->mDiffuseColor.r));
-  else
-        glColor3f(1.0f, 1.0f, 1.0f);
 }
 
@@ -194 +206 @@
 GlRendererBuffer::RandomViewPoint()
 {
-  Vector3 pVector = Vector3(halton.GetNumber(1),
-                                                        halton.GetNumber(2),
-                                                        halton.GetNumber(3));
+  
+  
+  // do not use this function since it could return different viewpoints for
+  // different executions of the algorithm
+
+  //mViewCellsManager->GetViewPoint(mViewPoint);
+
+  while (1) {
+        Vector3 pVector = Vector3(halton.GetNumber(1),
+                                                          halton.GetNumber(2),
+                                                          halton.GetNumber(3));
+        
+        mViewPoint =  mSceneGraph->GetBox().GetPoint(pVector);
+        ViewCell *v = mViewCellsManager->GetViewCell(mViewPoint);
+        if (v && v->GetValid())
+          break;
+        // generate a new vector
+        halton.GenerateNext();
+  }
+  
   
   Vector3 dVector = Vector3(2*M_PI*halton.GetNumber(4),
                                                         M_PI*halton.GetNumber(5),
                                                         0.0f);
-  
-  mViewCellsManager->GetViewPoint(mViewPoint);
-
-  // mViewPoint =  mSceneGraph->GetBox().GetPoint(pVector);
   
   mViewDirection = Normalize(Vector3(sin(dVector.x),
@@ -210 +235 @@
                                                                          0.0f,
                                                                          cos(dVector.x)));
-
   halton.GenerateNext();
 }
@@ -221 +245 @@
                                                                    KdTree *tree):
 QGLPixelBuffer(QSize(w, h)), GlRenderer(sceneGraph, viewcells, tree) {
+ 
  
  environment->GetIntValue("Preprocessor.pvsRenderErrorSamples", mPvsStatFrames);
@@ -238 +263 @@
   
   mUseFalseColors = true;
-
-  SetupCamera();
-  glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-  glEnable( GL_CULL_FACE );
-  
-  RenderScene();
-
-  // now check whether any backfacing polygon would pass the depth test
+  
+
   static int query = -1;
+  unsigned int pixelCount;
+
   if (query == -1)
         glGenOcclusionQueriesNV(1, (unsigned int *)&query);
-  
-  glColorMask(GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE);
-  glDepthMask(GL_FALSE);
-  glDisable( GL_CULL_FACE );
-  
-  glBeginOcclusionQueryNV(query);
-  
-  RenderScene();
-  
-  glEndOcclusionQueryNV();
-
-  // at this point, if possible, go and do some other computation
-  glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
-  glDepthMask(GL_TRUE);
-  glEnable( GL_CULL_FACE );
-  
-  unsigned int pixelCount;
-  // reenable other state
-  glGetOcclusionQueryuivNV(query,
-                                                   GL_PIXEL_COUNT_NV,
-                                                   &pixelCount);
-
-  if (pixelCount > 0)
-        return -1.0f; // backfacing polygon found -> not a valid viewspace sample
+
+  if (mDetectEmptyViewSpace) {
+        // now check whether any backfacing polygon would pass the depth test
+        SetupCamera();
+        glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+        glEnable( GL_CULL_FACE );
+        
+        RenderScene();
+        
+        glColorMask(GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE);
+        glDepthMask(GL_FALSE);
+        glDisable( GL_CULL_FACE );
+        
+        glBeginOcclusionQueryNV(query);
+        
+        RenderScene();
+        
+        glEndOcclusionQueryNV();
+        
+        // at this point, if possible, go and do some other computation
+        glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
+        glDepthMask(GL_TRUE);
+        glEnable( GL_CULL_FACE );
+        
+        // reenable other state
+        glGetOcclusionQueryuivNV(query,
+                                                         GL_PIXEL_COUNT_NV,
+                                                         &pixelCount);
+        
+        if (pixelCount > 0)
+          return -1.0f; // backfacing polygon found -> not a valid viewspace sample
+  } else
+        glDisable( GL_CULL_FACE );
+        
 
   ViewCell *viewcell = mViewCellsManager->GetViewCell(mViewPoint);
-  
+        
   if (viewcell) {
         SetupCamera();
@@ -323 +354 @@
   SetupCamera();
   glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-  glEnable( GL_CULL_FACE );
-  
+
+
+  if (mDetectEmptyViewSpace) 
+        glEnable( GL_CULL_FACE );
+  else
+        glDisable( GL_CULL_FACE );
+
   ObjectContainer::const_iterator oi = mObjects.begin();
   for (; oi != mObjects.end(); oi++)
@@ -379 +415 @@
   // now render im1
   if (viewcell) {
-        if (mTopView) {
+        if (1 || mTopView) {
           mWireFrame = true;
-          RenderMeshInstance(viewcell);
+          RenderIntersectable(viewcell);
           mWireFrame = false;
         }

trunk/VUT/GtpVisibilityPreprocessor/src/GlRenderer.h

@@ -70 +70 @@
   int mFrame;
   bool mWireFrame;
+  
+bool mDetectEmptyViewSpace;
 
   KdTree *mKdTree;
@@ -164 +166 @@
   int mPvsStatFrames;
   vector<float> mPvsErrorBuffer;
-
 private:
         

trunk/VUT/GtpVisibilityPreprocessor/src/RssPreprocessor.cpp

@@ -437 +437 @@
         // load now because otherwise bounding box not correct
         mViewCellsManager->LoadViewCells(mViewCellsFilename, &mObjects);
+        // $$JB tmp make all viewcelss valid
+        mViewCellsManager->SetValidity(0, 9999999999); 
+
   }
   
@@ -515 +518 @@
         if (1) 
           mViewCellsManager->Visualize(mObjects, selectedRays);
+
+        // viewcells->UpdatePVS(newVssRays);
+        Debug<<"Valid viewcells before set validity: "<<mViewCellsManager->CountValidViewcells()<<endl;
+        // cull viewcells with PVS > median (0.5f)
+        mViewCellsManager->SetValidityPercentage(0, 0.5f); 
+        Debug<<"Valid viewcells after set validity: "<<mViewCellsManager->CountValidViewcells()<<endl;
         
         ComputeRenderError();
@@ -547 +556 @@
   }
   
-  // viewcells->UpdatePVS(newVssRays);
-  Debug<<"Valid viewcells before set validity: "<<mViewCellsManager->CountValidViewcells()<<endl;
-  // cull viewcells with PVS > median (0.5f)
-  mViewCellsManager->SetValidityPercentage(0, 0.5f); 
-  Debug<<"Valid viewcells after set validity: "<<mViewCellsManager->CountValidViewcells()<<endl;
   
   while (1) {

trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellsManager.cpp

@@ -1268 +1268 @@
   if (!mBspTree)
         return NULL;
+
+  if (!mViewSpaceBox.IsInside(point))
+        return NULL;
+
   return mBspTree->GetViewCell(point);
 }
@@ -2614 +2618 @@
         if (!mVspBspTree)
                 return NULL;
+
+        if (!mViewSpaceBox.IsInside(point))
+          return NULL;
+
         return mVspBspTree->GetViewCell(point);
 }