Changeset 2224 for GTP/trunk/Lib/Vis/Preprocessing/src/HierarchyManager.cpp

Timestamp:

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

Author:

mattausch

Message:

 

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/HierarchyManager.cpp (modified) (8 diffs)

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

@@ -837 +837 @@
                 return childPvs;
         }
+
         // assume pvs not sampled sufficiently => take total pvs
         if (avgRayContri >= mMaxAvgRayContri)
@@ -852 +853 @@
         const float newPvs = alpha * childPvs + (1.0f - alpha) * totalPvs;
 #endif
-
+cout<<"a";
         //cout << "alpha " << alpha << " beta: " << beta << " child: " << childPvs << " parent: " << totalPvs << endl;
         
@@ -863 +864 @@
 bool HierarchyManager::ApplySubdivisionCandidate(SubdivisionCandidate *sc, 
                                                                                                  SplitQueue &splitQueue,
-                                                                                                 const bool repairQueue)
+                                                                                                 //const bool repairQueue,
+                                                                                                 SubdivisionCandidateContainer &dirtyList)
 {
         const bool terminationCriteriaMet = GlobalTerminationCriteriaMet(sc);
-        const bool success = sc->Apply(splitQueue, terminationCriteriaMet);
+        const bool success = sc->Apply(splitQueue, terminationCriteriaMet, dirtyList);
 
         if (sc->IsDirty())
@@ -934 +936 @@
         // output stats
         EvalSubdivisionStats();
-                
-        if (repairQueue) 
-        {
-                // reevaluate candidates affected by the split for view space splits, 
-                // this would be object space splits and other way round
-                vector<SubdivisionCandidate *> dirtyList;
-                sc->CollectDirtyCandidates(dirtyList, false);
-
-                RepairQueue(dirtyList, splitQueue, mRecomputeSplitPlaneOnRepair);
-        }
 
         return true;
@@ -1046 +1038 @@
                                                                            AxisAlignedBox3 *forcedViewSpace)
 {
+        SubdivisionCandidate::NewMail();
+
         while (!FinishedConstruction())
         {
@@ -1053 +1047 @@
                 //-- subdivide leaf node
 
-                ApplySubdivisionCandidate(sc, mTQueue, repairQueue);
+                SubdivisionCandidateContainer dirtyList;
+
+                ApplySubdivisionCandidate(sc, mTQueue, dirtyList);
                                 
+                if (repairQueue) 
+                {
+                        // reevaluate candidates affected by the split for view space splits, 
+                        // this would be object space splits and other way round
+                        RepairQueue(dirtyList, mTQueue, mRecomputeSplitPlaneOnRepair);
+                }       
+
                 // we use objects for evaluating vsp tree construction until 
                 // a certain depth once a certain depth existiert ...
@@ -1103 +1106 @@
                 //-- subdivide leaf node of either type
 
-        ApplySubdivisionCandidate(sc, mTQueue, repairQueue);
+                SubdivisionCandidateContainer dirtyList;
+        ApplySubdivisionCandidate(sc, mTQueue, dirtyList);
                 
+                if (repairQueue)
+                {
+                        RepairQueue(dirtyList, mTQueue, mRecomputeSplitPlaneOnRepair);
+                }
+
                 DEL_PTR(sc);
         }
@@ -1140 +1149 @@
                 SubdivisionCandidate *sc = NextSubdivisionCandidate(splitQueue); 
                         
-                const bool repairQueue = false;
-                const bool success = ApplySubdivisionCandidate(sc, splitQueue, repairQueue);
+                const bool success = ApplySubdivisionCandidate(sc, splitQueue, dirtyCandidates);
 
                 if (success)
                 {
-                        sc->CollectDirtyCandidates(dirtyCandidates, true);
+                        //sc->CollectDirtyCandidates(dirtyCandidates, true);
                         ++ steps;
                 }