Changeset 1291 for GTP/trunk/Lib/Vis/Preprocessing/src/VspTree.h

Timestamp:

08/28/06 18:42:33 (18 years ago)

Author:

mattausch

Message:

 

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/VspTree.h (modified) (10 diffs)

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

@@ -548 +548 @@
     int CastLineSegment(const Vector3 &origin,
                                                 const Vector3 &termination,
-                                                ViewCellContainer &viewcells);
+                                                ViewCellContainer &viewcells,
+                                                const bool useMailboxing = true);
 
                 
@@ -618 +619 @@
         void GetViewCells(const VssRay &ray, ViewCellContainer &viewCells);
 
-
+        /** Returns view cells tree.
+        */
         ViewCellsTree *GetViewCellsTree() const { return mViewCellsTree; }
 
+        /** Sets the view cells tree.
+        */
         void SetViewCellsTree(ViewCellsTree *vt) { mViewCellsTree = vt; }
 
@@ -763 +767 @@
         int EvalPvsSize(const RayInfoContainer &rays) const;
 
-        /** Computes pvs increase with respect to the previous pvs for heuristics.
-        */
-        int GetPvsIncr(Intersectable *object, const KdPvsMap &activeNodes);
-
-        /** Returns absolute pvs contribution of this object.
-        */
-        int GetPvsContribution(Intersectable *object) const;
-
         /** Computes best cost for axis aligned planes.
         */
@@ -778 +774 @@
                                                                   float &position);
 
+
+
+        //////////////////////////////////////////
+        // Helper function for computing heuristics
+
         /** Evaluates the contribution to left and right pvs at a visibility event ve.
                 @param ve the visibility event
@@ -783 +784 @@
                 @param rightPvs updates the right pvs
         */
-        void EvalHeuristicsContribution(
-                const SortableEntry &ve, 
-                int &pvsLeft, 
-                int &pvsRight) const;
-
-        /** Evaluates contribution of the ray to the left and right pvs.
+        void EvalHeuristics(const SortableEntry &ve, int &pvsLeft, int &pvsRight) const;
+
+        /** Evaluates contribution of min event to pvs
         */
         int EvalMinEventContribution(
                 const VssRay &ray, const bool isTermination) const;
 
+        /** Evaluates contribution of max event to pvs
+        */
         int EvalMaxEventContribution(
                 const VssRay &ray, const bool isTermination) const;
 
+        /** Evaluates contribution of kd leaf when encountering a min event
+        */
         int EvalMinEventContribution(KdLeaf *leaf) const;
+        /**  Evaluates contribution of kd leaf when encountering a max event
+        */
         int EvalMaxEventContribution(KdLeaf *leaf) const;
 
         /** Prepares objects for the heuristics.
-                @returns pvs size of the ray container
+                @returns pvs size as seen by the rays.
         */
         int PrepareHeuristics(const RayInfoContainer &rays);
+        
+        /** Prepare a single ray for heuristics.
+        */
         int PrepareHeuristics(const VssRay &ray, const bool isTermination);
+        /** Prepare a single kd leaf for heuristics.
+        */
         int PrepareHeuristics(KdLeaf *leaf);
+
+        /////////////////////////////////////////////////////////////////////////////
+
 
         /** Subdivides the rays into front and back rays according to the split plane.
@@ -831 +843 @@
         
         */
-        void UpdateObjPvsContri(
+        void UpdateContributionsToPvs(
+                const VssRay &ray,
+                const bool isTermination,
+                const int cf,
+                float &frontPvs,
+                float &backPvs,
+                float &totalPvs) const;
+
+        /** Evaluates the contribution for objects.
+        */
+        void UpdateContributionsToPvs(
                 Intersectable *obj, 
                 const int cf, 
@@ -838 +860 @@
                 float &totalPvs) const;
 
-        void UpdateBvhLeafPvsContri(
+        /** Evaluates the contribution for bounding volume leaves.
+        */
+        void UpdateContributionsToPvs(
                 BvhLeaf *leaf,
                 const int cf,
@@ -845 +869 @@
                 float &totalPvs) const;
 
-        
-        /** See UpdateObjPvsContri. 
-        */
-        void UpdateKdLeafPvsContri(KdLeaf *leaf,
+        /** Evaluates the contribution for kd leaves.
+        */
+        void UpdateContributionsToPvs(
+                KdLeaf *leaf,
                 const int cf,
                 float &frontPvs,
@@ -854 +878 @@
                 float &totalPvs) const;
 
-        /** Collects pvs from rays.
-        */
-        void CollectPvs(const RayInfoContainer &rays,
-                                        ObjectContainer &objects) const;
-
         /** Returns true if tree can be terminated.
         */
@@ -916 +935 @@
                 RayInfoContainer &rays);
 
-        /** Add pvs contribution of this ray.
-        */
-        int EvalPvsContribution(const VssRay &ray, const bool isTermination) const;
+        /** Evaluates pvs contribution of this ray.
+        */
+        int EvalContributionToPvs(const VssRay &ray, const bool isTermination) const;
+
+        /** Evaluates pvs contribution of a kd node.
+        */
+        int EvalContributionToPvs(KdLeaf *leaf) const;
+
 
 protected: