Changeset 1789 for GTP/trunk/Lib/Vis/Preprocessing/src/BvHierarchy.cpp

Timestamp:

11/25/06 00:19:18 (18 years ago)

Author:

mattausch

Message:

 

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/BvHierarchy.cpp (modified) (13 diffs)

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

@@ -304 +304 @@
         Environment::GetSingleton()->GetIntValue("BvHierarchy.minRaysForVisibility", mMinRaysForVisibility);
         Environment::GetSingleton()->GetIntValue("BvHierarchy.maxTests", mMaxTests);
-        //      Environment::GetSingleton()->GetBoolValue("BvHierarchy.Construction.useInitialSubdivision", mApplyInitialPartition);
+        Environment::GetSingleton()->GetBoolValue("BvHierarchy.Construction.useInitialSubdivision", mApplyInitialPartition);
         Environment::GetSingleton()->GetIntValue("BvHierarchy.Construction.Initial.minObjects", mInitialMinObjects);
         Environment::GetSingleton()->GetFloatValue("BvHierarchy.Construction.Initial.maxAreaRatio", mInitialMaxAreaRatio);
@@ -957 +957 @@
 
                 const bool noValidSplit = ((objectsLeft <= Limits::Small) || (objectsRight <= Limits::Small));
-                const float sum =  noValidSplit ? 1e25 : objectsLeft * al + objectsRight * ar;
+                const float sum = noValidSplit ? 1e25 : objectsLeft * al + objectsRight * ar;
       
                 /*cout << "pos=" << (*cit).mPos << "\t q=(" << objectsLeft << "," << objectsRight <<")\t r=(" 
@@ -1553 +1553 @@
                         }
 
+                        // no good results for degenerate axis split
+                        if (0 && tData.mNode->GetBoundingBox().Size(axis) < Limits::Small)
+                                        nCostRatio[axis] += 9999;
+
                         if ((bestAxis == -1) || (nCostRatio[axis] < nCostRatio[bestAxis]))
                         {
@@ -2149 +2153 @@
                 new BvhSubdivisionCandidate(oData);
 
-        // evaluate priority
-        EvalSubdivisionCandidate(*oSubdivisionCandidate);
         bvhLeaf->SetSubdivisionCandidate(oSubdivisionCandidate);
 
@@ -2156 +2158 @@
         mPvsEntries = CountViewCells(objects);
 
-        PrintSubdivisionStats(*oSubdivisionCandidate);
-        
         if (mApplyInitialPartition)
         {
-                ApplyInitialSubdivision(oSubdivisionCandidate, tQueue);         
+                vector<SubdivisionCandidate *> candidateContainer;
+
+                mIsInitialSubdivision = true;
+                
+                // evaluate priority
+                EvalSubdivisionCandidate(*oSubdivisionCandidate);
+                PrintSubdivisionStats(*oSubdivisionCandidate);
+
+                ApplyInitialSubdivision(oSubdivisionCandidate, candidateContainer);             
+
+                mIsInitialSubdivision = false;
+
+                vector<SubdivisionCandidate *>::const_iterator cit, cit_end = candidateContainer.end();
+
+                for (cit = candidateContainer.begin(); cit != cit_end; ++ cit)
+                {
+                        // reevaluate priority
+                        EvalSubdivisionCandidate(*oSubdivisionCandidate);
+                        tQueue.Push(*cit);
+                }
         }
         else
         {
+                // evaluate priority
+                EvalSubdivisionCandidate(*oSubdivisionCandidate);
+                PrintSubdivisionStats(*oSubdivisionCandidate);
+
                 tQueue.Push(oSubdivisionCandidate);
         }
+                
         cout << "!!size: " << GetStatistics().Leaves() << endl;
 }
@@ -2510 +2534 @@
 
 void BvHierarchy::ApplyInitialSubdivision(SubdivisionCandidate *firstCandidate,
-                                                                                  SplitQueue &tQueue)
-{
-        mIsInitialSubdivision = true;
-
+                                                                                  vector<SubdivisionCandidate *> &candidateContainer)
+{
         SplitQueue tempQueue;
         tempQueue.Push(firstCandidate);
@@ -2523 +2545 @@
                 BvhSubdivisionCandidate *bsc = 
                         dynamic_cast<BvhSubdivisionCandidate *>(candidate);
-                cout << "§§§§§§§§here49 "<< bsc->mParentData.mSortedObjects[3]->size() << " " << mInitialMinObjects << endl;
 
                 const bool globalCriteriaMet = GlobalTerminationCriteriaMet(bsc->mParentData);
 
                 if (!InitialTerminationCriteriaMet(bsc->mParentData))
-                {
-                        cout << "here9"<<bsc->mParentData.mNode->mObjects.size()<<endl;
+                {cout << "here9"<<endl;
                         BvhNode *node = Subdivide(tempQueue, bsc, globalCriteriaMet);
 
@@ -2536 +2556 @@
                 }
                 else // initial preprocessing  finished for this candidate
-                {cout << "here14"<<endl;
+                {cout << "here19"<<endl;
                         // add to "real" traversal queue
-                        tQueue.Push(bsc);
-                }
-        }
-
-        mIsInitialSubdivision = false;
+                        candidateContainer.push_back(bsc);
+                }
+        }
 }
 
@@ -2550 +2568 @@
                                                                         ObjectContainer &backObjects)
 {
-        cout << "*******here54 "<<tData.mSortedObjects[3]->size()<<endl;
         ObjectContainer *objects = tData.mSortedObjects[3];
 
@@ -2563 +2580 @@
 
         ObjectContainer::const_iterator backObjectsStart = objects->begin();
-
-    for (oit = objects->begin(); oit != (objects->end() - 1); ++ oit)
+int dummy = 0;
+    for (oit = objects->begin(); oit != (objects->end() - 1); ++ oit, ++ dummy)
         {
                 Intersectable *objS = *oit;
@@ -2574 +2591 @@
                 if (areaDiff > maxAreaDiff)
                 {
-                        //cout << "here5 " << areaDiff << " " << maxAreaDiff << endl;
                         maxAreaDiff = areaDiff;
+                        //cout << "maxAreaDiff : " << maxAreaDiff << " " << dummy << " " << objects->size() - dummy <<  endl;
                         backObjectsStart = oit + 1;
                 }
@@ -2583 +2600 @@
         for (oit = objects->begin(); oit != backObjectsStart; ++ oit)
         {
-                backObjects.push_back(*oit);
+                frontObjects.push_back(*oit);
         }
 
@@ -2589 +2606 @@
         for (oit = backObjectsStart; oit != oit_end; ++ oit)
         {
-                frontObjects.push_back(*oit);
-        }
+                backObjects.push_back(*oit);
+        }
+        TriangleIntersectable *tObj1 = (TriangleIntersectable *)frontObjects.back();
+        TriangleIntersectable *tObj2 = (TriangleIntersectable *)backObjects.front();
+
+        cout << "here4 " << tObj1->GetItem().GetArea() << " " << tObj2->GetItem().GetArea() << endl;
+
+
+if (maxAreaDiff < 0.0001)
+cout << "big error!!!! " << maxAreaDiff << endl;
+
+        cout << "front: " << (int)frontObjects.size() << " back " << (int)backObjects.size() << " " << backObjects.front()->GetBox().SurfaceArea() - frontObjects.back()->GetBox().SurfaceArea() << endl;
 }