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

Timestamp:

07/06/06 08:55:06 (18 years ago)

Author:

mattausch

Message:

 

File:

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

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

@@ -871 +871 @@
                 The split candidates are generated on possible visibility
                 events (i.e., where ray segments intersect the ray boundaries).
-                The sorted candidates are needed to compute the SAH.
+                The sorted candidates are needed to compute the heuristics.
 
                 @param polys the input for choosing split candidates
@@ -882 +882 @@
                                                          float maxBand);
 
-        /** Computes pvs increase with respect to the previous pvs for SAH.
+        /** Computes pvs increase with respect to the previous pvs for heuristics.
         */
         int GetPvsIncr(Intersectable *object, const KdPvsMap &activeNodes);
@@ -910 +910 @@
         void AddContriToPvs(KdLeaf *leaf, int &pvs) const;
 
-        /** Prepares objects for SAH.
+        /** Prepares objects for the heuristics.
                 @returns pvs size of the ray container
         */
@@ -1438 +1438 @@
                                           float &pBack);
 
-        /** Sorts split candidates for surface area heuristics for axis aligned splits.
-                @param polys the input for choosing split candidates
+        /** Sorts split candidates for cost heuristics using axis aligned splits.
+                @param node the current node
                 @param axis the current split axis
-                @param splitCandidates returns sorted list of split candidates
-        */
-        void SortSplitCandidates(const RayInfoContainer &rays, 
-                                                         const int axis, 
-                                                         float minBand, 
-                                                         float maxBand);
+        */
+        void SortSplitCandidates(KdLeaf *node, const int axis);
 
         /** Computes best cost for axis aligned planes.
         */
-/*      float EvalLocalCostHeuristics(const RayInfoContainer &rays,
-                                                                  const AxisAlignedBox3 &box,
-                                                                  const int pvsSize,
-                                                                  const int axis,
-                                                                  float &position);
-*/
-        float EvalLocalCostHeuristics(BspLeaf *node,
+        float EvalLocalCostHeuristics(KdLeaf *node,
                 const AxisAlignedBox3 &box,
                 const int axis,
@@ -1504 +1494 @@
         inline bool GlobalTerminationCriteriaMet(const OspTraversalData &data) const;
 
+        float SelectSplitPlane(const VspTraversalData &tData,
+                                                                AxisAlignedPlane &plane,
+                                                                float &pFront,
+                                                                float &pBack);
         /** Adds ray sample contributions to the PVS.
                 @param sampleContributions the number contributions of the samples
@@ -1543 +1537 @@
         void AddContriToPvs(Intersectable *object, int &pvs) const;
 
-        /** Prepares objects for SAH.
-                @returns pvs size of the ray container
-        */
-        int PrepareHeuristics(const RayInfoContainer &rays);
+        /** Prepares objects for the cost heuristics.
+                @returns pvs size of the node
+        */
+        int PrepareHeuristics(const ObjectContainer &objects);
 
         int PrepareHeuristics(Intersectable *object);
@@ -1631 +1625 @@
         int mCreatedViewCells;
 
+        float mSplitBorder;
+
+
 private: