Changeset 489 for trunk/VUT

Timestamp:

01/02/06 13:42:43 (19 years ago)

Author:

mattausch

Message:

valid view point regions working now for bsp view cells (crit: maxpvs)

Location:

trunk/VUT/GtpVisibilityPreprocessor

Files:

• scripts/default.env (modified) (4 diffs)
• src/Environment.cpp (modified) (1 diff)
• src/ViewCellBsp.cpp (modified) (3 diffs)
• src/ViewCellsManager.cpp (modified) (6 diffs)
• src/ViewCellsManager.h (modified) (1 diff)
• src/VspBspTree.cpp (modified) (14 diffs)
• src/VspBspTree.h (modified) (3 diffs)
• src/VssPreprocessor.cpp (modified) (1 diff)

trunk/VUT/GtpVisibilityPreprocessor/scripts/default.env

@@ -155 +155 @@
         height 5.0
         maxViewCells 100
-        maxPvs 70
+        maxPvs 130
         
         
@@ -168 +168 @@
         Visualization {
                 # how much samples are be used for visualization
-                samples 90000
+                samples 1000
                 #colorCode PVS
                 #colorCode MergedLeaves
@@ -219 +219 @@
         # maximal cost for merging a view cell
         PostProcess {
-<<<<<<< .mine
                 maxCostRatio 0.005
                 minViewCells 200
-
                 maxPvsSize   50000
         }
@@ -289 +287 @@
                 maxCostRatio 0.1
                 minViewCells 200
-
                 maxPvsSize   500
                 useRaysForMerge false

trunk/VUT/GtpVisibilityPreprocessor/src/Environment.cpp

@@ -1680 +1680 @@
         RegisterOption("VspBspTree.Termination.maxViewCells",
                 optInt,
-                "-vsp_bsp_term_axis_aligned_max_view_cells=",
+                "-vsp_bsp_term_max_view_cells=",
                 "1000");
 

trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellBsp.cpp

@@ -39 +39 @@
 int BspTree::sFrontAndBackId = 0;
 
+
 /****************************************************************/
 /*                  class BspNode implementation                */
 /****************************************************************/
 
+
 BspNode::BspNode(): 
-mParent(NULL)
+mParent(NULL), mTreeValid(true)
 {}
 
 BspNode::BspNode(BspInterior *parent): 
-mParent(parent)
+mParent(parent), mTreeValid(true)
 {}
 
@@ -210 +212 @@
 mGenerateViewCells(true)
 {
-        
-
         Randomize(); // initialise random generator for heuristics
 
@@ -428 +428 @@
         DEL_PTR(mRoot);
 
-        // root cell not used
+        // HACK: view cells not generated => root cell not used
         if (mGenerateViewCells)
                 DEL_PTR(mRootCell);

trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellsManager.cpp

@@ -45 +45 @@
         environment->GetBoolValue("ViewCells.Visualization.exportGeometry", mExportGeometry);
 
+        //Debug << "export rays: " << mExportRays << endl;
+        //Debug << "export geometry: " << mExportGeometry << endl;
         char buf[50];
         
@@ -1732 +1734 @@
 }
 
+
 // matt TODO: remove
 int VspBspViewCellsManager::MergeViewCells(const VssRayContainer &rays) const
@@ -1875 +1878 @@
     Debug << ss << endl;
 
-        cout << "Refining the view cells ... ";
+        cout << "Refining the merged view cells ... ";
         startTime = GetTime();
 
@@ -1922 +1925 @@
                         if (mExportGeometry)
                                 exporter->ExportGeometry(objects);
+
+                        // export rays
+                        /*if (mExportRays)
+                        {
+                                exporter->SetWireframe();
+                                exporter->ExportRays(visRays, RgbColor(1, 1, 0));
+                                exporter->SetFilled();
+                        }*/
                         ExportViewCells(exporter);
                         delete exporter;
@@ -1931 +1942 @@
         //-- visualization of the BSP splits
         bool exportSplits = false;
-        environment->GetBoolValue("BspTree.Visualization.exportSplits", exportSplits);
-        
+        environment->GetBoolValue("VspBspTree.Visualization.exportSplits", exportSplits);
+        Debug << "export splits: " << exportSplits << endl;
+
         if (exportSplits)
         {
@@ -1950 +1962 @@
                 return ViewCellsManager::GetViewPoint(viewPoint);
 
+        // TODO: set reasonable limit
         const int limit = 10;
-
+cout << "===" << endl;
         for (int i = 0; i < limit; ++ i)
         {
+                cout << i << " " << endl;
                 viewPoint = mSceneBox.GetRandomPoint();
                 if (mVspBspTree->ViewPointValid(viewPoint))

trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellsManager.h

@@ -258 +258 @@
         virtual void ExportVcGeometry(Exporter *exporter, ViewCell *vc) const = 0;
 
-        /// the view cell corresponding to unbounded space
-        //ViewCell *mUnbounded;
+        /// the view cell corresponding to space ouside the valid view space
+        //ViewCell *mOutOfBoundsCell;
 
         /// Renders the view cells.

trunk/VUT/GtpVisibilityPreprocessor/src/VspBspTree.cpp

@@ -45 +45 @@
 mViewCellsManager(NULL),
 mStoreRays(false),
-mOnlyDrivingAxis(false)
+mOnlyDrivingAxis(false),
+mOutOfBoundsCell(NULL)
 {
         bool randomize = false;
@@ -128 +129 @@
         }
 
+
         mSplitCandidates = new vector<SortableEntry>;
 
         Debug << endl;
+}
+
+
+BspViewCell *VspBspTree::GetOrCreateOutOfBoundsCell()
+{
+        if (!mOutOfBoundsCell)
+                mOutOfBoundsCell = new BspViewCell();
+
+        return mOutOfBoundsCell;
 }
 
@@ -401 +412 @@
         {
                 BspLeaf *leaf = dynamic_cast<BspLeaf *>(newNode);
+                BspViewCell *viewCell;
 
                 if (!CheckValid(tData))
@@ -406 +418 @@
                         leaf->SetTreeValid(false);
                         PropagateUpValidity(leaf);
-                }
-
-                // create new view cell for this leaf
-                BspViewCell *viewCell = new BspViewCell();
+                        // view cell for invalid view space
+                        viewCell = GetOrCreateOutOfBoundsCell();
+                }
+                else
+                {
+                        // create new view cell for this leaf
+                        viewCell = new BspViewCell();
+                }
+                
                 leaf->SetViewCell(viewCell);
         
@@ -1206 +1223 @@
         {
                 BspNode *node = nodeStack.top();
-
                 nodeStack.pop();
+                
+                // this subtree is not valid view space
+                if (!node->TreeValid())
+                        continue;
 
                 if (node->IsLeaf())
@@ -1224 +1244 @@
 }
 
+
 AxisAlignedBox3 VspBspTree::GetBoundingBox() const
 {
@@ -1229 +1250 @@
 }
 
+
 BspNode *VspBspTree::GetRoot() const
 {
         return mRoot;
 }
+
+
+BspViewCell *VspBspTree::GetOutOfBoundsCell() const
+{
+        return mOutOfBoundsCell;
+}
+
 
 void VspBspTree::EvaluateLeafStats(const VspBspTraversalData &data)
@@ -1399 +1428 @@
                 BspNode *node = nodeStack.top();
                 nodeStack.pop();
+                // this subtree is not valid view space
+                if (!node->TreeValid())
+                        continue;
 
                 if (node->IsLeaf())
@@ -1635 +1667 @@
                 nodeStack.pop();
 
+                // view space not valid
+                if (!node->TreeValid())
+                        continue;
+
                 if (node->IsLeaf())
                 {
@@ -1687 +1723 @@
         return (int)neighbors.size();
 }
+
 
 BspLeaf *VspBspTree::GetRandomLeaf(const Plane3 &halfspace)
@@ -2002 +2039 @@
 
                         BspLeaf *leaf = new BspLeaf(interior->GetParent(), vc);
+                        leaf->SetTreeValid(frontLeaf->TreeValid());
 
                         // replace a link from node's parent
@@ -2170 +2208 @@
           
                 iit = ray->intersections.begin();
-                BspLeaf *prevLeaf = (*(iit ++)).mLeaf;
+                BspLeaf *leaf = (*(iit ++)).mLeaf;
                 
                 // create leaf pvs (needed for post processing)
-                if (!prevLeaf->mPvs)
-                {
-                        prevLeaf->mPvs = 
-                                new ObjectPvs(prevLeaf->GetViewCell()->GetPvs());
+                if (!leaf->mPvs)
+                {
+                        leaf->mPvs = 
+                                new ObjectPvs(leaf->GetViewCell()->GetPvs());
 
                         BspMergeCandidate::sOverallCost += 
-                                prevLeaf->mArea * prevLeaf->mPvs->GetSize();
+                                leaf->mArea * leaf->mPvs->GetSize();
                         
                         ++ leaves;
@@ -2185 +2223 @@
                 
                 // traverse intersections 
-                // consecutive leaves are neighbors => 
-                // add them to queue
+                // consecutive leaves are neighbors => add them to queue
                 for (; iit != ray->intersections.end(); ++ iit)
                 {
-            BspLeaf *leaf = (*iit).mLeaf;
-            
+                        // next pair
+                        BspLeaf *prevLeaf = leaf;
+            leaf = (*iit).mLeaf;
+
+                        // view space does not correspond to valid space
+                        if (!leaf->TreeValid() || !prevLeaf->TreeValid())
+                                continue;
+
+            // create leaf pvs (needed for post processing)
                         if (!leaf->mPvs)
                         {
@@ -2229 +2273 @@
                                 mMergeQueue.push(BspMergeCandidate(leaf, prevLeaf));
                         }
-
-                        prevLeaf = leaf;
         }
         }

trunk/VUT/GtpVisibilityPreprocessor/src/VspBspTree.h

@@ -278 +278 @@
         bool ViewPointValid(const Vector3 &viewPoint) const;
 
+        /** Returns the view cell corresponding to 
+                the space outside the valid view space.
+        */
+        BspViewCell *GetOutOfBoundsCell() const;
 
 protected:
@@ -550 +554 @@
         */
         void PropagateUpValidity(BspNode *node);
+
+        /** Creates or returns view cell corresponding to 
+                the space outside the valid view space.
+        */
+        BspViewCell *GetOrCreateOutOfBoundsCell();
 
         /// Pointer to the root of the tree
@@ -644 +653 @@
         int mMaxPvs;
 
+        /// View cell corresponding to the space outside the valid view space
+        BspViewCell *mOutOfBoundsCell;
 
 private:

trunk/VUT/GtpVisibilityPreprocessor/src/VssPreprocessor.cpp

@@ -12 +12 @@
 #include "RenderSimulator.h"
 
-bool useViewSpaceBox = true;//true;
+bool useViewSpaceBox = true;
 bool use2dSampling = false;
-bool useViewspacePlane = true;//true;
+bool useViewspacePlane = true;
 
 VssPreprocessor::VssPreprocessor():