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

Timestamp:

03/12/07 18:30:52 (17 years ago)

Author:

mattausch

Message:

worked on optimization. warning: not tested yet

File:

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

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

@@ -801 +801 @@
         */
         float EvalRenderCostDecrease(VspSubdivisionCandidate &splitData, 
-                                                                 float &normalizedOldRenderCost) const;
+                                                                 float &normalizedOldRenderCost,
+                                                                 const float totalPvs,
+                                                                 const float pvsFront,
+                                                                 const float pvsBack) const;
 
         /** Collects view cells in the subtree under root.
@@ -890 +893 @@
         float EvalPvsCost(const RayInfoContainer &rays) const;
 
-        int EvalPvsEntriesIncr(VspSubdivisionCandidate &splitCandidate) const;
+        int EvalPvsEntriesIncr(VspSubdivisionCandidate &splitCandidate,
+                                                   const int oldPvsSize,
+                                                   const int fPvsSize,
+                                                   const int bPvsSize) const;
 
         /** Returns number of effective entries in the pvs.
@@ -919 +925 @@
         /** Evaluates contribution of min event to pvs
         */
-        inline int EvalMinEventContribution(const VssRay &ray, const bool isTermination) const;
+        inline float EvalMinEventContribution(const VssRay &ray, const bool isTermination) const;
 
         /** Evaluates contribution of max event to pvs
         */
-        inline int EvalMaxEventContribution(const VssRay &ray, const bool isTermination) const;
+        inline float EvalMaxEventContribution(const VssRay &ray, const bool isTermination) const;
 
         /** Evaluates contribution of kd leaf when encountering a min event
         */
-        inline int EvalMinEventContribution(KdLeaf *leaf) const;
+        inline float EvalMinEventContribution(KdLeaf *leaf) const;
 
         /**  Evaluates contribution of kd leaf when encountering a max event
         */
-        inline int EvalMaxEventContribution(KdLeaf *leaf) const;
+        inline float EvalMaxEventContribution(KdLeaf *leaf) const;
 
         /** Prepares objects for the heuristics.
@@ -1011 +1017 @@
                 const bool countEntries) const;
 
+        inline void UpdateContributionsToPvs(BvhLeaf *leaf,
+                                                                                 const int cf,
+                                                                                 float &frontPvs, float &backPvs, float &totalPvs,
+                                                                                 int &frontSize, int &backSize, int &totalSize) const;
+
         /** Evaluates the contribution for kd leaves.
         */
@@ -1085 +1096 @@
         /** Evaluates pvs contribution of this ray.
         */
-        int EvalContributionToPvs(const VssRay &ray, const bool isTermination) const;
+        float EvalContributionToPvs(const VssRay &ray, const bool isTermination) const;
 
         /** Evaluates pvs contribution of a kd node.
         */
-        int EvalContributionToPvs(KdLeaf *leaf) const;
+        float EvalContributionToPvs(KdLeaf *leaf) const;
 
         /** Creates new root of hierarchy and computes bounding box.