Changeset 1784 for GTP/trunk/Lib/Vis/Preprocessing

Timestamp:

11/23/06 12:25:16 (18 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• BvHierarchy.cpp (modified) (11 diffs)
• BvHierarchy.h (modified) (1 diff)
• Environment.cpp (modified) (1 diff)
• HierarchyManager.cpp (modified) (7 diffs)
• ViewCellsManager.cpp (modified) (2 diffs)

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

@@ -297 +297 @@
         Environment::GetSingleton()->GetBoolValue("BvHierarchy.Construction.useInitialSubdivision", mApplyInitialPartition);
         
-        mApplyInitialPartition = true;
+        mInitialObjectsSize = 50;
+
         //mMemoryConst = (float)(sizeof(VspLeaf) + sizeof(VspViewCell));
         //mMemoryConst = (float)sizeof(BvhLeaf);
@@ -574 +575 @@
         {
                 const bool sufficientSamples = 
-                        splitCandidate.mParentData.mNumRays > mMinRaysForVisibility;
+                                splitCandidate.mParentData.mNumRays > mMinRaysForVisibility;
 
                 const bool useVisibiliyBasedHeuristics = 
-                        !mUseSah &&
-                        (mHierarchyManager->GetViewSpaceSubdivisionType() == 
-                        HierarchyManager::KD_BASED_VIEWSPACE_SUBDIV) &&
-                        sufficientSamples;
+                                        mUseSah &&
+                                        (mHierarchyManager->GetViewSpaceSubdivisionType() == 
+                                        HierarchyManager::KD_BASED_VIEWSPACE_SUBDIV) &&
+                                        sufficientSamples;
 
                 // compute best object partition
@@ -1369 +1370 @@
 
         const int numRays = CollectViewCells(tData.mNode->mObjects, viewCells, true, true);
-        //cout << "here4 " << numRays << endl;
+        //cout << "number of rays: " << numRays << endl;
 
         ViewCellContainer::const_iterator vit, vit_end = viewCells.end();
@@ -1456 +1457 @@
         if (mIsInitialSubdivision)
         {
-                ApplyInititialSplit(tData, 
-                                                        frontObjects, 
-                                                        backObjects);
-
+                ApplyInitialSplit(tData, frontObjects, backObjects);
                 return 0;
         }
-        
 
         ObjectContainer nFrontObjects[3];
@@ -2120 +2117 @@
         // only rays intersecting objects in node are interesting
         const int nRays = AssociateObjectsWithRays(sampleRays);
-        //Debug << "using " << nRays << " of " << (int)sampleRays.size() << " rays" << endl;
+        //cout << "using " << nRays << " of " << (int)sampleRays.size() << " rays" << endl;
 
         // create bvh traversal data
@@ -2149 +2146 @@
         if (mApplyInitialPartition)
         {
+                cout << "§§§§§§§§here41 "<<oSubdivisionCandidate->mParentData.mSortedObjects[3]->size()<<endl;
                 ApplyInitialSubdivision(oSubdivisionCandidate, tQueue);         
         }
@@ -2191 +2189 @@
 
         *(tData.mSortedObjects[3]) = objects;
-
         stable_sort(tData.mSortedObjects[3]->begin(), tData.mSortedObjects[3]->end(), smallerSize);
 }
@@ -2211 +2208 @@
         }
 
-        for (int i = 0; i < 3; ++ i)
+        for (int i = 0; i < 4; ++ i)
         {
                 frontData.mSortedObjects[i] = new ObjectContainer();
@@ -2504 +2501 @@
 
         SplitQueue tempQueue;
-
+        tempQueue.Push(firstCandidate);
         while (!tempQueue.Empty())
-        {
-                SubdivisionCandidate *candidate = tQueue.Top();
+        {cout << "here2"<<endl;
+                SubdivisionCandidate *candidate = tempQueue.Top();
                 tQueue.Pop();
 
                 BvhSubdivisionCandidate *bsc = 
                         dynamic_cast<BvhSubdivisionCandidate *>(candidate);
-
+                cout << "§§§§§§§§here49 "<< bsc->mParentData.mSortedObjects[3]->size()<<endl;
+cout << "here87 "<<((BvhSubdivisionCandidate *)firstCandidate)->mParentData.mNode->mObjects.size()<<endl;
                 const bool globalCriteriaMet = 
                         GlobalTerminationCriteriaMet(bsc->mParentData);
-
+cout << "here5"<<endl;
                 if (!InitialTerminationCriteriaMet(bsc->mParentData))
-                {
+                {cout << "here9"<<bsc->mParentData.mNode->mObjects.size()<<endl;
                         BvhNode *node = Subdivide(tempQueue, bsc, globalCriteriaMet);
-
+cout << "here12"<<endl;
                         // not needed anymore
                         delete bsc;
                 }
                 else // initial preprocessing  finished for this candidate
-                {
+                {cout << "here15"<<endl;
                         tQueue.Push(bsc);
                 }
@@ -2533 +2531 @@
 
 
-void BvHierarchy::ApplyInititialSplit(const BvhTraversalData &tData,
-                                                                          ObjectContainer &frontObjects,
-                                      ObjectContainer &backObjects)
-{
+void BvHierarchy::ApplyInitialSplit(const BvhTraversalData &tData,
+                                                                        ObjectContainer &frontObjects,
+                                                                        ObjectContainer &backObjects)
+{
+        cout << "*******here54 "<<tData.mSortedObjects[3]->size()<<endl;
         ObjectContainer *objects = tData.mSortedObjects[3];
 
         ObjectContainer::const_iterator oit, oit_end = objects->end();
-    
+    cout<<"$$$$$$$$$$$$$$$$$$$"<<endl;
+        for (oit = objects->begin(); oit != objects->end(); ++ oit)
+        {
+                //cout << (*oit)->GetBox().SurfaceArea() << " ";
+        }
+cout<<"$$$$$$$$$$$$$$$$$$$"<<endl;
         float maxAreaDiff = 0.0f;
 
@@ -2577 +2581 @@
 {
         return (0
-                    || ((int)tData.mNode->mObjects.size() < mInititialObjectsSize)
+                    || ((int)tData.mNode->mObjects.size() < mInitialObjectsSize)
                         || (tData.mNode->mObjects.back()->GetBox().SurfaceArea() < mMinInitialSurfaceArea)
                         );

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

@@ -903 +903 @@
                                                                  SplitQueue &tQueue);
 
-        void ApplyInititialSplit(const BvhTraversalData &tData,
-                                                         ObjectContainer &frontObjects,
-                                                         ObjectContainer &backObjects);
+        void ApplyInitialSplit(const BvhTraversalData &tData,
+                                                   ObjectContainer &frontObjects,
+                                                   ObjectContainer &backObjects);
 
         bool InitialTerminationCriteriaMet(const BvhTraversalData &tData) const;
 
         float mMinInitialSurfaceArea;
-        int mInititialObjectsSize;
+        int mInitialObjectsSize;
 
 protected:

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

@@ -2489 +2489 @@
                                         "true");
         
-        RegisterOption("BvHierarchy.Construction.useInitialSubdivisio",
+        RegisterOption("BvHierarchy.Construction.useInitialSubdivision",
                                         optBool,
                                         "bvh_construction_use_initial_subdivision=",

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

@@ -474 +474 @@
         {
                 // decide upon next split type
-                const float vspPriority = viewSpaceQueue.Top() ? viewSpaceQueue.Top()->GetPriority() : -1e20f;
-                const float ospPriority = objectSpaceQueue.Top() ? objectSpaceQueue.Top()->GetPriority() : -1e20f;
+                const float vspPriority = 
+                        viewSpaceQueue.Top() ? viewSpaceQueue.Top()->GetPriority() : -1e20f;
+                const float ospPriority = 
+                        objectSpaceQueue.Top() ? objectSpaceQueue.Top()->GetPriority() : -1e20f;
                 
                 cout << "new decicion, vsp: " << vspPriority << ", osp: " << ospPriority << endl;
@@ -505 +507 @@
                         const int repaired = RepairQueue(dirtyVspList, viewSpaceQueue, true);
             
-                        cout << "\nrepaired " << repaired << " candidates from " << (int)dirtyVspList.size() << " dirtied candidates" << endl;
+                        cout << "\nrepaired " << repaired << " candidates from " 
+                                 << (int)dirtyVspList.size() << " dirtied candidates" << endl;
                 }
                 else
@@ -535 +538 @@
                         const int repaired = RepairQueue(dirtyOspList, objectSpaceQueue, true);
 
-                        cout << "\nrepaired " << repaired << " candidates from " << (int)dirtyOspList.size() << " dirtied candidates" << endl;
+                        cout << "\nrepaired " << repaired << " candidates from " 
+                                 << (int)dirtyOspList.size() << " dirtied candidates" << endl;
                 }
         }
@@ -586 +590 @@
                 // prepare vsp tree for traversal
         mViewSpaceSubdivisionType = mSavedViewSpaceSubdivisionType;
-                
                 PrepareViewSpaceSubdivision(mTQueue, sampleRays, objects);
         }
@@ -596 +599 @@
                 PrepareObjectSpaceSubdivision(mTQueue, sampleRays, objects);
         }
-
+        
         // begin subdivision
         RunConstruction(mRepairQueue, sampleRays, objects, forcedViewSpace);
@@ -2047 +2050 @@
         
         SubdivisionCandidate *firstVsp = mVspTree->PrepareConstruction(sampleRays, *viewSpaceRays);
+        tQueue.Push(firstVsp);
+
         mBvHierarchy->PrepareConstruction(tQueue, sampleRays, objects);
 
@@ -2054 +2059 @@
         firstVsp->SetPriority((float)-oldVspRoot->mTimeStamp);
         firstBvh->SetPriority((float)-oldBvhRoot->GetTimeStamp());
-
-        tQueue.Push(firstVsp);
         
         ExportStats(stats, tQueue, objects);

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

@@ -330 +330 @@
                                                                           ) const
 {
+        long startTime = GetTime();
+
         SimpleRayContainer simpleRays;
-        long startTime = GetTime();
+        
+        simpleRays.reserve(samplesPerPass);
+        passSamples.reserve(samplesPerPass * 2); // always creates double rays
 
         // create one third of each type
@@ -349 +353 @@
         }
 
-        cout << "generated " << samplesPerPass << " samples in " << TimeDiff(startTime, GetTime()) * 1e-3 << " secs" << endl;
+        cout << "generated " << samplesPerPass << " samples in " 
+                 << TimeDiff(startTime, GetTime()) * 1e-3 << " secs" << endl;
 
         startTime = GetTime();
+
         // shoot simple ray and add it to importance samples
         mPreprocessor->CastRays(simpleRays, passSamples, true);
-        cout << "cast " <<  samplesPerPass << " samples in " << TimeDiff(startTime, GetTime()) * 1e-3 << " secs" << endl;
+        cout << "cast " <<  samplesPerPass << " samples in " 
+                 << TimeDiff(startTime, GetTime()) * 1e-3 << " secs" << endl;
 
         return (int)passSamples.size();