Changeset 1181 for GTP/trunk/Lib/Vis/Preprocessing/src/VspOspTree.h

Timestamp:

08/03/06 15:38:53 (18 years ago)

Author:

mattausch

Message:

 

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/VspOspTree.h (modified) (6 diffs)

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

@@ -918 +918 @@
                                                          float maxBand);
 
+        /** Evaluate pvs size associated with the rays.
+        */
+        int EvalPvsSize(const RayInfoContainer &rays) const;
+
         /** Computes pvs increase with respect to the previous pvs for heuristics.
         */
@@ -991 +995 @@
                 float &totalPvs) const;
 
-
-        /** Computes PVS size induced by the rays.
-        */
-        int ComputePvsSize(const RayInfoContainer &rays) const;
-        
         /** Collects pvs from rays.
         */
@@ -1056 +1055 @@
         /** Rays will be clipped to the bounding box.
         */
-        void PreprocessRays(const VssRayContainer &sampleRays,
-                RayInfoContainer &rays);
+        void PreprocessRays(const VssRayContainer &sampleRays, RayInfoContainer &rays);
 
         /** Evaluate subdivision statistics.
@@ -1406 +1404 @@
 
 
-        /** Compute "pvs size" of this object container
-                @note not really pvs size just weighted sum of object taking their
-                appearances in pvss into account
-        */
-        int ComputePvsSize(const ObjectContainer &objects) const;
-
         /** Returns kd leaf the point pt lies in, starting from root.
         */
@@ -1417 +1409 @@
 
 
-        /// pointer to the hierarchy of view cells
-        ViewCellsTree *mViewCellsTree;
+        ViewCellsTree *GetViewCellsTree() const { return mViewCellsTree; }
+
+        void SetViewCellsTree(ViewCellsTree *vt) { mViewCellsTree = vt; }
 
 
@@ -1704 +1697 @@
                 float &volRight);
 
-        float EvalViewCellsVolume(const RayInfoContainer &rays) const;
+        float EvalViewCellsVolume(KdLeaf *leaf, const RayInfoContainer &rays) const;
 
 
 protected:
+
+        /// pointer to the hierarchy of view cells
+        ViewCellsTree *mViewCellsTree;
 
         VspTree *mVspTree;