Changeset 1594 for GTP/trunk/Lib

Timestamp:

10/10/06 00:59:59 (18 years ago)

Author:

bittner

Message:

support for kd tree based pvs

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• GlRenderer.cpp (modified) (6 diffs)
• GlRenderer.h (modified) (2 diffs)
• IntersectableWrapper.h (modified) (1 diff)
• KdTree.cpp (modified) (1 diff)
• KdTree.h (modified) (5 diffs)
• Makefile (modified) (1 diff)
• OspTree.h (modified) (3 diffs)
• QtGlRenderer.cpp (modified) (8 diffs)
• QtGlRenderer.h (modified) (3 diffs)
• Ray.h (modified) (1 diff)
• ViewCellsManager.cpp (modified) (8 diffs)
• default.env (modified) (7 diffs)

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

@@ -13 +13 @@
 #include "IntersectableWrapper.h"
 #include "BvHierarchy.h"
+#include "KdTree.h"
 
 //#include <Cg/cg.h>
@@ -78 +79 @@
   mSnapPrefix = "snap/";
   mUseForcedColors = false;
-
+  mRenderBoxes = false;
   mUseGlLists = true;
   //mUseGlLists = false;
@@ -108 +109 @@
 GlRenderer::RenderIntersectable(Intersectable *object)
 {
-
+  if (object->Mailed())
+        return;
+  object->Mail();
+  
   glPushAttrib(GL_CURRENT_BIT);
   if (mUseFalseColors)
@@ -129 +133 @@
   case Intersectable::BVH_INTERSECTABLE: {
 
+        
         BvhNode *node = (dynamic_cast<BvhIntersectable *>(object))->GetItem();
-        //      RenderBvhNode(node);
-        RenderBox(node->GetBoundingBox());
+
+        if (mRenderBoxes)
+          RenderBox(node->GetBoundingBox());
+        else
+          RenderBvhNode(node);
+        break;
+  }
+  case Intersectable::KD_INTERSECTABLE: {
+        KdNode *node = (dynamic_cast<KdIntersectable *>(object))->GetItem();
+
+        if (mRenderBoxes)
+          RenderBox(mKdTree->GetBox(node));
+        else
+          RenderKdNode(node);
         break;
   }
@@ -628 +645 @@
         BvhLeaf *leaf = (BvhLeaf *) node;
         for (int i=0; i < leaf->mObjects.size(); i++)
-                cout << "leaf obj " << i << endl;
-          //RenderIntersectable(mObjects[i]);
+          RenderIntersectable(leaf->mObjects[i]);
   } else {
         BvhInterior *in = (BvhInterior *)node;
@@ -635 +651 @@
         RenderBvhNode(in->GetFront());
   }
-  
-}
-
-}
+
+  //cout << "leaf obj " << i << endl;
+
+}
+
+void
+GlRenderer::RenderKdNode(KdNode *node)
+{
+  if (node->IsLeaf()) {
+        KdLeaf *leaf = (KdLeaf *) node;
+        for (int i=0; i < leaf->mObjects.size(); i++) {
+          RenderIntersectable(leaf->mObjects[i]);
+        }
+  } else {
+        KdInterior *in = (KdInterior *)node;
+        RenderKdNode(in->mBack);
+        RenderKdNode(in->mFront);
+  }
+  
+}
+
+}

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

@@ -113 +113 @@
   void
   RenderBvhNode(BvhNode *node);
-        
+
+  void
+  RenderKdNode(KdNode *node);
+
   bool
   RenderScene();
@@ -161 +164 @@
   bool mDetectEmptyViewSpace;
   bool mSnapErrorFrames;
+
+  bool mRenderBoxes;
 
   bool mUseGlLists;

GTP/trunk/Lib/Vis/Preprocessing/src/IntersectableWrapper.h

@@ -157 +157 @@
 
 
+typedef map<KdNode *, KdIntersectable *> KdIntersectableMap;
+
 class BvhIntersectable: public IntersectableWrapper<BvhNode *>
 {

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

@@ -1392 +1392 @@
 }
 
-
-}
+KdIntersectable *
+KdTree::GetOrCreateKdIntersectable(KdNode *node)
+{
+
+  if (node == NULL)
+        return NULL;
+  
+  // search nodes
+  std::map<KdNode *, KdIntersectable *>::
+        const_iterator it = mKdIntersectables.find(node);
+  
+  if (it != mKdIntersectables.end()) 
+        {
+          return (*it).second;
+        }
+  
+  // not in map => create new entry
+  KdIntersectable *kdObj = new KdIntersectable(node);
+  mKdIntersectables[node] = kdObj;
+  
+  return kdObj;
+}
+
+KdNode *
+KdTree::GetNode(const Vector3 &point,
+                                const float maxArea) const
+{
+  KdNode *node = mRoot;
+  
+  while (!node->IsLeaf() && (GetSurfaceArea(node) > maxArea) ) {
+        KdInterior *inter = (KdInterior *)node;
+        if (point[inter->mAxis] < inter->mPosition)
+          node = inter->mBack;
+        else
+          node = inter->mFront;
+  }
+  
+  return node;
+}
+
+
+}

GTP/trunk/Lib/Vis/Preprocessing/src/KdTree.h

@@ -11 +11 @@
 #include "Viewcell.h"
 #include "VssRay.h"
+#include "IntersectableWrapper.h"
 
 
@@ -336 +337 @@
   }
 
+  /** Returns or creates a new intersectable for use in a kd based pvs.
+          The OspTree is responsible for destruction of the intersectable.
+  */
+  KdIntersectable *GetOrCreateKdIntersectable(KdNode *node);
+
   void
   CollectObjects(KdNode *n, ObjectContainer &objects);
@@ -368 +374 @@
     return box;
   }
-        
+
+  float GetSurfaceArea(const KdNode *node) const {
+        return GetBox(node).SurfaceArea();
+  }
+
+  
   KdNode *
   FindRandomNeighbor(KdNode *n,
@@ -379 +390 @@
   KdNode *
   GetRandomLeaf(const bool onlyUnmailed = false);
-  
+
+
+  KdNode *
+  GetNode(const Vector3 &point, const float maxArea) const;
+
   int
   FindNeighbors(KdNode *n,
@@ -574 +589 @@
   AxisAlignedBox3 mBox;
   KdTreeStatistics mStat;
-  
+
+  /// stores the kd node intersectables used for pvs
+  KdIntersectableMap mKdIntersectables;
+
 };
 

GTP/trunk/Lib/Vis/Preprocessing/src/Makefile

@@ -1 +1 @@
 #############################################################################
 # Makefile for building: preprocessor
-# Generated by qmake (2.00a) (Qt 4.1.2) on: ne 8. X 23:47:35 2006
+# Generated by qmake (2.00a) (Qt 4.1.2) on: po 9. X 21:25:05 2006
 # Project:  preprocessor.pro
 # Template: app

GTP/trunk/Lib/Vis/Preprocessing/src/OspTree.h

@@ -11 +11 @@
 #include "gzstream.h"
 #include "SubdivisionCandidate.h"
+#include "IntersectableWrapper.h"
 
 
@@ -135 +136 @@
 
 
-typedef map<KdNode *, KdIntersectable *> KdIntersectableMap;
 
 
@@ -826 +826 @@
 
     /// stores the kd node intersectables used for pvs
-        KdIntersectableMap mKdIntersectables;
+  KdIntersectableMap mKdIntersectables;
         
 private:

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

@@ -870 +870 @@
 
 int QtGlRendererBuffer::ComputePvs(ObjectContainer &objects, 
-                                                                 ObjectContainer &pvs) const
+                                                                   ObjectContainer &pvs) const
 {
         int pvsSize = 0;
@@ -950 +950 @@
 {
   
-  
+  Intersectable::NewMail();
+
   ViewCell *viewcell = NULL;
 
@@ -975 +976 @@
         
         
-        // read back the texture
         ObjectPvsMap::const_iterator it = pvs.mEntries.begin();
-
+        
         mPvsSize = pvs.mEntries.size();
           
         for (; it != pvs.mEntries.end(); ++ it) {
           Intersectable *object = (*it).first;
-          float visibility = log10((*it).second.mSumPdf + 1)/5.0f;
-          glColor3f(visibility, 0.0f, 0.0f);
-          mUseForcedColors = true;
-          RenderIntersectable(object);
-          mUseForcedColors = false;
+          
+          if (mRenderVisibilityEstimates) {
+                float visibility = log10((*it).second.mSumPdf + 1)/5.0f;
+                glColor3f(visibility, 0.0f, 0.0f);
+                mUseForcedColors = true;
+                RenderIntersectable(object);
+                mUseForcedColors = false;
+          } else {
+                mUseForcedColors = false;
+                RenderIntersectable(object);
+          }
         }
 
@@ -1360 +1366 @@
   mCutScene = false;
   mRenderErrors = false;
+  mRenderBoxes = false;
   mRenderFilter = true;
+  mRenderVisibilityEstimates = false;
+
   mManipulatorScale = 1.0f;
   trackball(mManipulatorLastQuat, 0.0f, 0.0f, 0.0f, 0.0f);
@@ -1370 +1379 @@
   Environment::GetSingleton()->GetBoolValue("Preprocessor.applyVisibilitySpatialFilter",
                                                         tmp );
-
   mUseSpatialFilter = tmp;
 
@@ -1396 +1404 @@
   connect(mControlWidget, SIGNAL(SetCutScene(bool)), this, SLOT(SetCutScene(bool)));
   connect(mControlWidget, SIGNAL(SetRenderErrors(bool)), this, SLOT(SetRenderErrors(bool)));
+  connect(mControlWidget, SIGNAL(SetRenderBoxes(bool)), this, SLOT(SetRenderBoxes(bool)));
   connect(mControlWidget, SIGNAL(SetRenderFilter(bool)), this, SLOT(SetRenderFilter(bool)));
+  connect(mControlWidget, SIGNAL(SetRenderVisibilityEstimates(bool)),
+                  this, SLOT(SetRenderVisibilityEstimates(bool)));
   connect(mControlWidget, SIGNAL(SetUseFilter(bool)), this, SLOT(SetUseFilter(bool)));
   connect(mControlWidget, SIGNAL(SetUseSpatialFilter(bool)),
@@ -1825 +1836 @@
   connect(slider, SIGNAL(valueChanged(int)), SIGNAL(SetSceneCut(int)));
 
+
+  cb = new QCheckBox("Render boxes", vbox);
+  vbox->layout()->addWidget(cb);
+  cb->setChecked(false);
+  connect(cb, SIGNAL(toggled(bool)), SIGNAL(SetRenderBoxes(bool)));
+
+  cb = new QCheckBox("Render visibility estimates", vbox);
+  vbox->layout()->addWidget(cb);
+  cb->setChecked(false);
+  connect(cb, SIGNAL(toggled(bool)), SIGNAL(SetRenderVisibilityEstimates(bool)));
+
+  
   cb = new QCheckBox("Render errors", vbox);
   vbox->layout()->addWidget(cb);
@@ -1830 +1853 @@
   connect(cb, SIGNAL(toggled(bool)), SIGNAL(SetRenderErrors(bool)));
 
+  
+  bool tmp;
+
   cb = new QCheckBox("Use filter", vbox);
   vbox->layout()->addWidget(cb);
-  cb->setChecked(true);
+  Environment::GetSingleton()->GetBoolValue("Preprocessor.applyVisibilityFilter", tmp );
+  cb->setChecked(tmp);
   connect(cb, SIGNAL(toggled(bool)), SIGNAL(SetUseFilter(bool)));
 
+  
   cb = new QCheckBox("Use spatial filter", vbox);
   vbox->layout()->addWidget(cb);
-  cb->setChecked(true);
+  Environment::GetSingleton()->GetBoolValue("Preprocessor.applyVisibilitySpatialFilter",
+                                                                                        tmp );
+  cb->setChecked(tmp);
   connect(cb, SIGNAL(toggled(bool)), SIGNAL(SetUseSpatialFilter(bool)));
 

GTP/trunk/Lib/Vis/Preprocessing/src/QtGlRenderer.h

@@ -152 +152 @@
   void SetShowRays(bool);
   void SetRenderFilter(bool);
+  void SetRenderVisibilityEstimates(bool);
   void SetUseFilter(bool);
   void SetUseSpatialFilter(bool);
   void SetRenderErrors(bool);
+  void SetRenderBoxes(bool);
   void SetShowViewCells(bool);
   void SetShowRenderCost(bool);
@@ -179 +181 @@
   bool mRenderErrors;
   bool mRenderFilter;
+  bool mRenderVisibilityEstimates;
   bool mUseFilter;
   bool mUseSpatialFilter;
@@ -266 +269 @@
  }
 
+  void SetRenderBoxes(bool b) {
+        mRenderBoxes = b;
+        updateGL();
+  }
+
  void SetRenderFilter(bool b) {
    mRenderFilter = b;
+   updateGL();
+ }
+
+  void SetRenderVisibilityEstimates(bool b) {
+        mRenderVisibilityEstimates = b;
    updateGL();
  }

GTP/trunk/Lib/Vis/Preprocessing/src/Ray.h

@@ -46 +46 @@
           Intersectable *mObject;
 
-          /// the face of the intersectable
+        /// the face of the intersectable
           int mFace;
 

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

@@ -29 +29 @@
 #define SAMPLE_ORIGIN_OBJECTS 0
 
+// $$JB HACK
+#define USE_KD_PVS 1
+#define KD_PVS_AREA 1e-3f
 
 namespace GtpVisibilityPreprocessor {
@@ -1183 +1186 @@
                                                            const float filterWidth)
 {
-        ViewCell *currentViewCell = GetViewCell(viewPoint);
-
-        if (mMaxFilterSize < 1) {
-                prvs.mViewCell = currentViewCell;
-                return;
-        }
-
-        const AxisAlignedBox3 box = GetFilterBBox(viewPoint, filterWidth);
-
-        if (currentViewCell) 
-        {
-                ViewCellContainer viewCells;
-                ComputeBoxIntersections(box, viewCells);
-
-                ViewCell *root = ConstructLocalMergeTree2(currentViewCell, viewCells);
-                prvs.mViewCell = root;
-
+  ViewCell *currentViewCell = GetViewCell(viewPoint);
+
+  if (mMaxFilterSize < 1) {
+        prvs.mViewCell = currentViewCell;
+        return;
+  }
+  
+  const AxisAlignedBox3 box = GetFilterBBox(viewPoint, filterWidth);
+  
+  if (currentViewCell) 
+        {
+          ViewCellContainer viewCells;
+          ComputeBoxIntersections(box, viewCells);
+          
+          ViewCell *root = ConstructLocalMergeTree2(currentViewCell, viewCells);
+          prvs.mViewCell = root;
+          
         } 
-        else
-        {
-                prvs.mViewCell = NULL;
-                //prvs.mPvs = root->GetPvs();
+  else
+        {
+          prvs.mViewCell = NULL;
+          //prvs.mPvs = root->GetPvs();
         }
 }
@@ -1808 +1811 @@
   ViewCellContainer *viewcells = &ray.mViewCells;
   ViewCellContainer::const_iterator it;
+
+  if (!ray.mTerminationObject)
+        return;
+  
+#if USE_KD_PVS
+  float area = GetPreprocessor()->mKdTree->GetBox().SurfaceArea()*KD_PVS_AREA;
+  KdNode *node = GetPreprocessor()->mKdTree->GetNode(ray.mTermination, area);
+  Intersectable *obj =
+        GetPreprocessor()->mKdTree->
+        GetOrCreateKdIntersectable(node);
+#else
+  Intersectable *obj = ray.mTerminationObject;
+#endif
+  
   for (it = viewcells->begin(); it != viewcells->end(); ++it) {
         ViewCell *viewcell = *it;
         if (viewcell->GetValid()) {
           // if ray not outside of view space
-          viewcell->GetPvs().AddSample(ray.mTerminationObject, ray.mPdf);
+          viewcell->GetPvs().AddSample(obj, ray.mPdf);
         }
   }
@@ -1851 +1868 @@
         }
 
+#if USE_KD_PVS
+        float area = GetPreprocessor()->mKdTree->GetBox().SurfaceArea()*KD_PVS_AREA;
+        KdNode *node = GetPreprocessor()->mKdTree->GetNode(ray.mTermination, area);
+        Intersectable *obj =
+          GetPreprocessor()->mKdTree->
+          GetOrCreateKdIntersectable(node);
+#else
+        Intersectable *obj = ray.mTerminationObject;
+#endif
+        
+        
         ViewCellContainer::const_iterator it = viewcells.begin();
-
+        
         for (; it != viewcells.end(); ++ it) 
         {
@@ -1862 +1890 @@
 
                         if (ray.mTerminationObject) 
-                        {                       
-                                if (viewcell->GetPvs().GetSampleContribution(
-                                                        ray.mTerminationObject,
-                                                        ray.mPdf,
-                                                        contribution))
+                          {                     
+                                
+
+                          if (viewcell->GetPvs().GetSampleContribution(obj,
+                                                                                                                   ray.mPdf,
+                                                                                                                   contribution))
                                 {
-                                        ++ ray.mPvsContribution;
-                                        ray.mRelativePvsContribution += contribution;
+                                  ++ ray.mPvsContribution;
+                                  ray.mRelativePvsContribution += contribution;
                                 }
                         }
@@ -1903 +1932 @@
                                 if (ray.mTerminationObject)
                                 {
-                                        viewcell->GetPvs().AddSample(ray.mTerminationObject, ray.mPdf);
+                                        viewcell->GetPvs().AddSample(obj, ray.mPdf);
                                 }                               
 #if SAMPLE_ORIGIN_OBJECTS
@@ -2330 +2359 @@
   // now compute a new Pvs by including also objects intersecting the 
   // extended boxes of visible objects
-
   Intersectable::NewMail();
   
@@ -5510 +5538 @@
                         if (ray.mTerminationObject) 
                         {
-                                // todo: maybe not correct for kd node pvs
-                                Intersectable *obj = mHierarchyManager->GetIntersectable(ray, true);
-                                if (viewcell->GetPvs().GetSampleContribution(obj,
-                                                                                                                         ray.mPdf, 
-                                                                                                                         contribution))
+                          // todo: maybe not correct for kd node pvs
+                          Intersectable *obj = mHierarchyManager->GetIntersectable(ray, true);
+                          
+                          if (viewcell->GetPvs().GetSampleContribution(obj,
+                                                                                                                   ray.mPdf, 
+                                                                                                                   contribution))
                                 {
-                                        ++ ray.mPvsContribution;
+                                  ++ ray.mPvsContribution;
                                 }
-
-                                ray.mRelativePvsContribution += contribution;
+                          
+                          ray.mRelativePvsContribution += contribution;
                         }
-
+                        
                         // for directional sampling it is important to count only contributions
                         // made in one direction!

GTP/trunk/Lib/Vis/Preprocessing/src/default.env

@@ -11 +11 @@
 # filename ../data/glasgow/glasgow1.x3d
 #       filename vienna.x3d
-filename ../data/vienna/vienna-simple.x3d
+# filename ../data/vienna/vienna-simple.x3d
 # filename ../data/vienna/vienna-buildings.x3d
 # filename ../data/vienna/city1500_flat_1.x3d
@@ -143 +143 @@
         sahUseFaces false
         Termination {
-                minCost 0.95
+                minCost 4
                 maxDepth 30
-                maxCostRatio 0.98
+                maxCostRatio 0.99
                 ct_div_ci 0.5
-                maxNodes 100000
+                maxNodes 300000
 #500000 
         }
@@ -170 +170 @@
 }
 
-
-
-
-
-
 ViewCells {
         # samples used for view cell construction
@@ -189 +184 @@
 
         exportToFile true
-        loadFromFile false
+        loadFromFile true
 
         #type kdTree
         #type vspKdTree
         #type bspTree
-#       type vspBspTree
-        type vspOspTree
+        type vspBspTree
+        #type vspOspTree
         #type sceneDependent
         
@@ -243 +238 @@
         Evaluation {
                 samplesPerPass 1000000
-                samples 1000000
+                samples 5000000
                 statsPrefix ../scripts/viewCells
                 #samplingType directional
@@ -269 +264 @@
 
 
-        filename ../data/vienna/vsposp-seq-viewCells.xml.gz
+#       filename ../data/vienna/vsposp-seq-viewCells.xml.gz
 
 #       filename ../data/atlanta/viewcells_atlanta3.xml
@@ -277 +272 @@
 #       filename ../data/vienna/vienna_simple-21-04-avs2-viewCells.xml
 #       filename ../data/vienna/vienna-viewcells-5000.xml
-#       filename ../data/vienna/vienna-viewcells-1000.xml.zip
-        filename ../data/vienna/vsposp-seq-viewCells.xml.gz
+        filename ../data/vienna/vienna-viewcells-1000.xml.zip
+#       filename ../data/vienna/vsposp-seq-viewCells.xml.gz
 
 #       filename ../data/PowerPlant/power_plant_viewcells1.xml