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

Timestamp:

08/09/06 10:49:20 (18 years ago)

Author:

mattausch

Message:

changed osp partition to something taking mult references into account

File:

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

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

@@ -1587 +1587 @@
         int FilterRays(KdLeaf *leaf, const RayInfoContainer &rays, RayInfoContainer &filteredRays);
 
-        int SplitViewCells(
-                const AxisAlignedPlane &candidatePlane,
-                const RayInfoContainer &rays,
-                KdLeaf *leaf,
-                ViewCellContainer &frontViewCells,
-                ViewCellContainer &backViewCells,
-                ViewCellContainer &frontAndBackViewCells) const;
-
         /** Adds the object to the pvs of the front and back leaf with a given classification.
 
@@ -1641 +1633 @@
         /** Evaluate the contributions of view cell volume of the left and the right view cell.
         */
-        void EvalVolumeContribution(const VssRay &ray, 
-                                                                        float &volLeft, 
-                                                                        float &volRight);
-
+        void EvalRayContribution(KdLeaf *leaf,
+                                                                         const VssRay &ray, 
+                                                                         float &renderCost);
+void EvalViewCellContribution(KdLeaf *leaf, 
+                                                                           ViewCell *viewCell,
+                                                                           float &renderCost);
         /** Evaluates the influence on the pvs of the event.
                 @param ve the visibility event
@@ -1652 +1646 @@
         void EvalHeuristicsContribution(KdLeaf *leaf,
                 const SortableEntry &ci,
-                float &volLeft,
-                float &volRight,
-                int &pvsLeft,
-                int &pvsRight);
+                float &renderCost,
+                ViewCellContainer &touchedViewCells);
 
         /** Prepares objects for the cost heuristics.
                 @returns pvs size of the node
         */
-        float PrepareHeuristics(const OspTraversalData &tData, int &numViewCells);
+        float PrepareHeuristics(const OspTraversalData &tData, ViewCellContainer &touchedViewCells);
 
         /** Prepares heuristics for a particular ray.
         */
-        float PrepareHeuristics(const VssRay &ray, int &numViewCells);
+        void PrepareHeuristics(const VssRay &ray, ViewCellContainer &touchedViewCells);
 
         /** Prepares construction for vsp and osp trees.
@@ -1726 +1718 @@
 
         int UpdateViewCellsPvs(KdLeaf *leaf, const RayInfoContainer &rays) const;
-int OspTree::CheckViewCellsPvs(KdLeaf *leaf, 
+int CheckViewCellsPvs(KdLeaf *leaf, 
                                                            const RayInfoContainer &rays) const;
         bool AddViewCellToObjectPvs(
@@ -1741 +1733 @@
                 RayInfoContainer &backRays) const;
 
+        void CollectTouchedViewCells(
+                const RayInfoContainer &rays, 
+                ViewCellContainer &touchedViewCells) const;
+
+        void AddObjectContribution(KdLeaf *leaf,
+                                                  Intersectable * obj,
+                                                  ViewCellContainer &touchedViewCells,
+                                                  float &renderCost);
+        void SubtractObjectContribution(KdLeaf *leaf,
+                                                  Intersectable * obj,
+                                                  ViewCellContainer &touchedViewCells,
+                                                  float &renderCost);
 protected: