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

Timestamp:

03/09/07 18:30:24 (17 years ago)

Author:

mattausch

Message:

 

File:

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

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

@@ -516 +516 @@
                 }
 
-                bool Apply(SplitQueue &splitQueue, bool terminationCriteriaMet)
+                bool Apply(SplitQueue &splitQueue, bool terminationCriteriaMet, SubdivisionCandidateContainer &dirtyList)
                 {
                         VspNode *n = sVspTree->Subdivide(splitQueue, this, terminationCriteriaMet);
                         
                         // local or global termination criteria failed
-                        return !n->IsLeaf();            
+                        const bool success = !n->IsLeaf();      
+
+                        if (success)
+                                CollectDirtyCandidates(dirtyList, true);
+
+                        return success;
                 }
 
@@ -556 +561 @@
                 float mCorrectedFrontRenderCost;
                 float mCorrectedBackRenderCost;
-                //float mCorrectedFrontVolume;
-                //float mCorrectedBackVolume;
-
+                
                 float mFrontRenderCost;
                 float mBackRenderCost;
@@ -907 +910 @@
         /** Evaluates contribution of min event to pvs
         */
-        inline int EvalMinEventContribution(
-                const VssRay &ray, const bool isTermination) const;
+        inline int EvalMinEventContribution(const VssRay &ray, const bool isTermination) const;
 
         /** Evaluates contribution of max event to pvs
@@ -955 +957 @@
                                   RayInfoContainer &backRays) const;
 
-        void UpdatePvsEntriesContribution(
+        inline void UpdatePvsEntriesContribution(
                 const VssRay &ray,
                 const bool isTermination,
@@ -973 +975 @@
         
         */
-        void UpdateContributionsToPvs(
+        inline void UpdateContributionsToPvs(
                 const VssRay &ray,
                 const bool isTermination,
@@ -983 +985 @@
         /** Evaluates the contribution for objects.
         */
-        void UpdateContributionsToPvs(
+        inline void UpdateContributionsToPvs(
                 Intersectable *obj, 
                 const int cf, 
@@ -992 +994 @@
         /** Evaluates the contribution for bounding volume leaves.
         */
-        void UpdateContributionsToPvs(
+        inline void UpdateContributionsToPvs(
                 BvhLeaf *leaf,
                 const int cf,
                 float &frontPvs,
                 float &backPvs,
-                float &totalPvsm,
+                float &totalPvs,
                 const bool countEntries) const;
 
         /** Evaluates the contribution for kd leaves.
         */
-        void UpdateContributionsToPvs(
+        inline void UpdateContributionsToPvs(
                 KdLeaf *leaf,
                 const int cf,
@@ -1011 +1013 @@
         /** Returns true if tree can be terminated.
         */
-        bool LocalTerminationCriteriaMet(const VspTraversalData &data) const;
+        inline bool LocalTerminationCriteriaMet(const VspTraversalData &data) const;
 
         /** Returns true if global tree can be terminated.
         */
-        bool GlobalTerminationCriteriaMet(const VspTraversalData &data) const;
+        inline bool GlobalTerminationCriteriaMet(const VspTraversalData &data) const;
 
         /** Adds ray sample contributions to the PVS.