Changeset 587 for trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellBsp.h

Timestamp:

02/04/06 12:46:14 (18 years ago)

Author:

mattausch

Message:

updated vspkdtree for regular sudbivision

File:

• trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellBsp.h (modified) (14 diffs)

trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellBsp.h

@@ -19 +19 @@
 class Ray;
 class ViewCellsStatistics;
+class ViewCellsManager;
+
+
 
 class BspNodeGeometry
@@ -374 +377 @@
                 /// rays piercing this node
                 BoundedRayContainer *mRays;
-                /// area of current node
-                float mArea;
+                /// probability of current node
+                float mProbability;
                 /// geometry of node as induced by planes
                 BspNodeGeometry *mGeometry;
@@ -397 +400 @@
                 mRays(NULL),
                 mPvs(0),
-                mArea(0.0),
+                mProbability(0.0),
                 mGeometry(NULL)
                 {}
@@ -407 +410 @@
                                                  BoundedRayContainer *rays,
                                                  int pvs,
-                                                 float area,
+                                                 float p,
                                                  BspNodeGeometry *cell): 
                 mNode(node), 
@@ -415 +418 @@
                 mRays(rays),
                 mPvs(pvs),
-                mArea(area),
+                mProbability(p),
                 mGeometry(cell)
                 {}
+
+
+                float GetCost() const
+                {
+#if 0
+                        return mPvs * mProbability;
+#endif
+#if 1
+                        return mProbability;
+#endif
+#if 0
+                        return (float)mPvs;
+#endif
+#if 0
+                        return (float)mRays->size();
+#endif
+                }
+                
+                friend bool operator<(const BspTraversalData &a, const BspTraversalData &b)
+                {
+                        return a.GetCost() < b.GetCost();
+                }
     };
         
-        typedef std::stack<BspTraversalData> BspTraversalStack;
-        
+        //typedef std::stack<BspTraversalData> BspTraversalStack;
+        typedef std::priority_queue<BspTraversalData> BspTraversalStack;
+
         /** Default constructor reading the environment file and 
                 creating an empty tree.
@@ -451 +477 @@
 
         void Construct(const ObjectContainer &objects,
-                                   const RayContainer &sampleRays);
+                                   const RayContainer &sampleRays,
+                                   AxisAlignedBox3 *forcedBoundingBox);
 
         /** Constructs the tree from a given set of rays.
@@ -458 +485 @@
                 created in the leafs and stored in the conatainer
         */
-        void Construct(const RayContainer &sampleRays);
+        void Construct(const RayContainer &sampleRays,
+                                   AxisAlignedBox3 *forcedBoundingBox);
 
         /** Returns list of BSP leaves.
@@ -513 +541 @@
         /** Construct geometry of view cell.
         */
-        void ConstructGeometry(BspViewCell *vc, BspNodeGeometry &geom) const;
+        void ConstructGeometry(ViewCell *vc, BspNodeGeometry &geom) const;
+
+                        
+        /** Sets pointer to view cells manager.
+        */
+        void SetViewCellsManager(ViewCellsManager *vcm);
 
         /** Returns random leaf of BSP tree.
@@ -533 +566 @@
         float GetEpsilon() const;
 
+        int CollectMergeCandidates(const vector<BspLeaf *> leaves,
+                                                           vector<MergeCandidate> &candidates);
+
+        int CollectMergeCandidates(const VssRayContainer &rays,
+                                                   vector<MergeCandidate> &candidates);
 protected:
 
@@ -608 +646 @@
                                                  const BoundedRayContainer &rays,
                                                  const int pvs,
-                                                 const float area,
+                                                 const float probability,
                                                  const BspNodeGeometry &cell) const;
 
@@ -681 +719 @@
         int AddToPolygonSoup(const ObjectContainer &objects, 
                                                  PolygonContainer &polys, 
-                                                 int maxObjects = 0);
+                                                 int maxObjects = 0,
+                                                 bool addToBbox = true);
 
         /** Extracts the meshes of the view cells and and adds them to polygons.
@@ -809 +848 @@
                                   int &sampleContributions,     
                                   int &contributingSamples);
+
+
+
 
         /// Pointer to the root of the tree.
@@ -847 +889 @@
         int mTermMaxDepth;
         /// mininum area
-        float mTermMinArea;
+        float mTermMinProbability;
         /// mininum PVS
         int mTermMinPvs;
@@ -893 +935 @@
         bool mUseAreaForPvs;
 
+        int mMaxViewCells;
+
         /// epsilon where two points are still considered equal
         float mEpsilon;
+
+        ViewCellsManager *mViewCellsManager;
+
 
 private: