Changeset 1141 for GTP/trunk/Lib/Vis/Preprocessing/src/VspOspTree.cpp

Timestamp:

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

Author:

mattausch

Message:

added kd pvs support, changed way of counting pvs

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/VspOspTree.cpp (modified) (19 diffs)

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;
 }