Changeset 1745

Timestamp:

11/13/06 23:41:00 (18 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/Preprocessing

Files:

• scripts/generate_viewcells.env (modified) (1 diff)
• src/HierarchyManager.cpp (modified) (8 diffs)
• src/HierarchyManager.h (modified) (3 diffs)
• src/Pvs.h (modified) (1 diff)
• src/TestPreprocessor.vcproj (modified) (1 diff)
• src/ViewCell.cpp (modified) (1 diff)
• src/ViewCellsManager.cpp (modified) (2 diffs)

GTP/trunk/Lib/Vis/Preprocessing/scripts/generate_viewcells.env

@@ -281 +281 @@
                 maxLeaves 100000
                 # maximal memory in MB
-                maxMemory 20
+                maxMemory 18
                 # minimum ratio of global cost decrease
                 minGlobalCostRatio -1

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

@@ -737 +737 @@
 
         if (sc->IsDirty())
-                cout << "*******************************error!" << endl;
+                cerr << "Error: Should never come here!" << endl;
 
         if (!success) // split was not taken
         {
-                cout << "x";
                 return false;
         }
@@ -988 +987 @@
                 if ((steps >= maxSteps) || ((priority < threshold) && !(steps < minSteps)))
                 {
-                        cout << "\n**************** breaking on " << priority 
-                                 << " smaller than " << threshold << endl;
+                        cout << "\nbreaking on " << priority << " smaller than " << threshold << endl;
                         break;
                 }
@@ -1831 +1829 @@
 
 
+void HierarchyManager::ComputePvs(const ObjectPvs &pvs, float &rc, int &pvsEntries)
+{
+        BvhNode::NewMail();
+
+        ObjectPvsIterator pit = pvs.GetIterator();
+
+        while (pit.HasMoreEntries())
+        {
+                ObjectPvsEntry entry = pit.Next();
+
+                BvhIntersectable *intersect = dynamic_cast<BvhIntersectable *>(entry.mObject);
+
+                BvhLeaf *leaf = intersect->GetItem();
+                BvhNode *activeNode = leaf->GetActiveNode();
+
+                if (!activeNode->Mailed())
+                {
+                        activeNode->Mail();
+
+                        ObjectContainer objects;
+                        activeNode->CollectObjects(objects);
+
+                        ++ pvsEntries;
+                        rc += mBvHierarchy->EvalAbsCost(objects);
+                        //cout << " pvs: " << mBvHierarchy->EvalAbsCost(leaf->mObjects);
+                }
+        }
+}
+
+
 int HierarchyManager::ExtractStatistics(const int maxSplits,
                                                                                 const float maxMemoryCost,
@@ -1837 +1865 @@
                                                                                 int &pvsEntries,
                                                                                 int &viewSpaceSplits,
-                                                                                int &objectSpaceSplits)
+                                                                                int &objectSpaceSplits,
+                                                                                const bool useFilter)
 {
         ViewCellContainer viewCells;
@@ -1858 +1887 @@
         renderCost = 0.0f;
 
-        //BvhNode::NewMail();
-        //int dummy = 0;
         for (vit = viewCells.begin(); vit != vit_end; ++ vit)
         {
                 float rc = 0;
                 ViewCell *vc = *vit;
+
                 ObjectPvs pvs;
                 mVspTree->mViewCellsTree->GetPvs(vc, pvs);
-                //dummy+=pvs.GetSize();
-                BvhNode::NewMail();
-
-                // hack: should not be done here
-                ObjectPvsIterator pit = pvs.GetIterator();
-
-                while (pit.HasMoreEntries())
-                {
-                        ObjectPvsEntry entry = pit.Next();
-
-                        BvhIntersectable *intersect = dynamic_cast<BvhIntersectable *>(entry.mObject);
-
-                        BvhLeaf *leaf = intersect->GetItem();
-                        BvhNode *activeNode = leaf->GetActiveNode();
-
-                        if (!activeNode->Mailed())
-                        {
-                                activeNode->Mail();
-
-                                ObjectContainer objects;
-                                activeNode->CollectObjects(objects);
-
-                                ++ pvsEntries;
-                                rc += mBvHierarchy->EvalAbsCost(objects);
-                                //cout << " pvs: " << mBvHierarchy->EvalAbsCost(leaf->mObjects);
-                        }
-                }
+
+                if (useFilter)
+                {
+                        ObjectPvs filteredPvs;
+                        mVspTree->mViewCellsManager->ApplyFilter2(vc, false, 1.0f, filteredPvs);
+                        ComputePvs(filteredPvs, rc, pvsEntries);
+                }
+                else
+                {
+                        ComputePvs(pvs, rc, pvsEntries);
+                }               
 
                 rc *= vc->GetVolume();
@@ -2082 +2094 @@
 
 void HierarchyManager::EvaluateSubdivision2(ofstream &splitsStats,
-                                                                                        const int splitsStepSize)
+                                                                                        const int splitsStepSize,
+                                                                                        const bool useFilter)
 {
         HierarchySubdivisionStats subStats;
@@ -2096 +2109 @@
                                                                                                 subStats.mEntriesInPvs,
                                                                                                 subStats.mViewSpaceSplits,
-                                                                                                subStats.mObjectSpaceSplits);
+                                                                                                subStats.mObjectSpaceSplits,
+                                                                                                useFilter);
 
                 
@@ -2123 +2137 @@
                 cout << subStats.mNumSplits << " ";
         }
+
         cout << endl;
 }

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

@@ -288 +288 @@
 
         inline bool ConsiderMemory() const { return mConsiderMemory; }
-        //inline float GetMemoryConst() const { return mMemoryConst; }
         
         void EvaluateSubdivision(const VssRayContainer &sampleRays,                                                                                      
@@ -295 +294 @@
 
         void EvaluateSubdivision2(ofstream &splitsStats,
-                                                          const int splitsStepSize);
+                                                          const int splitsStepSize,
+                                                          const bool useFilter);
 
 
@@ -523 +523 @@
                                                   int &pvsEntries,
                                                   int &viewSpaceSplits,
-                                                  int &objectSpaceSplits);
-
+                                                  int &objectSpaceSplits,
+                                                  const bool useFilter);
+
+        void ComputePvs(const ObjectPvs &pvs, float &rc, int &pvsEntries);
 
 protected:

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

@@ -441 +441 @@
 
 
-/*template <typename T, typename S> void Pvs<T, S>::QuickMerge(const Pvs<T, S> &a)
-{
-        const int samples = mSamples + a.mSamples;
-
-        std::vector<PvsEntry<T, S>> >::const_iterator it;
-
-        for (it = mEntries.begin(); it != mEntries.end(); ++ it)
-        {
-                it->first->Mail();
-        }
-
-    for (it = a.mEntries.begin(); it != a.mEntries.end(); ++ it)
-        {
-                if (!it->first->Mailed())
-                {
-                        mEntries.push_back(*it);
-                }
-        }
-
-        mSamples = samples;
-}*/
-
-
 template <typename T, typename S> void Pvs<T, S>::Clear()
 {

GTP/trunk/Lib/Vis/Preprocessing/src/TestPreprocessor.vcproj

@@ -206 +206 @@
                                 Name="VCLinkerTool"
                                 AdditionalDependencies="xerces-c_2.lib glew32.lib zdll.lib zziplib.lib devil.lib glut32.lib OpenGL32.Lib glu32.lib Preprocessor.lib RTScene.lib RTWorld.lib QtCore4.lib qtmain.lib QtOpenGL4.lib Qt3Support4.lib QtTest4.lib QtGui4.lib QtGlRenderer.lib"
-                                OutputFile="../bin/release/Preprocessor.exe"
+                                OutputFile="../bin/release/Preprocessor2.exe"
                                 LinkIncremental="1"
                                 AdditionalLibraryDirectories="..\src\GL;..\lib\release;..\..\Preprocessing\lib\release;..\..\..\..\..\..\NonGTP\Boost\lib;..\..\..\..\..\..\NonGTP\Xerces\xercesc\lib;..\..\..\..\..\..\NonGTP\Zlib\lib;..\..\..\..\..\..\NonGTP\Devil\lib;..\MultiLevelRayTracing\RTScene\Release;..\MultiLevelRayTracing\RTWorld\Release;"$(QTDIR)\lib";.\QtGlRenderer\Release"

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

@@ -1748 +1748 @@
         
                 // add newly found pvs to merged pvs
-                ObjectPvs interPvs;
+                //cout << "samples vc: " << vc->GetPvs().GetSamples() << " samples pvs: " << pvs.GetSamples() << endl;
                 pvs.MergeInPlace(vc->GetPvs());
-
+                //cout << "new samples: " << pvs.GetSamples() << endl;
                 if (!vc->IsLeaf()) // interior cells: go down to leaf level
                 {

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

@@ -6055 +6055 @@
 
                         ofstream ofstr(filename.c_str());
-                        mHierarchyManager->EvaluateSubdivision2(ofstr, splitsStepSize);
+                        mHierarchyManager->EvaluateSubdivision2(ofstr, splitsStepSize, false);
 
                         timeDiff = TimeDiff(startTime, GetTime());
@@ -6062 +6062 @@
 
                         Debug << "statistics computed in " << timeDiff * 1e-3 << " secs" << endl;
+
+#if 0
+                        ////////////////////////////
+                        // filtered stats
+                        sprintf(suffix, "-%09d-eval-filter.log", castSamples);
+                        const string filename2 = string(statsPrefix) + string(suffix);
+
+                        startTime = GetTime();
+                        
+                        cout << "compute new statistics for filtered pvs ... " << endl;
+
+                        ofstream ofstr2(filename2.c_str());
+                        mHierarchyManager->EvaluateSubdivision2(ofstr2, splitsStepSize, true);
+
+                        timeDiff = TimeDiff(startTime, GetTime());
+                        cout << "finished in " << timeDiff * 1e-3 << " secs" << endl;
+                        cout << "*************************************" << endl;
+
+                        Debug << "statistics computed in " << timeDiff * 1e-3 << " secs" << endl;
+#endif
 
                         // only for debugging purpose