Changeset 423 for trunk/VUT/GtpVisibilityPreprocessor

Timestamp:

11/18/05 20:30:31 (19 years ago)

Author:

mattausch

Message:

proceeding with the kd view space partition

Location:

trunk/VUT/GtpVisibilityPreprocessor

Files:

• scripts/default.env (modified) (2 diffs)
• src/SamplingPreprocessor.cpp (modified) (1 diff)
• src/ViewCellBsp.cpp (modified) (1 diff)
• src/ViewCellBsp.h (modified) (1 diff)
• src/VspKdTree.cpp (modified) (25 diffs)
• src/VspKdTree.h (modified) (3 diffs)

trunk/VUT/GtpVisibilityPreprocessor/scripts/default.env

@@ -62 +62 @@
 
 Sampling {
-        totalSamples    1000000
+        totalSamples    300000
         samplesPerPass  3
 }
@@ -208 +208 @@
         Termination {
                 maxDepth        40
-                minPvs          1
-                minRays         50
-                minSize         0.00001
+                minPvs          5
+                minRays         100
+                minSize         0.001
                 maxCostRatio    0.95
-                maxRayContribution 0.05
+                maxRayContribution 0.1
         }
         
         maxTotalMemory  400
-        maxStaticMemory 20
+        maxStaticMemory 200
 
         splitType regular

trunk/VUT/GtpVisibilityPreprocessor/src/SamplingPreprocessor.cpp

@@ -764 +764 @@
                         cout << "building VSP tree from " << (int)mVspSampleRays.size() << " samples " << endl;
                         mVspKdTree = new VspKdTree();
-                        mVspKdTree->Construct(mVspSampleRays);
+                        mVspKdTree->Construct(mVspSampleRays, &mKdTree->GetBox());
                 
                         // add contributions of saved samples to PVS

trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellBsp.cpp

@@ -739 +739 @@
                  (data.mArea <= mTermMinArea) ||
                  (data.mDepth >= mTermMaxDepth) ||
-                 (((float)data.mPvs / ((float)data.mRays->size() + Limits::Small)) < 
-                        mTermMaxRayContribution));
+                 (data.GetAvgRayContribution() < mTermMaxRayContribution));
 }
 

trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellBsp.h

@@ -351 +351 @@
                 int mPvs;
                 
+                /** Returns average ray contribution.
+                */
+                float GetAvgRayContribution() const
+                {
+                        return (float)mPvs / ((float)mRays->size() + Limits::Small);
+                }
+
+
                 BspTraversalData():
                 mNode(NULL),

trunk/VUT/GtpVisibilityPreprocessor/src/VspKdTree.cpp

@@ -118 +118 @@
 }
 
-void VspKdTreeInterior::ReplaceChildLink(VspKdTreeNode *oldChild, VspKdTreeNode *newChild)
+void VspKdTreeInterior::ReplaceChildLink(VspKdTreeNode *oldChild, 
+                                                                                 VspKdTreeNode *newChild)
 {
         if (mBack == oldChild)
@@ -139 +140 @@
 void VspKdTreeInterior::Print(ostream &s) const 
 {
-        if (mAxis == 0)
-                s << "x ";
-        else
-                if (mAxis == 1)
-                        s << "y ";
-                else
-                        s << "z ";
+        switch (mAxis)
+        {
+        case 0:
+                s << "x "; break;
+        case 1:
+                s << "y "; break;
+        case 2:
+                s << "z "; break;
+        }
+
         s << mPosition << " ";
 
@@ -268 +272 @@
         environment->GetStringValue("VspKdTree.splitType", sname);
         string name(sname);
-        
-        if (name.compare("regular") == 0)
-                splitType = ESplitRegular;
-        else
-        {
-                if (name.compare("heuristic") == 0)
-                        splitType = ESplitHeuristic;
-                else 
-                {
-                        cerr << "Invalid VspKdTree split type " << name << endl;
-                        exit(1);
-                }
-        }
-
+                
         Debug << "======= vsp kd tree options ========" << endl;
         Debug << "max depth: "<< mTermMaxDepth << endl;
@@ -289 +280 @@
         Debug << "max cost ratio: "<< mTermMaxCostRatio << endl;
         Debug << "min size: "<<mTermMinSize << endl;
+
+        if (name.compare("regular") == 0)
+        {
+                Debug << "using regular split" << endl;
+                splitType = ESplitRegular;
+        }
+        else
+        {
+                if (name.compare("heuristic") == 0)
+                {
+                        Debug << "using heuristic split" << endl;
+                        splitType = ESplitHeuristic;
+                }
+                else 
+                {
+                        cerr << "Invalid VspKdTree split type " << name << endl;
+                        exit(1);
+                }
+        }
 
         mRoot = NULL;
@@ -415 +425 @@
         mRoot = new VspKdTreeLeaf(NULL, (int)rays.size());
 
-        // first construct a leaf that will get subdivide
+        // first construct a leaf that will get subdivided
         VspKdTreeLeaf *leaf = dynamic_cast<VspKdTreeLeaf *>(mRoot);
         
@@ -453 +463 @@
 
         mStat.Print(cout);
-        cout<<"#Total memory=" << GetMemUsage() << endl;
+        Debug << "#Total memory=" << GetMemUsage() << endl;
 }
 
@@ -463 +473 @@
 
         priority_queue<TraversalData> tStack;
-        //  stack<TraversalData> tStack;
+        //stack<TraversalData> tStack;
   
         tStack.push(tdata);
@@ -471 +481 @@
   
         int lastMem = 0;
+
         while (!tStack.empty()) 
         {
                 float mem = GetMemUsage();
                 
-                if ( lastMem/10 != ((int)mem)/10) 
+                if (lastMem / 10 != ((int)mem) / 10) 
                 {
                         cout << mem << " MB" << endl;
@@ -481 +492 @@
                 lastMem = (int)mem;
                 
-                if (mem > mMaxMemory) 
-                {
+                if (1 && mem > mMaxMemory) 
+                {
+                        Debug << "memory limit reached: " << mem << endl;
                         // count statistics on unprocessed leafs
                         while (!tStack.empty()) 
@@ -493 +505 @@
     
                 TraversalData data = tStack.top();
-                tStack.pop();
-    
+                tStack.pop();    
                 
                 VspKdTreeNode *node = SubdivideNode((VspKdTreeLeaf *) data.mNode,
@@ -503 +514 @@
                 if (!node->IsLeaf()) 
                 {
-                        VspKdTreeInterior *interior = (VspKdTreeInterior *) node;
+                        VspKdTreeInterior *interior = dynamic_cast<VspKdTreeInterior *>(node);
 
                         // push the children on the stack
@@ -542 +553 @@
                                                                                  pvsBack,
                                                                                  pvsFront);
-
         } 
-        else 
-        {
-                if (splitType == ESplitHeuristic)
+        else if (splitType == ESplitHeuristic)
+        {
                         costRatio = BestCostRatioHeuristic(leaf,
                                                                                            axis,        
@@ -554 +563 @@
                                                                                            pvsBack,
                                                                                            pvsFront);
-                else {
-                        cerr << "VspKdTree: Unknown split heuristics\n";
-                        exit(1);
-                }
-  }
+        }
+        else 
+        {
+                cerr << "VspKdTree: Unknown split heuristics\n";
+                exit(1);
+        }
 
         if (costRatio > mTermMaxCostRatio) 
         {
-                cout<<"Too big cost ratio " << costRatio << endl;
+                cout << "Too big cost ratio " << costRatio << endl;
                 return -1;
         }
 
 #if 1   
-        cout <<
+        Debug <<
                 "pvs=" << leaf->mPvsSize <<
                 " rays=" << (int)leaf->mRays.size() <<
@@ -880 +890 @@
                                                                                           const AxisAlignedBox3 &box) const
 {
-        return ((leaf->GetPvsSize() < mTermMinPvs) || (leaf->mRays.size() < mTermMinRays) ||
+        return ((leaf->GetPvsSize() < mTermMinPvs) || 
+                    //(leaf->mRays.size() < mTermMinRays) ||
                         // (leaf->GetAvgRayContribution() > termMaxRayContribution ) ||
-                         (leaf->mDepth >= mTermMaxDepth) || SqrMagnitude(box.Size()) <= mTermMinSize);
+                        (leaf->mDepth >= mTermMaxDepth) || 
+                        (SqrMagnitude(box.Size()) <= mTermMinSize));
 }
 
@@ -893 +905 @@
         if (TerminationCriteriaMet(leaf, box))
         {
-
-#if 1
-                if (leaf->mDepth >= mTermMaxDepth) 
-                {
-                        Debug << "Warning: max depth reached depth="<<(int)leaf->mDepth<<" rays=" << (int)leaf->mRays.size() << endl;
-                        Debug << "Bbox: " << GetBBox(leaf) << endl;
-                }
-#endif
+                if (1)
+                {
+                        if (leaf->mDepth >= mTermMaxDepth) 
+                        {
+                                Debug << "Warning: max depth reached depth=" << (int)leaf->mDepth<<" rays=" << (int)leaf->mRays.size() << endl;
+                                Debug << "Bbox: " << GetBBox(leaf) << endl;
+                        }
                 
+                        Debug << "depth: " << (int)leaf->mDepth << " pvs: " << leaf->GetPvsSize() << " rays: " << leaf->mRays.size() << endl;
+                }
                 return leaf;
         }
@@ -913 +926 @@
         
         // select subdivision axis
-        int axis = SelectPlane( leaf, box, position, raysBack, raysFront, pvsBack, pvsFront);
-
-        //      cout<<"rays back="<<raysBack<<" rays front="<<raysFront<<" pvs back="<<pvsBack<<" pvs front="<<
-        //              pvsFront<<endl;
+        int axis = SelectPlane(leaf, box, position, raysBack, raysFront, pvsBack, pvsFront);
+
+        Debug << "rays back=" << raysBack << " rays front=" << raysFront << " pvs back=" << pvsBack << " pvs front=" << pvsFront << endl;
 
         if (axis == -1) 
@@ -1040 +1052 @@
         tstack.push(mRoot);
 
-        while (!tstack.empty()) 
+        while (!tstack.empty())
         {
                 VspKdTreeNode *node = tstack.top();
@@ -1078 +1090 @@
 
 
-
-
 VspKdTreeNode *VspKdTree::SubdivideLeaf(VspKdTreeLeaf *leaf,
                                                                                 const float sizeThreshold)
@@ -1095 +1105 @@
                 (SqrMagnitude(leafBBox.Size()) > sizeThreshold) )
         {
-        // memory check and realese...
+        // memory check and release
                 if (GetMemUsage() > mMaxTotalMemory) 
                         ReleaseMemory(pass);
@@ -1109 +1119 @@
 
 
-void
-VspKdTree::UpdateRays(VssRayContainer &remove,
-                                          VssRayContainer &add)
+void VspKdTree::UpdateRays(VssRayContainer &remove,
+                                                   VssRayContainer &add)
 {
         VspKdTreeLeaf::NewMail();
@@ -1135 +1144 @@
 
         //  cout<<"all/inactive"<<remove.size()<<"/"<<inactive<<endl;
-  
-        for(VssRayContainer::const_iterator ri = add.begin(); ri != add.end(); ++ ri) 
+        for (VssRayContainer::const_iterator ri = add.begin(); ri != add.end(); ++ ri) 
         {
                 AddRay(*ri);
@@ -1256 +1264 @@
                         // find the ray in the leaf and swap it with the last ray
                         VspKdTreeLeaf *leaf = dynamic_cast<VspKdTreeLeaf *>(data.mNode);
+
                         leaf->AddRay(data.mRayData);
                         ++ mStat.addedRayRefs;
@@ -1416 +1425 @@
 
 #if DEBUG_COLLAPSE
-        cout<<"Total memory before="<<GetMemUsage()<<endl;
+        cout << "Total memory before=" << GetMemUsage() << endl;
 #endif
 
@@ -1537 +1546 @@
         }
         
-        cout << "sum=" << sumRayContribution << endl;
-        cout << "leaves=" << leaves << endl;
-        avgRayContribution = sumRayContribution/(float)leaves;
+        Debug << "sum=" << sumRayContribution << endl;
+        Debug << "leaves=" << leaves << endl;
+        avgRayContribution = sumRayContribution / (float)leaves;
 }
 
@@ -1556 +1565 @@
                 if (node->IsLeaf()) 
                 {
-                        VspKdTreeLeaf *leaf = (VspKdTreeLeaf *)node;
+                        VspKdTreeLeaf *leaf = dynamic_cast<VspKdTreeLeaf *>(node);
+
                         float c = leaf->GetAvgRayContribution();
                         int num = (int)(c*ratioPerLeaf + 0.5);

trunk/VUT/GtpVisibilityPreprocessor/src/VspKdTree.h

@@ -327 +327 @@
                 AxisAlignedBox3 mBox;
                 int mDepth;
-                float mPriority;
+                //float mPriority;
         
                 TraversalData() {}
 
                 TraversalData(VspKdTreeNode *n, const float p):
-                mNode(n), mPriority(p)
+                mNode(n)//, mPriority(p)
                 {}
 
@@ -338 +338 @@
                 mNode(n), mBox(b), mDepth(d) {}
     
-                // comparator for the 
-                struct less_priority : public binary_function<const TraversalData, const TraversalData, bool> 
+                // comparator for the priority queue
+                /*struct less_priority : public binary_function<const TraversalData, const TraversalData, bool> 
                 {
-                        bool operator()(const TraversalData a, const TraversalData b) 
-                        {
-                                return a.mPriority < b.mPriority;
-                        }
-                };
+                        bool operator()(const TraversalData a, const TraversalData b) {                 
+                        return a.mPriority < b.mPriority;               }       };*/
 
                 //    ~TraversalData() {}
@@ -375 +372 @@
 #if 0
                         return
-                                leafa->GetPvsSize() / (float)(leafa->rays.size() + 1)
+                                leafa->GetPvsSize() / (float)(leafa->rays.size() + Limits::Small())
                                 >
-                                leafb->GetPvsSize() / (float)(leafb->rays.size() + 1);
+                                leafb->GetPvsSize() / (float)(leafb->rays.size() + Limits::Small());
 #endif
 #if 0