Changeset 1680 for GTP/trunk/Lib/Vis/Preprocessing/src/ViewCellsManager.cpp

Timestamp:

10/26/06 11:09:58 (18 years ago)

Author:

mattausch

Message:

 

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/ViewCellsManager.cpp (modified) (1 diff)

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

@@ -5619 +5619 @@
 
 
-typedef priority_queue<ViewCell *, vector<ViewCell *>, 
-                                           myless<vector<ViewCell *>::value_type> > ViewCellsQueue;
-
-typedef priority_queue<BvhNode *, vector<BvhNode *>, 
-                                           myless<vector<BvhNode *>::value_type> > BvhQueue;
-
-typedef priority_queue<VspNode *, vector<VspNode *>, 
-                                           myless<vector<VspNode *>::value_type> > VspQueue;
-
-static void UpdateStats(ofstream &stats,
-                                                const int splits,
-                                                const float totalRenderCost,
-                                                const int entriesInPvs,
-                                                const float memoryCost,
-                                                const bool vsp)
-{
-        stats << "#Pass\n" << 0 << endl
-                   << "#Splits\n" << splits << endl 
-                   << "#TotalRenderCost\n" << totalRenderCost << endl
-                   << "#TotalEntriesInPvs\n" << entriesInPvs << endl
-                   << "#Memory\n" << memoryCost << endl
-                   << "#Vsp\n" << (vsp ? 1 : 0) << endl
-                   << endl;
-}
-
-/*
-void VspOspViewCellsManager::ExportStats(const string &mergeStats)
-{
-        ofstream stats;
-        stats.open(mergeStats.c_str());
-
-        BvhQueue bvhQueue;
-        VspQueue vspQueue;
-        //ViewCellsQueue viewCellsQueue;
-
-        bvhQueue.push(mHierarchyManager->mBvHierarchy->GetRoot());
-        vspQueue.push(mHierarchyManager->GetVspTree()->GetRoot());
-        
-        int numSteps = 1;
-        
-        const AxisAlignedBox3 box = mViewSpaceBox;
-        const float vol = box.GetVolume();
-
-        float totalRenderCost = (float)mPreprocessor->mObjects.size();//(float)mViewCellsTree->GetPvsSize(mViewCellsTree->GetRoot());
-        int entriesInPvs = 1;//mViewCellsTree->GetPvsEntries(mViewCellsTree->GetRoot());
-
-        cout << "exporting vsposp stats ... " << endl;
-        const float memoryCost = (float)entriesInPvs * (float)ObjectPvs::GetEntrySize();
-
-        /////////////
-        //-- first view cell
-        UpdateStats(stats, 2, totalRenderCost, entriesInPvs, memoryCost, true);
-
-        //-- go through tree in the order of render cost decrease
-        //-- which is the same order as the view cells were merged
-        //-- or the reverse order of subdivision for subdivision-only 
-        //-- view cell hierarchies.
-        int i = 0;
-        while (!(bvhQueue.empty() && vspQueue.empty()))
-        {
-                const float vspCost = !vspQueue.empty() ? vspQueue.top()->GetMergeCost() : -99999999.0;
-                const float ospCost = !bvhQueue.empty() ? bvhQueue.top()->GetMergeCost() : -99999999.0;
-
-                if (vspCost > ospCost)
-                {
-                        cout << "vsp: " << (int)-vspCost << endl;
-                        cout << "v";
-                        VspNode *vspNode = vspQueue.top();
-
-                        if (!vspNode)
-                        {
-                                cerr << "big error!" << endl;
-                                break;
-                        }
-                        vspQueue.pop();
-
-                        if (!vspNode->IsLeaf()) 
-                        {       
-                                totalRenderCost -= vspNode->mRenderCostDecr;
-                                entriesInPvs += vspNode->mPvsEntriesIncr;               
-
-                                i ++;
-
-                                const float memoryCost = (float)entriesInPvs * (float)ObjectPvs::GetEntrySize();        
-                                UpdateStats(stats, i, totalRenderCost, entriesInPvs, memoryCost, true);
-
-                                VspNode *front = dynamic_cast<VspInterior *>(vspNode)->GetFront();
-                                VspNode *back= dynamic_cast<VspInterior *>(vspNode)->GetBack();
-
-                                if (!front->IsLeaf())
-                                        vspQueue.push(front);
-                                if (!back->IsLeaf())
-                                        vspQueue.push(back);
-                        }
-                }
-                else // object space split
-                {
-                        cout << "o";
-                        BvhNode *bvhNode = bvhQueue.top();
-                        cout << "bvh: " << (int)-ospCost << endl;
-                        if (!bvhNode)
-                        {
-                                cerr << "big error!" << endl;
-                                break;
-                        }
-                        bvhQueue.pop();
-
-                        if (!bvhNode->IsLeaf()) 
-                        {       
-                                totalRenderCost -= bvhNode->mRenderCostDecr;
-                                entriesInPvs += bvhNode->mPvsEntriesIncr;               
-
-                                i ++;
-                                const float memoryCost = (float)entriesInPvs * (float)ObjectPvs::GetEntrySize();        
-                                UpdateStats(stats, i, totalRenderCost, entriesInPvs, memoryCost, false);
-                                
-                                BvhNode *front = dynamic_cast<BvhInterior *>(bvhNode)->GetFront();
-                                BvhNode *back= dynamic_cast<BvhInterior *>(bvhNode)->GetBack();
-
-                                if (!front->IsLeaf())
-                                        bvhQueue.push(front);
-                                if (!back->IsLeaf())
-                                        bvhQueue.push(back);
-                        }
-                }
-                cout << i << endl;
-                        
-        }
-
-        stats.close();
-}
-*/
-
 #if TEST_EVALUATION
 void VspOspViewCellsManager::EvalViewCellPartition()