Changeset 1557

Timestamp:

10/03/06 10:10:01 (18 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• HierarchyManager.cpp (modified) (5 diffs)
• HierarchyManager.h (modified) (1 diff)
• ViewCellBsp.cpp (modified) (6 diffs)
• ViewCellBsp.h (modified) (5 diffs)
• ViewCellsManager.cpp (modified) (3 diffs)
• ViewCellsManager.h (modified) (1 diff)
• VspBspTree.cpp (modified) (9 diffs)
• common.h (modified) (1 diff)

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

@@ -608 +608 @@
                                                                                                    const ObjectContainer &objects)
 {
-        switch (mObjectSpaceSubdivisionType)
-        {
-        case BV_BASED_OBJ_SUBDIV:
-        Debug << "old bv hierarchy:\n " << mBvHierarchy->mBvhStats << endl;
-                cout << "\nresetting bv hierarchy" << endl;
-                mHierarchyStats.nodes -= mBvHierarchy->mBvhStats.nodes;
 #if 0   
                 DEL_PTR(mBvHierarchy);
@@ -620 +614 @@
 
                 PrepareObjectSpaceSubdivision(sampleRays, objects);
-#else
-                mBvHierarchy->Reset(sampleRays, objects);
+                return;
 #endif
-                break;
+
+        if (!ObjectSpaceSubdivisionConstructed())
+        {
+                return PrepareObjectSpaceSubdivision(sampleRays, objects);
+        }
+
+        switch (mObjectSpaceSubdivisionType)
+        {
+        case BV_BASED_OBJ_SUBDIV:
+                cout << "\nreseting bv hierarchy" << endl;
+        Debug << "old bv hierarchy:\n " << mBvHierarchy->mBvhStats << endl;
+        
+                mHierarchyStats.nodes -= mBvHierarchy->mBvhStats.nodes;
+                mTQueue.Push(mBvHierarchy->Reset(sampleRays, objects));
+                mTotalCost = mBvHierarchy->mTotalCost;
+                break;
+
         case KD_BASED_OBJ_SUBDIV:
                 // TODO
@@ -630 +639 @@
                 break;
         }
+}
+
+
+void HierarchyManager::ResetViewSpaceSubdivision(const VssRayContainer &sampleRays, 
+                                                                                                 const ObjectContainer &objects)
+{
+        DEL_PTR(mBvHierarchy);
+        mBvHierarchy = new BvHierarchy();
+        mBvHierarchy->mHierarchyManager = this;
+
+        PrepareViewSpaceSubdivision(sampleRays, objects);
+        return;
 }
 
@@ -639 +660 @@
         mHierarchyStats.Reset();
         mHierarchyStats.Start();
-
         mHierarchyStats.nodes = 2;
         
-
         mTotalCost = (float)objects.size();
         Debug << "setting total cost to " << mTotalCost << endl;
@@ -655 +674 @@
         mSavedViewSpaceSubdivisionType = mViewSpaceSubdivisionType;
         mViewSpaceSubdivisionType = NO_VIEWSPACE_SUBDIV;
-
-        // start with object space subdivision
-        PrepareObjectSpaceSubdivision(sampleRays, objects);
-        
-        // process object space candidates
-        RunConstruction(false);
-
-        mViewSpaceSubdivisionType = mSavedViewSpaceSubdivisionType;
-
-        const int limit = 2;
-        for (int i = 0; i < limit; ++ i)
-        {
-        // again run object space subdivision on the view cells
+        
+        const int limit = 4;
+        int i = 0;
+
+        // render cost optimization
+        // start with object space partiton
+        // then optimizate view space partition for the current osp
+        // and vice versa until iteration depth is reached.
+        while (1)
+        {
+        // first run object space subdivision
                 ResetObjectSpaceSubdivision(sampleRays, objects);
-        
+
                 // process object space candidates
                 RunConstruction(false);
 
-                 /////////////////
-                // now do view space subdivison using the current object space partition
-//              ResetViewSpaceSubdivision(sampleRays, objects);
-        
+                if ((++ i) >= limit)
+                        break;
+
+                /////////////////
+                // do view space subdivison with respect to the object space partition
+                ResetViewSpaceSubdivision(sampleRays, objects);
+
                 // process view space candidates
                 RunConstruction(false);
-        
-                cout << "íteration " << i << " of " << limit << " finished" << endl;
+                mViewSpaceSubdivisionType = mSavedViewSpaceSubdivisionType;
+                
+                if ((++ i) >= limit)
+                        break;
+
+                cout << "iteration " << i << " of " << limit << " finished" << endl;
         }
         

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

@@ -315 +315 @@
                 const ObjectContainer &objects);
 
+        void HierarchyManager::ResetViewSpaceSubdivision(
+                const VssRayContainer &rays, 
+                const ObjectContainer &objects);
+
 protected:
 

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

@@ -174 +174 @@
 {
         Randomize(); // initialise random generator for heuristics
-        mOutOfBoundsCell = new BspViewCell();
-        mOutOfBoundsCell->SetId(-1);
+        mOutOfBoundsCell = GetOrCreateOutOfBoundsCell();
+
         /////////
         //-- termination criteria for autopartition
@@ -277 +277 @@
 
 
+BspViewCell *BspTree::GetOrCreateOutOfBoundsCell()
+{
+        if (!mOutOfBoundsCell)
+        {
+                mOutOfBoundsCell = new BspViewCell();
+                mOutOfBoundsCell->SetId(OUT_OF_BOUNDS_ID);
+                mOutOfBoundsCell->SetValid(false);
+        }
+
+        return mOutOfBoundsCell;
+}
+
 int BspTree::SplitPolygons(const Plane3 &plane,
                                                    PolygonContainer &polys, 
@@ -420 +432 @@
         if (mOutOfBoundsCellPartOfTree)
         {
-                cout << "here223 " << mOutOfBoundsCell << endl;
                 // out of bounds cell not part of tree =>
                 // delete manually
                 DEL_PTR(mOutOfBoundsCell);
-        }else cout << "here991 " << endl;
+        }
 }
 
@@ -999 +1010 @@
                         // add predefined view cell to leaf
                         viewCell = dynamic_cast<BspViewCell *>(tData.mViewCell);
-                
-                        /// out of bounds cell can be handled as any other cell
+
+                        // from now on out of bounds cell can be handled as any other cell,
+                        // responsibility for deleting has been shifted
                         if (viewCell == mOutOfBoundsCell)
+                        {
                                 mOutOfBoundsCellPartOfTree = true;
+                        }
                 }
 
@@ -2364 +2378 @@
 
 
-
 void BspTree::ConstructGeometry(ViewCell *vc, 
                                                                 BspNodeGeometry &vcGeom) const
@@ -2379 +2392 @@
         for (it = leaves.begin(); it != it_end; ++ it)
         {
+                // per definition out of bounds cell has zero volume
+                if ((*it) == mOutOfBoundsCell)
+                        continue;
+
                 BspViewCell *bspVc = dynamic_cast<BspViewCell *>(*it);
                 vector<BspLeaf *>::const_iterator bit, bit_end = bspVc->mLeaves.end();

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

@@ -89 +89 @@
         Vector3 CenterOfMass() const;
 
+        /** Returns true if this geometry is well shaped.
+        */
         bool Valid() const;
-
         
         friend ostream &operator<<(ostream &s, const BspNodeGeometry &a)
@@ -101 +102 @@
         }
 
+        /** Number of polygons.
+        */
         int Size() const;
+        /** Returns the polygons in a container.
+        */
         const PolygonContainer &GetPolys();
 
@@ -679 +684 @@
         */
         void SetViewCellsTree(ViewCellsTree *vct);
-                
+        
+        /** Returns view cell representing the empty view space.
+        */
+        BspViewCell *GetOrCreateOutOfBoundsCell();
+
 protected:
 
@@ -1071 +1080 @@
 
         bool mOutOfBoundsCellPartOfTree;
+
+
 private:
         
@@ -1093 +1104 @@
         static void GenerateUniqueIdsForPvs();
 
+        ///////////
         //-- unique ids for PVS criterium
+
         static int sFrontId; 
         static int sBackId;

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

@@ -1965 +1965 @@
                 for (vit = mViewCells.begin(); vit != vit_end; ++ vit)
                 {
-                        if ((*vit)->GetId() != -1) 
+                        if ((*vit)->GetId() != OUT_OF_BOUNDS_ID) 
+                        {
                                 mViewCells[i]->SetId(i ++);
+                        }
                 }
         }
@@ -2988 +2990 @@
                                                                                                  const AxisAlignedPlane *clipPlane
                                                                                                  ) const
-{cout << "here55543 " << vc->GetId() << endl;
+{
         // out of bounds cell
-        if (vc->GetId() == -1)
-                return;
+        //if (vc->GetId() == OUT_OF_BOUNDS_ID) return;
 
         // export mesh if available
@@ -4500 +4501 @@
 {
         // out of bounds cell
-        if (vc->GetId() == -1)
-                return;
-
+        //if (vc->GetId() == OUT_OF_BOUNDS_ID)  return;
         if (clipPlane)
         {

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

@@ -54 +54 @@
   float mRenderBudget;
 
-  /// some characteristic values could be here
-  
+  // some characteristic values could be stored as well
 };
-
 
 /**     Manages different higher order operations on the view cells.

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

@@ -75 +75 @@
         if (randomize) Randomize(); // initialise random generator for heuristics
 
+        //////////////////
         //-- termination criteria for autopartition
+
         Environment::GetSingleton()->GetIntValue("VspBspTree.Termination.maxDepth", mTermMaxDepth);
         Environment::GetSingleton()->GetIntValue("VspBspTree.Termination.minPvs", mTermMinPvs);
@@ -86 +88 @@
         Environment::GetSingleton()->GetIntValue("VspBspTree.Termination.maxViewCells", mMaxViewCells);
 
-        //-- max cost ratio for early tree termination
+        ////////////////////////
+        //-- cost ratios for early tree termination
         Environment::GetSingleton()->GetFloatValue("VspBspTree.Termination.maxCostRatio", mTermMaxCostRatio);
-
         Environment::GetSingleton()->GetFloatValue("VspBspTree.Termination.minGlobalCostRatio", mTermMinGlobalCostRatio);
         Environment::GetSingleton()->GetIntValue("VspBspTree.Termination.globalCostMissTolerance", mTermGlobalCostMissTolerance);
 
+        ///////////
         //-- factors for bsp tree split plane heuristics
+
         Environment::GetSingleton()->GetFloatValue("VspBspTree.Factor.pvs", mPvsFactor);
         Environment::GetSingleton()->GetFloatValue("VspBspTree.Termination.ct_div_ci", mCtDivCi);
 
-
+        //////////
         //-- partition criteria
+
         Environment::GetSingleton()->GetIntValue("VspBspTree.maxPolyCandidates", mMaxPolyCandidates);
         Environment::GetSingleton()->GetIntValue("VspBspTree.maxRayCandidates", mMaxRayCandidates);
@@ -108 +113 @@
         Environment::GetSingleton()->GetBoolValue("VspBspTree.splitUseOnlyDrivingAxis", mOnlyDrivingAxis);
         
+        //////////////////////
         //-- termination criteria for axis aligned split
         Environment::GetSingleton()->GetFloatValue("VspBspTree.Termination.AxisAligned.maxRayContribution", 
@@ -114 +120 @@
                                                          mTermMinRaysForAxisAligned);
 
-        //Environment::GetSingleton()->GetFloatValue("VspBspTree.maxTotalMemory", mMaxTotalMemory);
         Environment::GetSingleton()->GetFloatValue("VspBspTree.maxStaticMemory", mMaxMemory);
 
@@ -136 +141 @@
         Environment::GetSingleton()->GetBoolValue("VspBspTree.Construction.useDrivingAxisForMaxCost", mUseDrivingAxisIfMaxCostViolated);
 
+        /////////
         //-- debug output
 
@@ -148 +154 @@
         Debug << "max view cells: " << mMaxViewCells << endl;
         Debug << "max polygon candidates: " << mMaxPolyCandidates << endl;
-        //Debug << "max plane candidates: " << mMaxRayCandidates << endl;
         Debug << "randomize: " << randomize << endl;
 
@@ -195 +200 @@
         }
 
+        Debug << endl;
 
         mLocalSubdivisionCandidates = new vector<SortableEntry>;
-
-        Debug << endl;
 }
 
@@ -213 +217 @@
         {
                 mOutOfBoundsCell = new BspViewCell();
-                mOutOfBoundsCell->SetId(-1);
+                mOutOfBoundsCell->SetId(OUT_OF_BOUNDS_ID);
                 mOutOfBoundsCell->SetValid(false);
         }
@@ -3003 +3007 @@
         for (it = leaves.begin(); it != it_end; ++ it)
         {
+                if ((*it) == mOutOfBoundsCell)
+                        continue;
+                
                 BspViewCell *bspVc = dynamic_cast<BspViewCell *>(*it);
                 vector<BspLeaf *>::const_iterator bit, bit_end = bspVc->mLeaves.end();

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

@@ -511 +511 @@
 #endif
 
-#endif
-
-
-
-
-
-
-
-
-
-
+/** view cell id belonging to empty view space.
+*/
+#define OUT_OF_BOUNDS_ID -1
+
+#endif
+
+
+
+
+
+
+
+
+
+