Changeset 2648

Timestamp:

03/18/08 19:28:00 (17 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• GlRenderer.cpp (modified) (3 diffs)
• GvsPreprocessor.cpp (modified) (15 diffs)
• GvsPreprocessor.h (modified) (4 diffs)
• Preprocessor.cpp (modified) (3 diffs)
• QtInterface/QtGlRenderer.cpp (modified) (2 diffs)
• RandomViewCellsHandler.cpp (modified) (4 diffs)

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

@@ -90 +90 @@
         mSceneGraph->CollectObjects(mObjects);
 
-#if 0
+#if 1
         viewCellsManager->GetViewPoint(mViewPoint);
         mViewDirection = Vector3(0,0,1);
@@ -1621 +1621 @@
   for (sit = viewPoints.begin(); sit != sit_end; ++ sit, ++ i) 
         {
-          
-          //cout << "view point: " << (*sit) << endl;;
+          //cout << "\n\nvp: " << (*sit) << endl;
           SimpleRay sray = *sit;
           
@@ -1642 +1641 @@
                   mPvsErrorBuffer[i].mPvsSize = pvsSize;
 
-                  cout << "(" << i << "," << mPvsErrorBuffer[i].mError <<")";
+                  cout << "(vc: " << i << ", er: " << mPvsErrorBuffer[i].mError <<")" << endl;
           }
 

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

@@ -20 +20 @@
   
 #define GVS_DEBUG 0
-static ObjectContainer myobjects;
 
 struct VizStruct
@@ -32 +31 @@
 static const float MIN_DIST = 0.001f;
 
+static ObjectContainer myobjects;
 static vector<VizStruct> vizContainer;
+
 
 GvsPreprocessor::GvsPreprocessor(): 
@@ -78 +79 @@
         mGvsStats.Reset();
 
+        // hack: some generic statistical values that can be read
+        // by an application using the preprocessor
         mGenericStats = 0;
         mGenericStats2 = 0;
@@ -105 +108 @@
 ViewCell *GvsPreprocessor::NextViewCell()
 {
-        //if (mViewCellsManager->GetNumViewCells() == mProcessedViewCells)
-        //      return false; // no more view cells
-
         if (mProcessedViewCells == (int)mViewCells.size())
                 return NULL; // no more view cells
@@ -440 +440 @@
 
         const int numBorderSamples = (int)vssRays.size() - numRandomRays;
+
+#if 0
         // set flags
-        /*VssRayContainer::const_iterator rit, rit_end = vssRays.end();
+        VssRayContainer::const_iterator rit, rit_end = vssRays.end();
         for (rit = vssRays.begin(); rit != rit_end; ++ rit, ++ i)
                 (*rit)->mFlags |= VssRay::BorderSample;
-                */
+#endif
+
         int castRays = (int)simpleRays.size();
 
         VssRayContainer invalidSamples;
-
 
         // handle rays
@@ -783 +785 @@
         int oldContribution = mGvsStats.mTotalContribution;
         int passSamples = 0;
+
         mGenericStats = 0;
         mGenericStats2 = 0;
@@ -831 +834 @@
 void GvsPreprocessor::CompileViewCellsList()
 {
+        // Receive list of view cells from view cells manager
         ViewCellPointsList *vcPoints = mViewCellsManager->GetViewCellPointsList();
-
-        
-        int i = 0;
-
+        
         if (!vcPoints->empty())
         {
@@ -843 +844 @@
 
                 for (vit = vcPoints->begin(); vit != vit_end; ++ vit)
-                {//cout << i ++ << " " << (*vit)->first->GetId() << endl;
+                {
                         mViewCells.push_back((*vit)->first);
                 }
@@ -941 +942 @@
 
 
-
 void GvsPreprocessor::PerViewCellComputation()
 {
@@ -954 +954 @@
                         (*oit)->mCounter = 0;
 
-                ComputeViewCell(vc);
+        ComputeViewCell(vc);
         }
 }
@@ -1124 +1124 @@
 #endif
 
-        mGvsStats.Stop();
-        mGvsStats.Print(mGvsStatsStream);
-
         if (mPerViewCell)
         {
-#if 0
+#if 1
                 // provide list of view cells to compute
                 CompileViewCellsList();
-
                 // start per view cell gvs
                 PerViewCellComputation();
-
-                if (mEvaluatePixelError)
-                {
-                        ComputeRenderError();
-                }
 #else
                 PerViewCellComputation2();
@@ -1162 +1153 @@
         {
                 ExportPreprocessedData(mVisibilityFileName);
+        }
+        
+        // compute the pixel error of this visibility solution
+        if (mEvaluatePixelError)
+        {
+                ComputeRenderError();
         }
 
@@ -1211 +1208 @@
 {
         app << "#ViewCells\n" << mViewCells << endl;
-        app << "#ViewCellId\n" << mViewCellId << endl;
+        app << "#Id\n" << mViewCellId << endl;
+        app << "#Time\n" << mTimePerViewCell << endl;;
+        app << "#TrianglePvs\n" << mTrianglePvs << endl;
+        app << "#ObjectPvs\n" << mPerViewCellPvs << endl;
+        app << "#PvsCost\n" << (int)mPvsCost << endl;
+
+#if 0
+        app << "#TotalPvs\n" << mTotalPvs << endl;
         app << "#TotalTime\n" << mTotalTime << endl;
-        app << "#TimePerViewCell\n" << mTimePerViewCell << endl;;
-
         app << "#RaysPerSec\n" << RaysPerSec() << endl;
-
-        app << "#TrianglePvs\n" << mTrianglePvs << endl;
-        app << "#TotalTrianglePvs\n" << mTotalTrianglePvs << endl;
-
-        app << "#PerViewCellPvs\n" << mPerViewCellPvs << endl;
-        app << "#TotalPvs\n" << mTotalPvs << endl;
         
         app << "#PerViewCellSamples\n" << mPerViewCellSamples << endl;
         app << "#TotalSamples\n" << mTotalSamples << endl;
         app     << "#SamplesContri\n" << mTotalContribution << endl;
-                
+        app << "#TotalTrianglePvs\n" << mTotalTrianglePvs << endl;
+        
+#endif
+
         //app << "#ReverseSamples\n" << mReverseSamples << endl;
         //app << "#BorderSamples\n" << mBorderSamples << endl;
@@ -1277 +1276 @@
         else
         {
-                /*// add pvs
-                ObjectContainer::const_iterator it, it_end = mKdPvs.end();
-
-                for (it = mKdPvs.begin(); it != it_end; ++ it)
-                        mCurrentViewCell->GetPvs().AddSampleDirty(*it, 1.0f);
-                */
                 mGvsStats.mPerViewCellPvs = mCurrentViewCell->GetPvs().GetSize();
-
-                cout << "pvs cost: " << mCurrentViewCell->GetPvs().EvalPvsCost() << " pvs tri: " << mGenericStats2 << endl;
+                mGvsStats.mPvsCost = mCurrentViewCell->GetPvs().EvalPvsCost();
+
+                cout << "id: " << mCurrentViewCell->GetId() << " pvs cost: " 
+                         << mGvsStats.mPvsCost << " pvs tri: " << mTrianglePvs.size() << endl;
         }
 
@@ -1293 +1288 @@
 
         mGvsStats.mViewCells = mProcessedViewCells;//mPass;
-
-
         mGvsStats.mTotalPvs += mGvsStats.mPerViewCellPvs;
         mGvsStats.mTotalSamples += mGvsStats.mPerViewCellSamples;

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

@@ -43 +43 @@
                 mTimePerViewCell = 0;
                 mTotalTrianglePvs = 0;
+                mPvsCost = 0;
         }
 
@@ -66 +67 @@
         float mTimePerViewCell;
         float mTotalTime;
+        
+        float mPvsCost;
 
         ObjectContainer mKdPvs;
@@ -211 +214 @@
         void ClearRayQueue();
 
+        /** Create a list of view cells gvs is run on.
+        */
         void CompileViewCellsList();
 
@@ -223 +228 @@
         void StorePvs(const ObjectContainer &objectPvs);
 
+        /** Compute visibility for a given view cell.
+        */
         void ComputeViewCell(ViewCell *vc);
         /** Runs gvs on the current view cell.

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

@@ -1537 +1537 @@
         //      mutex.unlock();
 
-        if (mViewCellsManager->GetViewCellPointsList()->size()) {
+        if (!mViewCellsManager->GetViewCellPointsList()->empty()) {
           
           ViewCellPointsList *vcPoints = mViewCellsManager->GetViewCellPointsList();
@@ -1551 +1551 @@
 
                 SimpleRayContainer::const_iterator rit = vp->second.begin(), rit_end = vp->second.end();
+
                 for (; rit!=rit_end; ++rit)
                   viewPoints.push_back(*rit);
@@ -1560 +1561 @@
           }
 
+          cerr << "evaluating list of " << viewPoints.size() << " pts" << endl;
           renderer->EvalPvsStat(viewPoints);
         } else
+        {
           renderer->EvalPvsStat();
-        
+        }
+
         mStats <<
           "#AvgPvsRenderError\n" <<renderer->mPvsStat.GetAvgError()<<endl<<

GTP/trunk/Lib/Vis/Preprocessing/src/QtInterface/QtGlRenderer.cpp

@@ -142 +142 @@
 
         ViewCell *viewcell = mViewCellsManager->GetViewCell(mViewPoint);
+        
+        //cout << "vp: " << mViewPoint << endl;
+
         if (viewcell == NULL)
                 return 0.0f;
@@ -173 +176 @@
 
         pvsSize = pvs.GetSize();
-        cout<<pvsSize<<endl;
+        cout << "vc id: " << viewcell->GetId() << " pvs: " << pvsSize << endl;
         
         RenderPvs(pvs);

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

@@ -129 +129 @@
 
 bool RandomViewCellsHandler::ImportViewCellsList(const string &filename, 
-                                                                                   vector<ViewCellPoints *> &viewCells)
+                                                                                                 vector<ViewCellPoints *> &viewCells)
 {
         ifstream inStream(filename.c_str());
@@ -136 +136 @@
 
         ViewCellPoints *currentViewCell = NULL;
+        int i = 0;
+        int j = 0;
 
         string buf;
@@ -149 +151 @@
                                 currentViewCell = new ViewCellPoints();
                                 currentViewCell->first = mViewCellsManager->GetViewCellById(id);
-                                                
-                                viewCells.push_back(currentViewCell);
+                                        
+                                if (1)//i ++ < 5)
+                                {
+                                        viewCells.push_back(currentViewCell);
+                                        j = 0;
+                                }
                                 break;
                         }
@@ -159 +165 @@
                                 
                                 SimpleRay ray(pt, dir, 0, 1);
-                                currentViewCell->second.push_back(ray);
+
+                                if (1)//j ++ < 5)
+                                        currentViewCell->second.push_back(ray);
+
                                 break;
                         }