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

Timestamp:

08/22/06 22:48:02 (18 years ago)

Author:

mattausch

Message:

 

File:

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

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

@@ -31 +31 @@
 class KdInterior;
 class KdLeaf;
-class OspTree;
+class HierarchyManager;
 class KdIntersectable;
 class KdTree;
@@ -759 +759 @@
                                                          float maxBand);
 
-        /** Evaluate pvs size associated with the rays.
+        /** Evaluate pvs size as induced by the samples.
         */
         int EvalPvsSize(const RayInfoContainer &rays) const;
@@ -778 +778 @@
                                                                   float &position);
 
-        /** Evaluates the influence on the pvs of the visibility event ve.
+        /** Evaluates the contribution to left and right pvs at a visibility event ve.
                 @param ve the visibility event
                 @param pvsLeft updates the left pvs
                 @param rightPvs updates the right pvs
         */
-        void EvalPvsIncr(const SortableEntry &ve,
-                                          int &pvsLeft,
-                                          int &pvsRight) const;
-
-        void RemoveContriFromPvs(KdLeaf *leaf, int &pvs) const;
-        void AddContriToPvs(KdLeaf *leaf, int &pvs) const;
+        void EvalHeuristicsContribution(
+                const SortableEntry &ve, 
+                int &pvsLeft, 
+                int &pvsRight) const;
+
+        /** Evaluates contribution of the ray to the left and right pvs.
+        */
+        int EvalMinEventContribution(
+                const VssRay &ray, const bool isTermination) const;
+
+        int EvalMaxEventContribution(
+                const VssRay &ray, const bool isTermination) const;
+
+        int EvalMinEventContribution(KdLeaf *leaf) const;
+        int EvalMaxEventContribution(KdLeaf *leaf) const;
 
         /** Prepares objects for the heuristics.
@@ -794 +803 @@
         */
         int PrepareHeuristics(const RayInfoContainer &rays);
-
+        int PrepareHeuristics(const VssRay &ray, const bool isTermination);
         int PrepareHeuristics(KdLeaf *leaf);
 
@@ -859 +868 @@
                                                  int &contributingSamples);
 
-        bool AddKdLeafToPvs(KdLeaf *leaf, 
-                                                ViewCell *vc, 
-                                                const float pvs, 
-                                                float &contribution);
-
         /** Propagates valid flag up the tree.
         */
@@ -898 +902 @@
         void EvalSubdivisionStats(const SubdivisionCandidate &tData);
 
-        SubdivisionCandidate *PrepareConstruction(const VssRayContainer &sampleRays,
-                                                           AxisAlignedBox3 *forcedViewSpace,
-                                                           RayInfoContainer &rays);
+        SubdivisionCandidate *PrepareConstruction(
+                const VssRayContainer &sampleRays,
+                AxisAlignedBox3 *forcedViewSpace,
+                RayInfoContainer &rays);
+
+        /** Add pvs contribution of this ray.
+        */
+        int EvalPvsContribution(const VssRay &ray, const bool isTermination) const;
 
 protected:
-
 
         /// pointer to the hierarchy of view cells
         ViewCellsTree *mViewCellsTree;
 
-        OspTree *mOspTree;
-
-        bool mUseKdPvsForHeuristics;
-        bool mStoreKdPvs;
-
+        HierarchyManager *mHierarchyManager;
+        //OspTree *mOspTree;
+        //bool mUseKdPvsForHeuristics;
+        
         ViewCellsManager *mViewCellsManager;