Changeset 1141 for GTP/trunk/Lib/Vis

Timestamp:

07/18/06 19:03:14 (18 years ago)

Author:

mattausch

Message:

added kd pvs support, changed way of counting pvs

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• Environment.cpp (modified) (1 diff)
• GlRenderer.cpp (modified) (2 diffs)
• Pvs.cpp (modified) (1 diff)
• Pvs.h (modified) (3 diffs)
• ResourceManager.h (modified) (6 diffs)
• ViewCell.cpp (modified) (15 diffs)
• ViewCell.h (modified) (1 diff)
• ViewCellBsp.cpp (modified) (1 diff)
• ViewCellsManager.cpp (modified) (10 diffs)
• ViewCellsManager.h (modified) (1 diff)
• VrmlExporter.cpp (modified) (1 diff)
• VspBspTree.cpp (modified) (4 diffs)
• VspOspTree.cpp (modified) (19 diffs)
• VspOspTree.h (modified) (9 diffs)
• X3dExporter.cpp (modified) (1 diff)

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

@@ -2212 +2212 @@
                                         "0.99");
 
-        RegisterOption("VspTree.useKdPvs",
-                                        optBool,
-                                        "vsp_pvs_use_kd_pvs=",
+        RegisterOption("VspTree.useKdPvsForHeuristics",
+                                        optBool,
+                                        "vsp_use_kd_pvs_for_heuristics=",
                                         "true");
 
+        RegisterOption("VspTree.storeKdPvs",
+                                        optBool,
+                                        "vsp_storeKdPvs=",
+                                        "true");
         
 /***************************************************************************/

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

@@ -1705 +1705 @@
   ViewCellContainer &viewcells = mViewCellsManager->GetViewCells();
   int maxPvs = -1;
-  for (i=0; i < viewcells.size(); i++) {
+  for (i=0; i < viewcells.size(); i++) 
+  {
         ViewCell *vc = viewcells[i];
-        int p = vc->GetPvs().GetSize();
+        const int p = vc->GetPvs().CountPvs();
         if (p > maxPvs)
           maxPvs = p;
@@ -1723 +1724 @@
           c = vc->GetColor();
         else {
-          float importance = (float)vc->GetPvs().GetSize() / (float)maxPvs;
+          const float importance = (float)vc->GetPvs().CountPvs() / (float)maxPvs;
           c = RgbColor(importance, 1.0f - importance, 0.0f);
         }

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

@@ -1 +1 @@
 #include <iostream>
+#include <stack>
 #include "Pvs.h"
+#include "Intersectable.h"
+#include "KdIntersectable.h"
+#include "KdTree.h"
+#include "common.h"
+
 
 namespace GtpVisibilityPreprocessor {
 
-int
-KdPvs::Compress()
+
+int KdPvs::Compress()
 {
         return 0; // TODO
 }
 
+
+int ObjectPvs::CountPvs() const
+{
+        int pvs = 0;
+
+        Intersectable::NewMail();
+        KdNode::NewMail();
+
+        ObjectPvsMap::const_iterator it, it_end = mEntries.end();
+
+        for (it = mEntries.begin(); it != it_end; ++ it)
+        {
+                Intersectable *obj = (*it).first;
+
+                if (obj->Type() == Intersectable::KD_INTERSECTABLE)
+                {
+                        KdIntersectable *kdObj = dynamic_cast<KdIntersectable *>(obj);
+
+                        stack<KdNode *> tStack;
+
+                        tStack.push(kdObj->GetNode());
+
+                        while (!tStack.empty())
+                        {
+                                KdNode *node = tStack.top();
+                                tStack.pop();
+
+                                // already processed node (objects in pvs)
+                                if (node->Mailed())
+                                        continue;
+
+                                node->Mail();
+
+                                if (node->IsLeaf())
+                                {
+                                        
+                                        KdLeaf *leaf = dynamic_cast<KdLeaf *>(node);
+
+                                        pvs += (int)(leaf->mObjects.size() - leaf->mMultipleObjects.size());
+
+                                        ObjectContainer::const_iterator it, it_end = leaf->mMultipleObjects.end();
+                                        {
+                                                Intersectable *object = *it;                                            
+                                                
+                                                if (!object->Mailed())
+                                                {
+                                                        object->Mail();
+                                                        ++ pvs;
+                                                }
+                                        }
+                                }
+                                else
+                                {
+                                        KdInterior *interior = dynamic_cast<KdInterior *>(node);
+
+                                        tStack.push(interior->mFront);
+                                        tStack.push(interior->mBack);
+                                }
+                        }
+                }
+                else
+                {
+                        ++ pvs;
+                }
+        }
+
+        return pvs;
 }
+
+}

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

@@ -58 +58 @@
 
   /** Normalize the visibility of entries in order to get comparable
-          results */
-  
+          results 
+  */
   void NormalizeMaximum();
   
@@ -413 +413 @@
 class KdPvs: public Pvs<KdNode *>
 {
+public:
         int Compress();
 };
 
+
+class ObjectPvs: public Pvs<Intersectable *>
+{
+public:
+        /** Counts pvs. Different to GetSize(), not
+                only the raw container size is returned,
+                but the individual contributions of the entries are summed up.
+        */
+        int CountPvs() const;
+};
 
 //-- typedefs
@@ -426 +437 @@
 typedef PvsData<KdNode *> KdPvsData;
 
-typedef Pvs<Intersectable *> ObjectPvs;
+//typedef Pvs<Intersectable *> ObjectPvs;
 typedef Pvs<ViewCell *> ViewCellPvs;
 }

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

@@ -49 +49 @@
         T *CreateResource()
         {
-                const int id = CreateUniqueId();
+                const unsigned int id = CreateUniqueId();
 
                 T *resource = new T(id);
@@ -61 +61 @@
                 @returns mesh or NULL if mesh was not found.
         */
-        T *FindEntry(const int id) const
+        T *FindEntry(const unsigned int id) const
         {
-                std::map<int, T *>::const_iterator mit = mEntries.find(id);
+                std::map<unsigned int, T *>::const_iterator mit = mEntries.find(id);
 
                 if (mit != mEntries.end()) 
@@ -76 +76 @@
                 @returns true if the mesh was found, false if not
         */
-        bool DestroyEntry(const int id)
+        bool DestroyEntry(const unsigned int id)
         {       
                 if (!FindEntry(id))
@@ -112 +112 @@
         ~ResourceManager<T>()
         {
-                std::map<int, T *>::iterator mit, mit_end = mEntries.end();
+                std::map<unsigned int, T *>::iterator mit, mit_end = mEntries.end();
 
                 for (mit = mEntries.begin(); mit != mEntries.end(); ++ mit)
@@ -129 +129 @@
          /** Helper function returning unique id for resource.
          */
-        static int CreateUniqueId()
+        static unsigned int CreateUniqueId()
         {
                 return sCurrentId ++;
@@ -137 +137 @@
 
         /// the resource container
-        std::map<int, T *> mEntries;
+        std::map<unsigned int, T *> mEntries;
 
 private:
 
         static ResourceManager<T> *sResourceManager;
-        static int sCurrentId;
+        static unsigned int sCurrentId;
 };
 
 // only instance of the resource manager
 template <typename T> ResourceManager<T> *ResourceManager<T>::sResourceManager = NULL;
-template <typename T> int ResourceManager<T>::sCurrentId = 0;
+template <typename T> unsigned int ResourceManager<T>::sCurrentId = 0;
 
 /// This type is responsible for creation and disposal the meshes

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

@@ -823 +823 @@
 
         Debug << "updating active vc: " << (int)viewCells.size() << endl;
-        // find all already merged view cells and remove them from view cells
+        
+        // find all already merged view cells and remove them from the
+        // container view cells
                 
         // sort out all view cells which are not active anymore, i.e., they
@@ -883 +885 @@
                 const int upper = mViewCellsManager->GetMaxPvsSize();
 
-                const float penalty = EvalPvsPenalty((*vit)->GetPvs().GetSize(), lower, upper);
+                const float penalty = EvalPvsPenalty((*vit)->GetPvs().CountPvs(), lower, upper);
                 
                 mDeviation += fabs(mAvgRenderCost - penalty);
@@ -943 +945 @@
 
 // TODO: should be done in view cells manager
-ViewCellInterior *ViewCellsTree::MergeViewCells(ViewCell *l, 
-                                                                                                ViewCell *r, 
+ViewCellInterior *ViewCellsTree::MergeViewCells(ViewCell *left, 
+                                                                                                ViewCell *right, 
                                                                                                 int &pvsDiff) //const
 {
-        ViewCellInterior *vc = mViewCellsManager->MergeViewCells(l, r);
+        // create merged view cell
+        ViewCellInterior *vc = 
+                mViewCellsManager->MergeViewCells(left, right);
 
         // if merge was unsuccessful
@@ -953 +957 @@
 
         // set to the new parent view cell
-        l->SetParent(vc);
-        r->SetParent(vc);
-
-        // set new size of view cell
+        left->SetParent(vc);
+        right->SetParent(vc);
+
+        
         if (mUseAreaForPvs)
         {
-                vc->SetArea(l->GetArea() + l->GetArea());
+                // set new area of view cell
+                // not not correct, but costly to compute real area!!
+                vc->SetArea(left->GetArea() + right->GetArea());
         }
         else
-        {
-                vc->SetVolume(r->GetVolume() + l->GetVolume());
+        {       // set new volume of view cell
+                vc->SetVolume(left->GetVolume() + right->GetVolume());
         }
 
@@ -971 +977 @@
         vc->Mail();
 
-        const int pvs1 = l->GetPvs().GetSize();
-        const int pvs2 = r->GetPvs().GetSize();
-
-
-        // new view cells are stored in this vector
+        const int pvs1 = left->GetPvs().CountPvs();
+        const int pvs2 = right->GetPvs().CountPvs();
+
+
+        // the new view cells are stored in this container
         mMergedViewCells.push_back(vc);
 
-        pvsDiff = vc->GetPvs().GetSize() - pvs1 - pvs2;
-
-
-
-        //Ždon't store intermediate pvs
+        pvsDiff = vc->GetPvs().CountPvs() - pvs1 - pvs2;
+
+
+        // don't store pvs in interior cells, just a scalar
         if (mViewCellsStorage == PVS_IN_LEAVES)
         {
-                l->mPvsSize = l->GetPvs().GetSize(); 
-                l->mPvsSizeValid = true;
+                left->mPvsSize = left->GetPvs().GetSize(); 
+                left->mPvsSizeValid = true;
                 
-                if (!l->IsLeaf())
-                        l->GetPvs().Clear();
+                // remove pvs, we don't store interior pvss
+                if (!left->IsLeaf())
+                {
+                        left->GetPvs().Clear();
+                }
+
+                right->mPvsSize = right->GetPvs().CountPvs(); 
+                right->mPvsSizeValid = true;
                 
-                r->mPvsSize = r->GetPvs().GetSize(); 
-                r->mPvsSizeValid = true;
-                
-                if (!r->IsLeaf())
-                        r->GetPvs().Clear();
-        
-}
-
+                // remove pvs, we don't store interior pvss
+                if (!right->IsLeaf())
+                {
+                        right->GetPvs().Clear();
+                }
+        }
 
         return vc;
@@ -1258 +1267 @@
                 const float penalty = 
                         EvalPvsPenalty(vc->GetPvs().GetSize(), lower, upper);
+
                 return (mAvgRenderCost - penalty) * (mAvgRenderCost - penalty) / 
                         (float)mNumActiveViewCells;
@@ -1274 +1284 @@
         if (1)
         {
-                const float penalty = EvalPvsPenalty(vc->GetPvs().GetSize(), lower, upper);
+                const float penalty = EvalPvsPenalty(vc->GetPvs().CountPvs(), lower, upper);
                 return fabs(mAvgRenderCost - penalty) / (float)mNumActiveViewCells;
         }
@@ -1283 +1293 @@
 
 
-
 float ViewCellsTree::GetRenderCost(ViewCell *vc) const
 {
         if (mUseAreaForPvs)
-                return vc->GetPvs().GetSize() * vc->GetArea();
-
-        return vc->GetPvs().GetSize() * vc->GetVolume();
+        {
+                return vc->GetPvs().CountPvs() * vc->GetArea();
+        }
+
+        return vc->GetPvs().CountPvs() * vc->GetVolume();
 }
 
@@ -1328 +1339 @@
                 newPvs = (int)ComputeMergedPvsCost(mc.mLeftViewCell->GetPvs(), mc.mRightViewCell->GetPvs());
 
-        const float newPenalty = EvalPvsPenalty(newPvs,
+        const float newPenalty = EvalPvsPenalty(newPvs, 
                                                                                         mViewCellsManager->GetMinPvsSize(),
                                                                                         mViewCellsManager->GetMaxPvsSize());
@@ -1477 +1488 @@
                         for (it = interior->mChildren.begin(); it != it_end; ++ it)
                         {
-                                int pvsSize = GetPvsSize(*it);
+                                const int pvsSize = GetPvsSize(*it);
                                 childCost += (float) pvsSize * (*it)->GetVolume();
                                 childPvs += pvsSize;
@@ -1603 +1614 @@
 
 
-
         // delete all the objects from the leaf sets which were moved to parent pvs
         ObjectPvsMap::const_iterator oit_end = interior->GetPvs().mEntries.end();
@@ -1615 +1625 @@
                 }
         }
-
-        /*int dummy = interior->GetPvs().GetSize();
-
-        for (cit = interior->mChildren.begin(); cit != cit_end; ++ cit)
-        {
-                dummy += (*cit)->GetPvs().GetSize();
-        }*/
-
 }
 
@@ -1729 +1731 @@
                         {
                                 if (countKdPvs)
-                                        pvsSize = vc->GetPvs().GetSize();
+                                        pvsSize = vc->GetPvs().CountPvs();
                                 else
                                         pvsSize = CountKdPvs(dynamic_cast<ViewCellLeaf *>(vc));
@@ -1817 +1819 @@
         case PVS_IN_INTERIORS:
         default:
-                Debug << "in interiors: " << vc->mPvsSize << " $$ " << vc->GetPvs().GetSize() << endl;
-                pvsSize = vc->GetPvs().GetSize();               
+                Debug << "in interiors: " << vc->mPvsSize << " $$ " << vc->GetPvs().CountPvs() << endl;
+                pvsSize = vc->GetPvs().CountPvs();              
         }
 
@@ -1840 +1842 @@
         if ((mViewCellsStorage == PVS_IN_INTERIORS) || vc->IsLeaf())
         {
-                pvsSize = vc->GetPvs().GetSize();
+                pvsSize = vc->GetPvs().CountPvs();
         }
 

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

@@ -206 +206 @@
                 return a->mPvsSize < b->mPvsSize;
 #else
-                return a->GetPvs().GetSize() < b->GetPvs().GetSize();
+                return a->GetPvs().CountPvs() < b->GetPvs().CountPvs();
 #endif
         }

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

@@ -1948 +1948 @@
                   << "#polygons: " << (int)data.mPolygons->size() << " (max: " << mTermMinPolys << "), "
                   << "#rays: " << (int)data.mRays->size() << " (max: " << mTermMinRays << "), " 
-                  << "#pvs: " << leaf->GetViewCell()->GetPvs().GetSize() << "=, "
+                  << "#pvs: " << leaf->GetViewCell()->GetPvs().CountPvs() << "=, "
                   << "#avg ray contrib (pvs): " << (float)data.mPvs / (float)data.mRays->size() << endl;
 #endif

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

@@ -226 +226 @@
         // question: rather create view cells resource manager?
         if (!ViewCellsTreeConstructed())
+        {
                 CLEAR_CONTAINER(mViewCells);
-        
+        }
+
         DEL_PTR(mViewCellsTree);
 }
@@ -301 +303 @@
                                 Ray *pray = (*it)->mPiercingRays[0];
                                 Debug << "view cell " << (*it)->GetId() << " not empty, pvs: " 
-                                          << (*it)->GetPvs().GetSize() << " " << (int)pray->intersections.size() << endl;
+                                          << (*it)->GetPvs().CountPvs() << " " << (int)pray->intersections.size() << endl;
 
                                 exporter->ExportRays((*it)->mPiercingRays);
@@ -1195 +1197 @@
 {
 
-        if ((vc->GetPvs().GetSize() > maxPvsSize) ||
-                (vc->GetPvs().GetSize() < minPvsSize))
+        if ((vc->GetPvs().CountPvs() > maxPvsSize) ||
+                (vc->GetPvs().CountPvs() < minPvsSize))
         {
                 return false;
@@ -1412 +1414 @@
         {
                 ViewCell *vc = *it;
-                totalRenderCost += vc->GetPvs().GetSize() * vc->GetVolume();
-                totalPvs += (int)vc->GetPvs().GetSize();
+                totalRenderCost += vc->GetPvs().CountPvs() * vc->GetVolume();
+                totalPvs += (int)vc->GetPvs().CountPvs();
         }
 
@@ -1430 +1432 @@
                 ViewCell *vc = *it;
 
-                float renderCost = vc->GetPvs().GetSize() * vc->GetVolume();
+                float renderCost = vc->GetPvs().CountPvs() * vc->GetVolume();
                 float dev;
 
                 if (1)
-                        dev = fabs(avgRenderCost - (float)vc->GetPvs().GetSize());
+                        dev = fabs(avgRenderCost - (float)vc->GetPvs().CountPvs());
                 else
                         dev = fabs(expectedRenderCost - renderCost);
@@ -1591 +1593 @@
 
         // update pvs size
-        vc->mPvsSize = vc->GetPvs().GetSize();
+        vc->mPvsSize = vc->GetPvs().CountPvs();
         vc->mPvsSizeValid = true;
 
@@ -4065 +4067 @@
         {
                 pvs = root->GetPvs();
-                SetScalarPvsSize(root, root->GetPvs().GetSize());
+                SetScalarPvsSize(root, root->GetPvs().CountPvs());
                 
                 return;
@@ -5464 +5466 @@
                 exporter->SetFilled();
 
-
                 if (1)
                 {       
@@ -5479 +5480 @@
                         exporter->SetForcedMaterial(m);
 
-                        // find kd nodes
+                        // export pvs entries
                         for (oit = pvs.mEntries.begin(); oit != oit_end; ++ oit)
                         {       
@@ -5488 +5489 @@
                                         exporter->ExportIntersectable(obj);
                                         obj->Mail();
-                                }                                       
-                                
-                                // export "original" pvs
-                                m.mDiffuseColor = RgbColor(0, 0, 1);
-                                exporter->SetForcedMaterial(m);
-
-                                if ((*oit).first->Type() == Intersectable::KD_INTERSECTABLE)
-                                {
-                                        KdIntersectable *kdObj = dynamic_cast<KdIntersectable *>(obj);
-                                        Intersectable *hitObj = kdObj->mHitObject;
-                                
-                                        if (!hitObj->Mailed())
-                                        {
-                                                exporter->ExportIntersectable(hitObj);
-                                                hitObj->Mail();
-                                        }       
                                 }
                         }               

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

@@ -655 +655 @@
         /// if pvs should be exported with view cells
         bool mExportPvs;
-
+// matt§§: need this?
         bool mCountKdPvs;
 };

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

@@ -261 +261 @@
 
                                 mForcedMaterial.mDiffuseColor.b = 1.0f;
-                                const float importance = (float)leaf->GetViewCell()->GetPvs().GetSize() / (float)maxPvs;
+                                const float importance = (float)leaf->GetViewCell()->GetPvs().CountPvs() / (float)maxPvs;
 
                                 mForcedMaterial.mDiffuseColor.r = importance;

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

@@ -854 +854 @@
 
                 // update scalar pvs size lookup
-                mViewCellsManager->SetScalarPvsSize(viewCell, viewCell->GetPvs().GetSize());
+                mViewCellsManager->SetScalarPvsSize(viewCell, viewCell->GetPvs().CountPvs());
         
 
@@ -991 +991 @@
 
                 // update scalar pvs size value
-                mViewCellsManager->SetScalarPvsSize(viewCell, viewCell->GetPvs().GetSize());
+                mViewCellsManager->SetScalarPvsSize(viewCell, viewCell->GetPvs().CountPvs());
 
                 mBspStats.contributingSamples += conSamp;
@@ -2343 +2343 @@
                         if (leaf->TreeValid() && 
                                 (!onlyUnmailed || !leaf->Mailed()) &&
-                                ((maxPvsSize < 0) || (leaf->GetViewCell()->GetPvs().GetSize() <= maxPvsSize)))
+                                ((maxPvsSize < 0) || (leaf->GetViewCell()->GetPvs().CountPvs() <= maxPvsSize)))
                         {
                                 leaves.push_back(leaf);
@@ -2420 +2420 @@
                   << "PVS: " << data.mPvs << " (min: " << mTermMinPvs << "), "
                   << "#rays: " << (int)data.mRays->size() << " (max: " << mTermMinRays << "), "
-                  << "#pvs: " << leaf->GetViewCell()->GetPvs().GetSize() << "), "
+                  << "#pvs: " << leaf->GetViewCell()->GetPvs().CountPvs() << "), "
                   << "#avg ray contrib (pvs): " << (float)data.mPvs / (float)data.mRays->size() << endl;
 #endif

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

@@ -364 +364 @@
         Environment::GetSingleton()->GetBoolValue("VspTree.simulateOctree", mCirculatingAxis);
         
-        Environment::GetSingleton()->GetBoolValue("VspTree.useKdPvs", mUseKdPvs);
+        Environment::GetSingleton()->GetBoolValue("VspTree.useKdPvsForHeuristics", mUseKdPvsForHeuristics);
 
         char subdivisionStatsLog[100];
@@ -400 +400 @@
         Debug << "maxband: " << mMaxBand << endl;
 
-        if (!mUseKdPvs)
+        if (!mUseKdPvsForHeuristics)
                 Debug << "pvs count method: per object" << endl;
         else
@@ -534 +534 @@
         int conSamp = 0;
         float sampCon = 0.0f;
-        AddToPvs(leaf, *tData.mRays, sampCon, conSamp);
+        AddSamplesToPvs(leaf, *tData.mRays, sampCon, conSamp);
 
         // update scalar pvs size value
-        mViewCellsManager->SetScalarPvsSize(viewCell, viewCell->GetPvs().GetSize());
+        mViewCellsManager->SetScalarPvsSize(viewCell, viewCell->GetPvs().CountPvs());
 
         mVspStats.contributingSamples += conSamp;
@@ -847 +847 @@
 
 
-void VspTree::AddToPvs(VspLeaf *leaf,
-                                           const RayInfoContainer &rays,
-                                           float &sampleContributions,
-                                           int &contributingSamples)
+bool VspTree::AddKdLeafToPvs(KdLeaf *leaf, 
+                                                         ViewCell *vc, 
+                                                         float &pdf, 
+                                                         float &contribution)
+{
+        bool contri = false;
+
+#if 1 // add kd intersecable to pvs
+        KdIntersectable *kdObj = mOspTree->GetOrCreateKdIntersectable(leaf);
+        
+        if (vc->AddPvsSample(kdObj, pdf, contribution))
+        {
+                return true;
+        }
+
+#else // add all objects of kd node
+
+        pdf = 0;
+        contribution = 0;
+
+        ObjectContainer::const_iterator it, it_end = leaf->mObjects.end();
+
+        for (it = leaf->mObjects.begin(); it != it_end; ++ it)
+        {
+                Intersectable *object = *it;                                            
+
+                float newpdf;
+                float newcontri;
+                                                
+                if (vc->AddPvsSample(object, newpdf, newcontri))
+                {
+                        contri = true;
+                }
+
+                pdf += newPdf;
+                newContri += contribution;
+        }
+
+#endif
+
+        return contri;
+}
+
+void VspTree::AddSamplesToPvs(VspLeaf *leaf,
+                                                         const RayInfoContainer &rays,
+                                                         float &sampleContributions,
+                                                         int &contributingSamples)
 {
         sampleContributions = 0;
@@ -859 +902 @@
         ViewCellLeaf *vc = leaf->GetViewCell();
   
+        
         // add contributions from samples to the PVS
         for (it = rays.begin(); it != it_end; ++ it)
@@ -875 +919 @@
 
                         // potentially visible kd cells
-                        if (mUseKdPvs)
+                        if (mStoreKdPvs)
                         {
                                 KdLeaf *leaf = mOspTree->GetLeaf(ray->mTermination, ray->mTerminationNode);
-                                KdIntersectable *kdObj = new KdIntersectable(leaf);
-
-                                entry = kdObj;
+                                AddKdLeafToPvs(leaf, vc, ray->mPdf, contribution);
                         }
                         else
-                                entry = obj;
-
-                        if (vc->AddPvsSample(obj, ray->mPdf, contribution))
-                        {
-                                madeContrib = true;
+                        {
+                                if (vc->AddPvsSample(obj, ray->mPdf, contribution))
+                                {
+                                        madeContrib = true;
+                                }
                         }
 
@@ -900 +942 @@
 
                         // potentially visible kd cells
-                        if (mUseKdPvs)
-                        {
-                                KdLeaf *leaf = mOspTree->GetLeaf(ray->mOrigin, ray->mOriginNode);
-                                KdIntersectable *kdObj = new KdIntersectable(leaf);
-
-                                entry = kdObj;                          
+                        if (mUseKdPvsForHeuristics)
+                        {
+                                KdLeaf *leaf = mOspTree->GetLeaf(ray->mOrigin, ray->mOriginNode);       
+                                AddKdLeafToPvs(leaf, vc, ray->mPdf, contribution);
                         }
                         else
-                                entry = obj;
-
-                        if (vc->AddPvsSample(obj, ray->mPdf, contribution))
-                        {
-                                madeContrib = true;
+                        {
+                                if (vc->AddPvsSample(obj, ray->mPdf, contribution))
+                                {
+                                        madeContrib = true;
+                                }
                         }
 
@@ -919 +959 @@
 
                 if (madeContrib)
+                {
                         ++ contributingSamples;
-                
+                }
+
                 // store rays for visualization
                 if (0) leaf->mVssRays.push_back(new VssRay(*ray));
@@ -1056 +1098 @@
                 if (oObject)
                 {
-                        if (!mUseKdPvs)
+                        if (!mUseKdPvsForHeuristics)
                         {
                                 if (!oObject->Mailed())
@@ -1080 +1122 @@
                 if (tObject)
                 {
-                        if (!mUseKdPvs)
+                        if (!mUseKdPvsForHeuristics)
                         {
                                 if (!tObject->Mailed())
@@ -1166 +1208 @@
         if (oObject)
         {       
-                if (!mUseKdPvs)
+                if (!mUseKdPvsForHeuristics)
                 {
                         if (ci.type == SortableEntry::ERayMin)
@@ -1202 +1244 @@
         if (tObject)
         {       
-                if (!mUseKdPvs)
+                if (!mUseKdPvsForHeuristics)
                 {
                         if (ci.type == SortableEntry::ERayMin)
@@ -1615 +1657 @@
                         if (leaf->TreeValid() && 
                                 (!onlyUnmailed || !leaf->Mailed()) &&
-                                ((maxPvsSize < 0) || (leaf->GetViewCell()->GetPvs().GetSize() <= maxPvsSize)))
+                                ((maxPvsSize < 0) || (leaf->GetViewCell()->GetPvs().CountPvs() <= maxPvsSize)))
                         {
                                 leaves.push_back(leaf);
@@ -1692 +1734 @@
                   << "PVS: " << data.mPvs << " (min: " << mTermMinPvs << "), "
                   << "#rays: " << (int)data.mRays->size() << " (max: " << mTermMinRays << "), "
-                  << "#pvs: " << leaf->GetViewCell()->GetPvs().GetSize() << "), "
+                  << "#pvs: " << leaf->GetViewCell()->GetPvs().CountPvs() << "), "
                   << "#avg ray contrib (pvs): " << (float)data.mPvs / (float)data.mRays->size() << endl;
 #endif
@@ -2707 +2749 @@
 }
 
+
+OspTree::~OspTree()
+{
+        KdIntersectableMap::iterator it, it_end = mKdIntersectables.end();
+
+        for (it = mKdIntersectables.begin(); it != mKdIntersectables.end(); ++ it)
+        {
+                DEL_PTR((*it).second);
+        }
+}
 
 
@@ -3895 +3947 @@
 
 
+KdIntersectable *OspTree::GetOrCreateKdIntersectable(KdNode *node)
+{
+        // 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;
+}
 
 
@@ -3900 +3969 @@
 /*               class HierarchyManager implementation              */
 /********************************************************************/
-
 
 
@@ -4068 +4136 @@
         // makes no sense otherwise because only one kd cell available
         // during view space partition
-        const bool savedCountMethod = mVspTree.mUseKdPvs;
-        mVspTree.mUseKdPvs = false;
+        const bool savedCountMethod = mVspTree.mUseKdPvsForHeuristics;
+        const bool savedStoreMethod = mVspTree.mStoreKdPvs;
+        
+        mVspTree.mUseKdPvsForHeuristics = false;
+        mVspTree.mStoreKdPvs = false;
 
         mTQueue.Push(PrepareVsp(sampleRays, forcedViewSpace, *viewSpaceRays));
@@ -4148 +4219 @@
         cout << "finished in " << TimeDiff(startTime, GetTime())*1e-3 << " secs" << endl;
 
-        mVspTree.mUseKdPvs = savedCountMethod;
+        mVspTree.mUseKdPvsForHeuristics = savedCountMethod;
+        mVspTree.mStoreKdPvs = savedStoreMethod;
 }
 

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

@@ -33 +33 @@
 class KdLeaf;
 class OspTree;
+class KdIntersectable;
+
 
 
@@ -461 +463 @@
 #endif
 
+typedef map<KdNode *, KdIntersectable *> KdIntersectableMap;
+
 typedef FlexibleHeap<SplitCandidate *> SplitQueue;
 
@@ -980 +984 @@
                 
         */
-        void AddToPvs(VspLeaf *leaf,
+        void AddSamplesToPvs(VspLeaf *leaf,
                                   const RayInfoContainer &rays, 
                                   float &sampleContributions,
                                   int &contributingSamples);
+
+        bool AddKdLeafToPvs(KdLeaf *leaf, ViewCell *vc, float &pvs, float &contribution);
 
         /** Propagates valid flag up the tree.
@@ -1018 +1024 @@
 protected:
 
-        bool mUseKdPvs;
-
-        enum {PER_OBJECT, PER_KDLEAF};
+        bool mUseKdPvsForHeuristics;
+        bool mStoreKdPvs;
 
         ViewCellsManager *mViewCellsManager;
@@ -1036 +1041 @@
         /// box around the whole view domain
         AxisAlignedBox3 mBoundingBox;
-
 
 
@@ -1339 +1343 @@
 #endif
 
+        /** 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);
+
         /** Collects rays stored in the leaves.
         */
@@ -1549 +1558 @@
                 float &pFront,
                 float &pBack);
-        /** Adds ray sample contributions to the PVS.
-                @param sampleContributions the number contributions of the samples
-                @param contributingSampels the number of contributing rays
-                
-        */
-        void AddToPvs(VspLeaf *leaf,
-                                  const RayInfoContainer &rays, 
-                                  float &sampleContributions,
-                                  int &contributingSamples);
-
+        
         /** Propagates valid flag up the tree.
         */
@@ -1667 +1667 @@
 
 
-
         //-- split heuristics based parameters
         
@@ -1698 +1697 @@
         /// weight between  render cost decrease and node render cost
         float mRenderCostDecreaseWeight;
+
+        /// stores the kd node intersectables used for pvs
+        KdIntersectableMap mKdIntersectables;
 };
 

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

@@ -297 +297 @@
 
                                 mForcedMaterial.mDiffuseColor.b = 1.0f;
-                                const float importance = (float)leaf->GetViewCell()->GetPvs().GetSize() / (float)maxPvs;
+                                const float importance = 
+                                        (float)leaf->GetViewCell()->GetPvs().CountPvs() / (float)maxPvs;
 
                                 mForcedMaterial.mDiffuseColor.r = importance;