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

Timestamp:

07/17/06 18:17:09 (18 years ago)

Author:

mattausch

Message:

 

File:

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

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

@@ -749 +749 @@
         void AddViewCellReferences(ViewCell *vc) const;
 
+        /** Returns view cells of this ray, either taking precomputed cells
+                or by recomputation.
+        */
+        void GetViewCells(const VssRay &ray, ViewCellContainer &viewCells);
+
 
         /// pointer to the hierarchy of view cells
@@ -900 +905 @@
         /** Computes best cost for axis aligned planes.
         */
-        float EvalLocalCostHeuristics(const VspTraversalData &data,
+        float EvalLocalCostHeuristics(const VspTraversalData &tData,
                                                                   const AxisAlignedBox3 &box,
                                                                   const int axis,
@@ -1365 +1370 @@
         struct SortableEntry
         {
+                /** There is a 3th "event" for rays which intersect a
+                        box in the middle. These "events" don't induce a change in
+                        pvs size, but may induce a change in view cell volume.
+                */
                 enum EType 
                 {
-                        ERayMin,
-                        ERayMax
+                        BOX_MIN,
+                        BOX_MAX,
+                        BOX_INTERSECT
                 };
 
@@ -1374 +1384 @@
                 //int mPvs;
                 float mPos;
-
+                VssRay *mRay;
+                
                 Intersectable *mObject;
 
                 SortableEntry() {}
 
-                SortableEntry(const int type, 
+                SortableEntry(const int type,
                         //const float pvs, 
                         const float pos,
-                        Intersectable *obj):
+                        Intersectable *obj,
+                        VssRay *ray):
                 mType(type), 
                 //mPvs(pvs), 
                 mPos(pos), 
-                mObject(obj) 
+                mObject(obj),
+                mRay(ray)
                 {}
 
@@ -1417 +1430 @@
         float EvalRenderCostDecrease(const AxisAlignedPlane &candidatePlane,
                                                                  const OspTraversalData &data) const;
-
-        float EvalViewCellPvsIncr(Intersectable *object) const;
 
 
@@ -1490 +1501 @@
         /** Computes best cost for axis aligned planes.
         */
-        float EvalLocalCostHeuristics(const OspTraversalData &data,
+        float EvalLocalCostHeuristics(const OspTraversalData &tData,
                 const AxisAlignedBox3 &box,
                 const int axis,
@@ -1565 +1576 @@
         float GetMemUsage() const;
 
-        /** Evaluates the influence on the pvs of the visibility event ve.
+        /** Evaluates the influence on the pvs of the event.
                 @param ve the visibility event
                 @param pvsLeft updates the left pvs
                 @param rightPvs updates the right pvs
         */
-        void EvalViewCellVolumeIncr(const SortableEntry &ve,
+        void EvalHeuristicsContribution(const SortableEntry &ci,
                 float &volLeft,
-                float &volRight) const;
-
-        void RemoveContriFromPvs(Intersectable *object, float &pvs) const;
-        void AddContriToPvs(Intersectable *object, float &pvs) const;
+                float &volRight,
+                int &pvsLeft,
+                int &pvsRight);
+
+        /** Evaluate the contributions of view cell volume of the left and the right view cell.
+        */
+        void EvalVolumeContribution(const VssRay &ray, float &volLeft, float &volRight);
 
         /** Prepares objects for the cost heuristics.
                 @returns pvs size of the node
         */
-        float PrepareHeuristics(const ObjectContainer &objects);
-
-        /** Evaluates contribution for one object 
-                to heuristics preparation.
-        */
-        float PrepareHeuristics(Intersectable *object);
+        float PrepareHeuristics(const OspTraversalData &tData);
+
+        /** Prepares heuristics for a particular ray.
+        */
+        float PrepareHeuristics(const VssRay &ray);
 
         /** Prepares construction for vsp and osp trees.
@@ -1605 +1618 @@
 
 protected:
+
+        VspTree *mVspTree;
 
         /// The view cells manager