Changeset 2187 for GTP/trunk/Lib/Vis/Preprocessing/src/VspTree.cpp

Timestamp:

03/05/07 11:07:44 (17 years ago)

Author:

mattausch

Message:

 

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/VspTree.cpp (modified) (14 diffs)

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

@@ -668 +668 @@
                                                         const bool globalCriteriaMet)
 {
+        mSubdivTimer.Entry();
+
         // todo remove dynamic cast
         VspSubdivisionCandidate *sc = 
@@ -686 +688 @@
                 const int maxCostMisses = sc->GetMaxCostMisses();
 
-                newNode = SubdivideNode(*sc,
-                                                                tFrontData, 
-                                                                tBackData);
-        
+                newNode = SubdivideNode(*sc, tFrontData, tBackData);
+
                 // how often was max cost ratio missed in this branch?
                 tFrontData.mMaxCostMisses = maxCostMisses;
@@ -766 +766 @@
         }
 
+        mSubdivTimer.Exit();
+
         return newNode;
 }
@@ -773 +775 @@
                                                                            bool computeSplitPlane)
 {
+        mEvalTimer.Entry();
+
         if (computeSplitPlane)
         {
@@ -825 +829 @@
 
         splitCandidate.SetPriority(priority);
+
+        mEvalTimer.Exit();
 }
 
@@ -887 +893 @@
                                                                         VspTraversalData &backData)
 {
+        mNodeTimer.Entry();
+        
         VspLeaf *leaf = static_cast<VspLeaf *>(sc.mParentData.mNode);
 
@@ -993 +1001 @@
         AddViewCellReferences(backLeaf->GetViewCell());
 #endif
+
+        mNodeTimer.Exit();
 
         return interior;
@@ -1023 +1033 @@
 
                 if (entry) 
-                {cout<<"a";
+                {
                         madeContrib = 
                                 vc->GetPvs().AddSample(entry, ray->mPdf);
@@ -1052 +1062 @@
 
 void VspTree::SortSubdivisionCandidates(const RayInfoContainer &rays,
-                                                                  const int axis, 
-                                                                  float minBand, 
-                                                                  float maxBand)
-{
+                                                                                const int axis, 
+                                                                                float minBand, 
+                                                                                float maxBand)
+{
+        mSortTimer.Entry();
+
         mLocalSubdivisionCandidates->clear();
 
@@ -1102 +1114 @@
         stable_sort(mLocalSubdivisionCandidates->begin(), mLocalSubdivisionCandidates->end());
         //sort(mLocalSubdivisionCandidates->begin(), mLocalSubdivisionCandidates->end());
+
+        mSortTimer.Exit();
 }
 
@@ -1408 +1422 @@
                                                                 float &pBack)
 {
+        mSplitTimer.Entry();
+
         float nPosition[3];
         float nCostRatio[3];
@@ -1502 +1518 @@
         pFront = nProbFront[bestAxis];
         pBack = nProbBack[bestAxis];
+
+        mSplitTimer.Exit();
 
         return nCostRatio[bestAxis];
@@ -3191 +3209 @@
                 {
                         BvhLeaf *leaf = mHierarchyManager->mBvHierarchy->GetLeaf(obj);
-                        UpdateContributionsToPvs(leaf, cf, frontPvs, backPvs, totalPvs);
+                        UpdateContributionsToPvs(leaf, cf, frontPvs, backPvs, totalPvs, false);
                         break;
                 }
@@ -3242 +3260 @@
         int pvs = 0;
 
-        switch(mHierarchyManager->GetObjectSpaceSubdivisionType())
+        switch (mHierarchyManager->GetObjectSpaceSubdivisionType())
         {
         case HierarchyManager::NO_OBJ_SUBDIV: