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

Timestamp:

01/15/07 21:46:52 (17 years ago)

Author:

bittner

Message:

merge

Location:

GTP/trunk/Lib/Vis/Preprocessing/src/QtInterface

Files:

• QtGlRenderer.cpp (modified) (6 diffs)
• QtGlViewer.cpp (modified) (1 diff)
• QtGlViewer.h (modified) (1 diff)

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

@@ -338 +338 @@
   ViewCell *viewcell = NULL;
 
-  PrVs prvs;
-  
-  if (1 || !mUseFilter) {
-        viewcell = mViewCellsManager->GetViewCell(mViewPoint, true);
-  } else {
-        //  mViewCellsManager->SetMaxFilterSize(1);
-        mViewCellsManager->GetPrVS(mViewPoint, prvs, mViewCellsManager->GetFilterWidth());
-        viewcell = prvs.mViewCell;
-  }
+  if (mDetectEmptyViewSpace) 
+        glEnable( GL_CULL_FACE );
+  else
+        glDisable( GL_CULL_FACE );
+  
+  viewcell = mViewCellsManager->GetViewCell(mViewPoint, true);
   
   if (viewcell) {
@@ -379 +376 @@
         }
 
+        Intersectable::NewMail();
+
         // Render PVS
         if (mUseSpatialFilter && mRenderBoxes) {
-                for (int i=0; i < mPvsCache.filteredBoxes.size(); i++)
-                        RenderBox(mPvsCache.filteredBoxes[i]);
+          for (int i=0; i < mPvsCache.filteredBoxes.size(); i++)
+                RenderBox(mPvsCache.filteredBoxes[i]);
         } else {
-                ObjectPvsIterator it = mPvsCache.mPvs.GetIterator();
+          ObjectPvsIterator it = mPvsCache.mPvs.GetIterator();
+          
+          mPvsSize = mPvsCache.mPvs.GetSize();
+          for (; it.HasMoreEntries(); ) {
+                ObjectPvsEntry entry = it.Next();
+                Intersectable *object = entry.mObject;
                 
-                mPvsSize = mPvsCache.mPvs.GetSize();
-                for (; it.HasMoreEntries(); ) {
-                        ObjectPvsEntry entry = it.Next();
-                        Intersectable *object = entry.mObject;
-                        
-                        if (mRenderVisibilityEstimates) {
-                                
-                                float visibility = mTransferFunction*log10(entry.mData.mSumPdf + 1); // /5.0f
-                                glColor3f(visibility, 0.0f, 0.0f);
-                                mUseForcedColors = true;
-                                RenderIntersectable(object);
-                                mUseForcedColors = false;
-                        } else {
-                                mUseForcedColors = false;
-                                RenderIntersectable(object);
-                        }
+                if (mRenderVisibilityEstimates) {
+                  float visibility = mTransferFunction*log10(entry.mData.mSumPdf + 1); // /5.0f
+                  glColor3f(visibility, 0.0f, 0.0f);
+                  mUseForcedColors = true;
+                  RenderIntersectable(object);
+                  mUseForcedColors = false;
+                } else {
+                  mUseForcedColors = false;
+                  RenderIntersectable(object);
                 }
+          }
         }
-
+        
         if (mRenderFilter) {
           mWireFrame = true;
@@ -413 +411 @@
           glPushAttrib(GL_CURRENT_BIT);
           glColor3f(1.0f, 0.0f, 0.0f);
-          gluSphere((::GLUquadric *)mSphere,
-                                                        1e-3*Magnitude(mViewCellsManager->GetViewSpaceBox().Size()), 6, 6);
+          //      gluSphere((::GLUquadric *)mSphere,
+          //                            1e-3*Magnitude(mViewCellsManager->GetViewSpaceBox().Size()), 6, 6);
           glPopAttrib();
           glPopMatrix();
           mWireFrame = false;
         }
-        
-        if (0 && mUseFilter)
-          mViewCellsManager->DeleteLocalMergeTree(viewcell);
-
   } else {
-                ObjectContainer::const_iterator oi = mObjects.begin();
-                for (; oi != mObjects.end(); oi++)
-                        RenderIntersectable(*oi);
+        ObjectContainer::const_iterator oi = mObjects.begin();
+        for (; oi != mObjects.end(); oi++)
+          RenderIntersectable(*oi);
   }
 }
@@ -625 +619 @@
           RenderPvs();
         }
-        
   }
 
@@ -947 +940 @@
   if (mViewCellsManager)
         vc = mViewCellsManager->GetViewCells().size();
+
   int filter = 0;
   if (mViewCellsManager)
@@ -985 +979 @@
   if (mViewCellsManager) {
         //      mViewCellsManager->SetMaxFilterSize(number);
-    mViewCellsManager->CollectViewCells(number);
+
+        // $$ tmp off
+        mViewCellsManager->CollectViewCells(number);
 
         // $$ does not work so far:(

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

@@ -54 +54 @@
         
         mRenderer->RenderPvs();
+
+        mRenderer->RenderViewPoint();
+
         
 //      if (mRenderer->mShowRays) {

GTP/trunk/Lib/Vis/Preprocessing/src/QtInterface/QtGlViewer.h

@@ -11 +11 @@
 class QtGlViewer : public QGLWidget
 {
-  //Q_OBJECT
+  Q_OBJECT
 
         friend class QtGlRendererWidget;