Changeset 1302 for GTP/trunk/Lib/Vis/Preprocessing

Timestamp:

08/30/06 21:54:49 (18 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• BvHierarchy.cpp (modified) (13 diffs)
• BvHierarchy.h (modified) (1 diff)
• HierarchyManager.cpp (modified) (6 diffs)
• RssPreprocessor.cpp (modified) (8 diffs)
• SubdivisionCandidate.h (modified) (1 diff)
• ViewCellsManager.cpp (modified) (1 diff)
• VspBspTree.cpp (modified) (3 diffs)
• VspTree.cpp (modified) (22 diffs)
• VspTree.h (modified) (2 diffs)
• VssTree.cpp (modified) (7 diffs)

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

@@ -29 +29 @@
 int BvhNode::sReservedMailboxes = 1;
 
-
 BvHierarchy *BvHierarchy::BvhSubdivisionCandidate::sBvHierarchy = NULL;
-
 
 
@@ -85 +83 @@
 
 BvhLeaf::BvhLeaf(const AxisAlignedBox3 &bbox):
-BvhNode(bbox)
+BvhNode(bbox), mSubdivisionCandidate(NULL)
 {
 }
@@ -430 +428 @@
 
         const float viewSpaceVol = mVspTree->GetBoundingBox().GetVolume();
-        const float oldRenderCost = 
-                splitCandidate.mParentData.mProbability * (float)leaf->mObjects.size() / viewSpaceVol;
+        const float oldProp = EvalViewCellsVolume(leaf->mObjects);
+        const float oldProp2 = splitCandidate.mParentData.mProbability; //Debug << "here8 " << (oldProp - oldProp2) / viewSpaceVol << "  " << oldProp  / viewSpaceVol << " " << oldProp2  / viewSpaceVol << endl;
+
+        const float oldRenderCost = oldProp * (float)leaf->mObjects.size() / viewSpaceVol;
 
         // compute global decrease in render cost
         float newRenderCost = EvalRenderCost(splitCandidate.mParentData,
-                                                                             splitCandidate.mFrontObjects, 
+                                                                             splitCandidate.mFrontObjects,
                                                                                  splitCandidate.mBackObjects);
 
@@ -445 +445 @@
         splitCandidate.SetRenderCostDecrease(renderCostDecr);
 
-#if 0
+#if 1
         const float priority = (float)-splitCandidate.mParentData.mDepth;
 #else   
@@ -452 +452 @@
         const float factor = mRenderCostDecreaseWeight;
         const float priority = factor * renderCostDecr + (1.0f - factor) * oldRenderCost;
-
 #endif
 
@@ -476 +475 @@
         return (0
                 || (mBvhStats.Leaves() >= mTermMaxLeaves)
-                || (mGlobalCostMisses >= mTermGlobalCostMissTolerance)
+                //|| (mGlobalCostMisses >= mTermGlobalCostMissTolerance)
                 //|| mOutOfMemory 
                 );
@@ -574 +573 @@
         }
 
-        const float oldRenderCost = tData.mProbability * (float)tData.mNode->mObjects.size();
-        const float newRenderCost = 
-                EvalRenderCost(tData, objectsFront, objectsBack);
+        const float oldProp = EvalViewCellsVolume(tData.mNode->mObjects);
+        //const float oldProp2 = tData.mProbability; Debug << "here65 " << oldProp - oldProp2 << endl;
+
+        const float oldRenderCost = oldProp * (float)tData.mNode->mObjects.size();
+        const float newRenderCost = EvalRenderCost(tData, objectsFront, objectsBack);
 
         const float ratio = newRenderCost / oldRenderCost;
@@ -960 +961 @@
 
         //-- pvs rendering heuristics
-        const float newRenderCost = nObjectsFront * pFront + 
-                                                                nObjectsBack * pBack;
-
+        const float newRenderCost = nObjectsFront * pFront + nObjectsBack * pBack;
+        /*
         const float viewSpaceVol = mVspTree->GetBoundingBox().GetVolume();
-        /*Debug << "\nbvh render cost\n" 
+        Debug << "\nbvh render cost\n" 
                   << "back p: " << pBack / viewSpaceVol << " front p " << pFront / viewSpaceVol << endl
                   << "new rc: " << newRenderCost / viewSpaceVol << endl;*/
-                 
 
         return newRenderCost;
@@ -1100 +1099 @@
 
         Debug << "collecting " << (int)viewCells.size() << " dirty candidates" << endl;
+
         for (vit = viewCells.begin(); vit != vit_end; ++ vit)
         {
@@ -1105 +1105 @@
                 VspLeaf *leaf = vc->mLeaf;
                 SubdivisionCandidate *candidate = leaf->GetSubdivisionCandidate();
+                Debug << "here100 candidate: " << candidate << " type: " << candidate->Type() << endl;
                 
                 dirtyList.push_back(leaf->GetSubdivisionCandidate());
@@ -1301 +1302 @@
 
         // compute bounding box from objects
-        // we assume that root was already created
+        // note: we assume that root was already created
         mBoundingBox = mRoot->GetBoundingBox();
         BvhLeaf *bvhleaf = dynamic_cast<BvhLeaf *>(mRoot);
@@ -1311 +1312 @@
         AssociateObjectsWithRays(sampleRays);
         
-
         // probabilty is voume of all "seen" view cells
 #if 1
@@ -1326 +1326 @@
                 new BvhSubdivisionCandidate(oData);
 
-        //UpdateViewCellsPvs(kdleaf, rays);
-
         EvalSubdivisionCandidate(*oSubdivisionCandidate);
+        bvhleaf->SetSubdivisionCandidate(oSubdivisionCandidate);
 
         const float viewSpaceVol = mVspTree->GetBoundingBox().GetVolume();

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

@@ -35 +35 @@
 class VspTree;
 class ViewCellsContainer;
-class BvhSubdivisionCandidate;
+//class BvhSubdivisionCandidate;
 
 

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

@@ -232 +232 @@
                 || (mHierarchyStats.Leaves() >= mTermMaxLeaves) 
                 //|| (mGlobalCostMisses >= mTermGlobalCostMissTolerance)
-                //||    candidate->GlobalTerminationCriteriaMet()
+                ||      candidate->GlobalTerminationCriteriaMet()
                 );
 }
@@ -269 +269 @@
                                                 *objectSpaceRays);
 
-
         cout << "Constructing view space / object space tree ... \n";
         const long startTime = GetTime();       
         
         const bool repairQueue = true;
+        //const bool repairQueue = false;
+
         // process object space candidates
         RunConstruction(repairQueue);
-
-        cout << "finished in " << TimeDiff(startTime, GetTime())*1e-3 << " secs" << endl;
+        cout << "finished in " << TimeDiff(startTime, GetTime()) * 1e-3 << " secs" << endl;
 
         mVspTree->mVspStats.Stop();
@@ -424 +424 @@
                         if (repair) RepairQueue();
 
-                        cout << "candidate: " << mCurrentCandidate->Type() << ", priority: " 
-                                 << mCurrentCandidate->GetPriority() << endl;
-                }
-
+                        Debug << "candidate: " << mCurrentCandidate->Type() << ", priority: " 
+                                  << mCurrentCandidate->GetPriority() << endl;
+                }
+                
                 DEL_PTR(mCurrentCandidate);
         }
@@ -457 +457 @@
 
                         mBvHierarchy->CollectDirtyCandidates(sc, dirtyList);
+
+sc->mParentData.mNode->SetSubdivisionCandidate(NULL); // HACK
                         break;
                 }
@@ -471 +473 @@
 
         mVspTree->CollectDirtyCandidates(sc, dirtyList);
+
+sc->mParentData.mNode->SetSubdivisionCandidate(NULL); // HACK
 }
 
 
 void HierarchyManager::CollectDirtyCandidates(SubdivisionCandidateContainer &dirtyList)
-{       
+{
         // we have either a object space or view space split
         if (mCurrentCandidate->Type() == SubdivisionCandidate::VIEW_SPACE)
         {
+                Debug << "collecting candidates after view space split" << endl;
                 CollectViewSpaceDirtyList(dirtyList);
         }
         else // object space split
-        {       
+        {       Debug << "collecting candidates after object space split" << endl;
                 CollectObjectSpaceDirtyList(dirtyList);
         }
@@ -509 +514 @@
         // collect list of "dirty" candidates
         vector<SubdivisionCandidate *> dirtyList;
+        Debug << "collecting dirty candidates" << endl;
         CollectDirtyCandidates(dirtyList);
         
         //-- reevaluate the dirty list
         vector<SubdivisionCandidate *>::const_iterator sit, sit_end = dirtyList.end();
+        
+        Debug << "collected " << (int)dirtyList.size() << " candidates" << endl;
 
         for (sit = dirtyList.begin(); sit != sit_end; ++ sit)
         {
                 SubdivisionCandidate* sc = *sit;
-                // erase from queue
-                mTQueue.Erase(sc);
-                // reevaluate
-                sc->EvalPriority();
-                // reinsert
-                mTQueue.Push(sc);
+                float rcd = sc->GetRenderCostDecrease();
+                Debug << "here6 " << rcd << endl;
+                Debug << "here84 " << endl;
+                Debug << "here7 " << sc << endl;
+                Debug << "here90 " << sc->GetPosition() << endl;
+                Debug << "here91 " << sc->Type() << endl;
+                //Debug << "here1191" << sc->Type() << endl;
+                //Debug << "sc: " << sc << " " << sc->GetPosition() << " " << sc->Type() << endl;
+                
+                Debug << "here11" << endl;
+                mTQueue.Erase(sc); // erase from queue
+                Debug << "here2" << endl;
+
+                sc->EvalPriority(); // reevaluate
+                
+        /*      cout << "render cost decrease diff " << rcd - sc->GetRenderCostDecrease() 
+                         << " old: " << rcd << " new " << sc->GetRenderCostDecrease()
+                         << " type " << sc->Type() << endl;*/
+
+                mTQueue.Push(sc); // reinsert
         }
 }

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

@@ -521 +521 @@
                 // use a small box outside of the scene
                 box.Scale(Vector3(0.1f,0.5f,0.5f));
-                box.Translate(Vector3(Magnitude(mKdTree->GetBox().Size())*0.5, 0, 0));
+                box.Translate(Vector3(Magnitude(mKdTree->GetBox().Size())*0.5f, 0, 0));
           } else {
                 float s = box.Size(0);
@@ -692 +692 @@
           GenerateRays(mRssSamplesPerPass*ratios[0], RSS_BASED_DISTRIBUTION, rays);
 
-          rays.NormalizePdf((int)rays.size());
+          rays.NormalizePdf((float)rays.size());
           
           CastRays(rays, tmpVssRays);
@@ -702 +702 @@
 #endif
           times[0] = TimeDiff(t1, GetTime());
-          nrays[0] = rays.size();
+          nrays[0] = (int)rays.size();
           
           mStats<<"#RssRelContrib"<<endl<<contributions[0]/nrays[0]<<endl;
@@ -713 +713 @@
                 GenerateRays(mRssSamplesPerPass*ratios[1], SPATIAL_BOX_BASED_DISTRIBUTION, rays);
                 CastRays(rays, tmpVssRays);
-                castRays += rays.size();
+                castRays += (int)rays.size();
 #if ADD_RAYS_IN_PLACE 
                 contributions[1] = mViewCellsManager->ComputeSampleContributions(tmpVssRays, true, false);
@@ -720 +720 @@
 #endif
           times[1] = TimeDiff(t1, GetTime());
-          nrays[1] = rays.size();
+          nrays[1] = (int)rays.size();
 
           mStats<<"#SpatialRelContrib"<<endl<<contributions[1]/nrays[1]<<endl;
@@ -735 +735 @@
                 GenerateRays(mRssSamplesPerPass*ratios[2], DIRECTION_BASED_DISTRIBUTION, rays);
                 CastRays(rays, tmpVssRays);
-                castRays += rays.size();
+                castRays += (int)rays.size();
 #if ADD_RAYS_IN_PLACE 
                 contributions[2] = mViewCellsManager->ComputeSampleContributions(tmpVssRays, true, false);
@@ -742 +742 @@
 #endif
                 times[2] = TimeDiff(t1, GetTime());
-                nrays[2] = rays.size();
+                nrays[2] = (int)rays.size();
                 
                 mStats<<"#DirectionalRelContrib"<<endl<<contributions[2]/nrays[2]<<endl;
@@ -790 +790 @@
           CastRays(rays, vssRays);
           cout<<"done."<<endl;
-          castRays += rays.size();
+          castRays += (int)rays.size();
           if (mUseViewcells) {
                 /// compute view cell contribution of rays

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

@@ -25 +25 @@
 
         SubdivisionCandidate(): mRenderCostDecrease(0) {};
-
-        /*SubdivisionCandidate(const AxisAlignedPlane &plane): 
-        mSplitPlane(plane), mRenderCostDecrease(0)
-        {}*/
 
         virtual void EvalPriority() = 0;

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

@@ -5703 +5703 @@
         }
 
-        Debug << "\nhere295 " << rc / mHierarchyManager->GetVspTree()->GetBoundingBox().GetVolume() << endl;
+        Debug << "\nrendercost hack: " << rc / mHierarchyManager->GetVspTree()->GetBoundingBox().GetVolume() << endl;
         mViewCellsTree->ExportStats(fileName);
         cout << "finished" << endl;

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

@@ -529 +529 @@
                                                           geom);
 
+        // evaluate the priority of this traversal data
         EvalPriority(tData);
-
 
         // first node is kd node, i.e. an axis aligned box
@@ -750 +750 @@
 {
         return
-                (mOutOfMemory 
+                (0
+                || mOutOfMemory 
                 || (mBspStats.Leaves() >= mMaxViewCells) 
                 || (mGlobalCostMisses >= mTermGlobalCostMissTolerance)
@@ -2316 +2317 @@
 
 #ifdef _DEBUG
-        Debug << axis << " " << pvsSize << " " << pvsBack << " " << pvsFront << endl;
-        Debug << pFront << " " << pBack << " " << pOverall << endl;
+        Debug << "axis: " << axis << " " << pvsSize << " " << pvsBack << " " << pvsFront << endl;
+        Debug << "p: " << pFront << " " << pBack << " " << pOverall << endl;
 #endif
 

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

@@ -23 +23 @@
 
 
+
 namespace GtpVisibilityPreprocessor {
 
@@ -32 +33 @@
 
 VspTree *VspTree::VspSubdivisionCandidate::sVspTree = NULL;
-
+int VspNode::sMailId = 1;
 
 // variable for debugging volume contribution for heuristics
 static float debugVol;
 
-int VspNode::sMailId = 1;
 
 // pvs penalty can be different from pvs size
@@ -53 +53 @@
                 return (float)upper;
         }
-
         return (float)pvs;
 }
@@ -299 +298 @@
 
 
-VspLeaf::VspLeaf(): mViewCell(NULL), mPvs(NULL)
+VspLeaf::VspLeaf(): mViewCell(NULL), mPvs(NULL), mSubdivisionCandidate(NULL)
 {
 }
@@ -554 +553 @@
                 // || mOutOfMemory
                 || (mVspStats.Leaves() >= mMaxViewCells)
-        || (mGlobalCostMisses >= mTermGlobalCostMissTolerance) 
+        //|| (mGlobalCostMisses >= mTermGlobalCostMissTolerance) 
                 );
 
@@ -630 +629 @@
         VspSubdivisionCandidate *sc = 
                 dynamic_cast<VspSubdivisionCandidate *>(splitCandidate);
+
         VspTraversalData &tData = sc->mParentData;
-
         VspNode *newNode = tData.mNode;
 
@@ -735 +734 @@
 
         // max cost threshold violated?
-        splitCandidate.mMaxCostMisses = 
-                maxCostRatioViolated  ? 
+        splitCandidate.mMaxCostMisses = maxCostRatioViolated  ? 
                         splitCandidate.mParentData.mMaxCostMisses + 1:
                         splitCandidate.mParentData.mMaxCostMisses;
@@ -749 +747 @@
         splitCandidate.SetRenderCostDecrease(renderCostDecr);
 
-#if 0
+#if 1
         const float priority = (float)-splitCandidate.mParentData.mDepth;
-#else   
-
+#else
         // take render cost of node into account 
         // otherwise danger of being stuck in a local minimum!!
@@ -785 +782 @@
 
         //-- compute pvs
+
         frontData.mPvs = EvalPvsSize(*frontData.mRays);
         backData.mPvs = EvalPvsSize(*backData.mRays);
@@ -815 +813 @@
     
         VspInterior *interior = new VspInterior(splitPlane);
-
-#ifdef _DEBUG
-        Debug << interior << endl;
-#endif+
 
 
@@ -1196 +1190 @@
         float minSum = 1e20f;
 
-        
         // if no good split can be found, take mid split
         position = minBox + 0.5f * sizeBox;
@@ -1209 +1202 @@
 
         //-- traverse through visibility events
-
         vector<SortableEntry>::const_iterator ci, ci_end = mLocalSubdivisionCandidates->end();
 
@@ -1373 +1365 @@
         Intersectable::NewMail(3);
         KdLeaf::NewMail(3);
-        //for (int i=0;i<25;++i) BvhLeaf::NewMail();
         BvhLeaf::NewMail(3);
 
@@ -1392 +1383 @@
                 // evaluate contribution of ray endpoint to front and back pvs
                 // with respect to the classification
-                //Debug << "mail1:  " << BvhLeaf::sMailId << endl;
                 UpdateContributionsToPvs(*ray, true, cf, pvsFront, pvsBack, totalPvs);  
-                //Debug << "mail2:  " << BvhLeaf::sMailId << endl;
                 UpdateContributionsToPvs(*ray, false, cf, pvsFront, pvsBack, totalPvs);
-                //Debug << "mail3:  " << BvhLeaf::sMailId << endl;
-        }
-
+        }
 
         AxisAlignedBox3 frontBox;
@@ -1412 +1399 @@
 
         //-- pvs rendering heuristics
+
         const int lowerPvsLimit = mViewCellsManager->GetMinPvsSize();
         const int upperPvsLimit = mViewCellsManager->GetMaxPvsSize();
 
-        //-- only render cost heuristics or combined with standard deviation
-
+        // only render cost heuristics or combined with standard deviation
         const float penaltyOld = EvalPvsPenalty((int)totalPvs, lowerPvsLimit, upperPvsLimit);
     const float penaltyFront = EvalPvsPenalty((int)pvsFront, lowerPvsLimit, upperPvsLimit);
@@ -1484 +1471 @@
         
 #ifdef _DEBUG
-        Debug << axis << " " << pvsSize << " " << pvsBack << " " << pvsFront << endl;
-        Debug << pFront << " " << pBack << " " << pOverall << endl;
+        Debug << "axis: " << axis << " " << pvsSize << " " << pvsBack << " " << pvsFront << endl;
+        Debug << "p: " << pFront << " " << pBack << " " << pOverall << endl;
 #endif
 
@@ -2662 +2649 @@
         VspSubdivisionCandidate *splitCandidate = new VspSubdivisionCandidate(vData);
     EvalSubdivisionCandidate(*splitCandidate);
+        leaf->SetSubdivisionCandidate(splitCandidate);
 
         mTotalCost = (float)pvsSize;
@@ -2674 +2662 @@
                                                                         vector<SubdivisionCandidate *> &dirtyList) const
 {
+
         Intersectable *obj;
         Vector3 pt;
@@ -2679 +2668 @@
 
         ray.GetSampleData(isTermination, pt, &obj, &node);
-
+        
         if (!obj) return;
 
@@ -2693 +2682 @@
                                 dirtyList.push_back(leaf->mSubdivisionCandidate);
                         }
-
                         break;
                 }
         case HierarchyManager::BV_BASED_OBJ_SUBDIV:
                 {
+                        BvhLeaf *leaf = mHierarchyManager->mBvHierarchy->GetLeaf(obj);
+
+                        if (!leaf->Mailed())
+                        {
+                                leaf->Mail();
+                                dirtyList.push_back(leaf->GetSubdivisionCandidate());
+                                Debug << "here120 candidate: " << leaf->GetSubdivisionCandidate() << " type: " << leaf->GetSubdivisionCandidate()->Type() << endl;
+                        }
+                        break;
                 }
                 break;
@@ -2714 +2711 @@
         KdLeaf::NewMail();
         BvhLeaf::NewMail();
-
+        
         RayInfoContainer::const_iterator rit, rit_end = tData.mRays->end();
 
@@ -2721 +2718 @@
         {
                 VssRay *ray = (*rit).mRay;
-        
+                
                 CollectDirtyCandidate(*ray, true, dirtyList);
                 CollectDirtyCandidate(*ray, false, dirtyList);

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

@@ -36 +36 @@
 class VspTree;
 class KdTreeStatistics;
-class SubdivisionCandidate;
-class VspSubdivisionCandidate;
+//class SubdivisionCandidate;
+//class VspSubdivisionCandidate;
 
 /** View space partition statistics.
@@ -482 +482 @@
         };
 
-        //typedef std::priority_queue<VspTraversalData> VspOspTraversalQueue;
-
         /** Default constructor creating an empty tree.
         */ 
         VspTree();
-
         /** Default destructor.
         */

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

@@ -801 +801 @@
   // C = ct_div_ci  + (ql*rl + qr*rr)/queries
         
-  int rl=0, rr = leaf->rays.size();
-  int pl=0, pr = leaf->GetPvsSize();
+  int rl=0, rr = (int)leaf->rays.size();
+  int pl=0, pr = (int)leaf->GetPvsSize();
   float sizeBox = maxBox - minBox;
         
-  float minBand = minBox + 0.1*(maxBox - minBox);
-  float maxBand = minBox + 0.9*(maxBox - minBox);
+  float minBand = minBox + 0.1f*(maxBox - minBox);
+  float maxBand = minBox + 0.9f*(maxBox - minBox);
         
   float minRatio = 1e20f;
@@ -901 +901 @@
   splitCandidates->clear();
   
-  int requestedSize = 2*(node->rays.size());
+  int requestedSize = 2*((int)node->rays.size());
   // creates a sorted split candidates array
   if (splitCandidates->capacity() > 500000 &&
@@ -1304 +1304 @@
         
                 if (removeAllScheduledRays) {
-                  int tail = leaf->rays.size()-1;
+                  int tail = (int)leaf->rays.size()-1;
 
                   for (int i=0; i < (int)(leaf->rays.size()); i++) {
@@ -1664 +1664 @@
           VssTreeLeaf *leaf = (VssTreeLeaf *)node;
           float c = leaf->GetImportance();
-          int num = (c*ratioPerLeaf + 0.5f);
+          int num = int(c*ratioPerLeaf + 0.5f);
           //                    cout<<num<<" ";
 
@@ -1683 +1683 @@
   }
 
-  return rays.size();
+  return (int)rays.size();
 }
 
@@ -1975 +1975 @@
         }
   }
-  return rays.size();
+  return (int)rays.size();
 }
 
@@ -2009 +2009 @@
   }
   
-  return rays.size();
-}
-
-}
+  return (int)rays.size();
+}
+
+}