Changeset 991

Timestamp:

05/29/06 18:54:02 (18 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/Preprocessing

Files:

• scripts/TestPreprocessor.vcproj (modified) (1 diff)
• src/Environment.cpp (modified) (1 diff)
• src/GlRenderer.cpp (modified) (3 diffs)
• src/GlRenderer.h (modified) (1 diff)
• src/Mesh.cpp (modified) (1 diff)
• src/Mesh.h (modified) (1 diff)
• src/Preprocessor.cpp (modified) (3 diffs)
• src/RenderSampler.cpp (modified) (2 diffs)
• src/ViewCellsManager.cpp (modified) (12 diffs)
• src/ViewCellsManager.h (modified) (1 diff)
• src/main.cpp (modified) (8 diffs)

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

@@ -80 +80 @@
                         <Tool
                                 Name="VCLinkerTool"
-                                AdditionalDependencies="xerces-c_2.lib zdll.lib zziplib.lib devil.lib qtmain.lib QtOpenGL4.lib QtCored4.lib QtGuid4.lib Qt3Support4.lib QAxContainer.lib glut32.lib OpenGL32.Lib glu32.lib cg.lib cgGL.lib Preprocessor.lib"
+                                AdditionalDependencies="xerces-c_2.lib zdll.lib zziplib.lib devil.lib qtmain.lib QtGuid4.lib Qt3Support4.lib QAxContainer.lib glut32.lib OpenGL32.Lib glu32.lib cg.lib cgGL.lib Preprocessor.lib QtCore4.lib QtOpenGL4.lib"
                                 OutputFile="$(OutDir)/Preprocessor.exe"
                                 LinkIncremental="1"

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

@@ -1697 +1697 @@
                                    "0.02");
 
-        
+        RegisterOption("Preprocessor.histogram.maxValue", 
+                                        optInt,
+                                        "preprocessor_histogram_max_value=",
+                                        "1000");
+
+        RegisterOption("Preprocessor.histogram.intervals", 
+                                        optInt,
+                                        "preprocessor_histogram_intervals=",
+                                        "20");
 
 

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

@@ -449 +449 @@
 {
   mViewCellsManager->GetViewPoint(mViewPoint);
-  cout<<mViewPoint<<endl;
+  sample.mPosition = mViewPoint;
+
+  cout << mViewPoint << endl;
   
   // take a render cost sample by rendering a cube
@@ -573 +575 @@
                                                                    vector<RenderCostSample> &samples
                                                                    )
-{
+{cout << "here1" << endl;
   makeCurrent();
 
@@ -586 +588 @@
   int i;
   int numQ = 500;
-  
-  if (mOcclusionQueries.size() < numQ) {
-        cout<<"allocating occ queries..."<<endl;
-        
-        numQ;
-        unsigned int *queries = new unsigned int[numQ];
-        for (i=0; i < numQ; i++)
-          queries[i] = 111;
-        
-        glGenOcclusionQueriesNV(numQ, queries);
-        
-        mOcclusionQueries.resize(numQ);
-        
-        for (i=0; i < numQ; i++)
-          mOcclusionQueries[i] = queries[i];
-        
-        delete queries;
-  }
-  
-  for (i=0; i < n; i++)
-        EvalRenderCostSample(
-                                                 samples[i]
-                                                 );
+
+  cout << "here2988" << endl;
+
+  if (mOcclusionQueries.size() < numQ) 
+  {
+          cout << "allocating occ queries..." << endl;
+        
+          unsigned int *queries = new unsigned int[numQ];
+          
+          // matt: ?
+          for (i = 0; i < numQ; ++ i)
+          queries[i] = 111;
+        
+          glGenOcclusionQueriesNV(numQ, queries);
+
+          mOcclusionQueries.resize(numQ);
+        
+          for (i=0; i < numQ; ++ i)
+          {
+                  mOcclusionQueries[i] = queries[i];
+          }
+    
+          DEL_PTR(queries);
+  }
+  
+  for (i=0; i < n; ++ i)
+  {
+          cout << i << " ";
+          EvalRenderCostSample(samples[i]);
+  }
 
   doneCurrent();

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

@@ -63 +63 @@
   }
   
+  Vector3 mPosition;
+
   // visible object from the given point
   int mVisibleObjects;

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

@@ -601 +601 @@
 
 
-Mesh *CreateBox(const AxisAlignedBox3 &box)
+Mesh *CreateMeshFromBox(const AxisAlignedBox3 &box)
 {
         Mesh *mesh = new Mesh;

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

@@ -182 +182 @@
   }
   
-  friend Mesh *CreateBox(const AxisAlignedBox3 &box);
+  /** Creates a mesh from a axis aligned bounding box
+  */
+  friend Mesh *CreateMeshFromBox(const AxisAlignedBox3 &box);
 };
 

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

@@ -41 +41 @@
                         const Vector3 boxSize = sceneBox.Size() * Vector3(0.0025f, 0.01f, 0.0025f);
                         AxisAlignedBox3 box(pt2, pt2 + boxSize);
-                        Mesh *mesh = CreateBox(box);
+                        Mesh *mesh = CreateMeshFromBox(box);
 
                         mesh->Preprocess();
@@ -60 +60 @@
                         Vector3 boxSize = sceneBox.Size() * Vector3(0.0025, 0.01, 0.0025);
                         AxisAlignedBox3 box(pt2, pt2 + boxSize);
-                        Mesh *mesh = CreateBox(box);
+                        Mesh *mesh = CreateMeshFromBox(box);
 
                         mesh->Preprocess();
@@ -78 +78 @@
                 Vector3 boxSize = sceneBox.Size() * Vector3(0.005, 0.02, 0.005);
                 AxisAlignedBox3 box(pt2 + 0.1, pt2 + boxSize);
-                Mesh *mesh = CreateBox(box);
+                Mesh *mesh = CreateMeshFromBox(box);
 
                 mesh->Preprocess();

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

@@ -9 +9 @@
 {
   environment->GetIntValue("RenderSampler.samples", mSamples);
-  cout<<"mspamples"<<mSamples<<endl;
+  cout << "number of render samples: " << mSamples << endl;
 }
 
@@ -15 +15 @@
 RenderSampler::ComputeVisibility()
 {
+        long startTime = GetTime();
+        
+        int histoMaxVal = 0;
+        int histoIntervals = 0;
+        
+    environment->GetIntValue("Preprocessor.histogram.maxValue", histoMaxVal);
+        environment->GetIntValue("Preprocessor.histogram.intervals", histoIntervals);
+
+        const int intervals = histoIntervals;
+
+        cout << "starting sampling of render cost ... ";
+
+        vector<RenderCostSample> samples;
   
-  cout<<"HERE I WAS!\n";
+        if (renderer)
+        {cout << "here18 " << mSamples << endl;
+                renderer->SampleRenderCost(mSamples, samples);
+        }
 
-  vector<RenderCostSample> samples;
-  
-  if (renderer)
-        renderer->SampleRenderCost(
-                                                           mSamples,
-                                                           samples
-                                                           );
+        cout << "finished in " << TimeDiff(startTime, GetTime()) * 1e-3 << " secs" << endl;
 
 
-  // compute histogram from the samples
-  int bins = 100;
-  int maxPvs = 0;
+        //-- Evaluate properties
+        
 
-  vector<int> histogram(bins);
+        //-- compute histogram from the samples
+        int avgPvs = 0;
+        int maxPvs = 0;
+
+        vector<int> histogram(intervals);
   
-  int i;
-  for (i = 0; i < bins; i++)
-        histogram[i] = 0;
+        int i;
+
+        /// initialise histogram
+        for (i = 0; i < intervals; ++ i)
+        {
+                histogram[i] = 0;
+        }
+
+        
+
+        for (i = 0; i < mSamples; ++ i) 
+        {
+                if (samples[i].mVisibleObjects > maxPvs)
+                {
+                        maxPvs = samples[i].mVisibleObjects;
+                }
+
+                avgPvs += samples[i].mVisibleObjects;
+        }
+
+        // sometimes need need to unifiy maximum pvs to compare with other method's histograms
+        // => choose histoMaxPvs accordingly (higher than all pvsss)
+        const int maxVal = max(histoMaxVal, maxPvs);
+        
+        for (i = 0; i < mSamples; ++ i) 
+        {
+                const int bin = (samples[i].mVisibleObjects * intervals) / maxVal;
+
+                ++ histogram[bin];
+        }
+
+
+        //-- output the histogram
+
+        const string filename("fromPointHisto.log");
+        std::ofstream outstream;
+        outstream.open(filename.c_str());
+
+
+
+        Debug << "****************************************" << endl;
+        Debug << "From point queries: " << endl;
+
+        for (i = 0; i < intervals; ++ i) 
+        {
+                outstream << "#Pass\n" << i << endl;
+                outstream << "#Pvs\n" << histogram[i] << endl;
+                //cout << histogram[i] << endl;
+        }
+
+        outstream.close();
+
+        avgPvs /= mSamples;
+                
+        Debug << "max pvs: " << maxPvs << endl;
+        Debug << "avg pvs: " << avgPvs << endl;
   
-  for (i = 0; i < mSamples; i++) {
-        if (samples[i].mVisibleObjects > maxPvs)
-          maxPvs = samples[i].mVisibleObjects;
-  }
-  
-  for (i = 0; i < mSamples; i++) {
-        int bin = (samples[i].mVisibleObjects*bins)/maxPvs;
-        histogram[bin]++;
-  }
-
-  // output the histogram
-  for (i = 0; i < bins; i++) {
-        cout<<histogram[i]<<endl;
-  }
-
-  
-  return true;
+        return true;
 }
 
+
+
 }

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

@@ -566 +566 @@
         maxRenderCost = viewCells.back()->GetRenderCost();
 
-        Debug << "histogram minrc: " << minRenderCost << " maxrc: " << maxRenderCost << endl;
-
-        const int intervals = min(50, (int)viewCells.size());
+        Debug << "histogram min rc: " << minRenderCost << " max rc: " << maxRenderCost << endl;
+
+
+        const int intervals = min(20, (int)viewCells.size());
 
         const float range = maxRenderCost - minRenderCost;
@@ -614 +615 @@
                 const float volRatioDif = volDif / totalVol;
 
-                outstream << "#Pass\n" << j << endl;
+                outstream << "#Pass\n" << j ++ << endl;
                 outstream << "#RenderCostRatio\n" << rcRatio << endl;
                 outstream << "#WeightedCost\n" << currentRenderCost / totalVol << endl;
@@ -624 +625 @@
                 // increase current render cost
                 currentRenderCost += stepSize;
-                ++ j;
         }
 
@@ -763 +763 @@
         maxPvsSize = viewCells.back()->GetPvs().GetSize();
         minPvsSize = 0;
+        // hack: normalize pvs size
         maxPvsSize = 1200;
         minPvsSize = 0;
@@ -768 +769 @@
 
         Debug << "histogram minpvssize: " << minPvsSize << " maxpvssize: " << maxPvsSize << endl;
+
 
         const int intervals = min(20, (int)viewCells.size());
@@ -826 +828 @@
                 currentPvsSize += stepSize;
         }
+
         outstream.close();
 }
@@ -902 +905 @@
                 cout << "compute new statistics ... ";
 
-/*Debug << "*******+" << endl;
-float overall = 0;
-stable_sort(leaves.begin(), leaves.end(), ViewCell::SmallerPvs);
-        for (int i = 0; i < leaves.size(); ++ i)
-        {
-                overall += leaves[i]->GetPvs().GetSize();
-                Debug << "i " << i << " !size: " << leaves[i]->GetPvs().GetSize() << " vol: " << leaves[i]->GetVolume() << " overall " << overall << endl;
-                
-        }
-*/
 
                 //-- propagate pvs or pvs size information
@@ -1242 +1235 @@
                                                           int maxPvsSize) const
 {
-  ViewCellContainer::const_iterator it, it_end = mViewCells.end();
-
-  for (it = mViewCells.begin(); it != it_end; ++ it) {
-        SetValidity(*it, minPvsSize, maxPvsSize);
-  }
+        ViewCellContainer::const_iterator it, it_end = mViewCells.end();
+
+
+        for (it = mViewCells.begin(); it != it_end; ++ it) 
+        {
+                SetValidity(*it, minPvsSize, maxPvsSize);
+        }
 }
 
@@ -1261 +1256 @@
 
   for (int i=0; i < mViewCells.size(); i++)
-        mViewCells[i]->SetValid(i >= start && i <= end);
-}
-
-int
-ViewCellsManager::CountValidViewcells() const
-{
-  ViewCellContainer::const_iterator it, it_end = mViewCells.end();
-  int valid = 0;
-  for (it = mViewCells.begin(); it != it_end; ++ it) {
-        if ((*it)->GetValid())
-          valid ++;
+  {
+          mViewCells[i]->SetValid(i >= start && i <= end);
+  
   }
-  return valid;
+}
+
+int ViewCellsManager::CountValidViewcells() const
+{
+        ViewCellContainer::const_iterator it, it_end = mViewCells.end();
+        int valid = 0;
+
+        for (it = mViewCells.begin(); it != it_end; ++ it) 
+        {       
+                if ((*it)->GetValid())
+                        ++ valid;
+        }
+
+        return valid;
 }
 
@@ -4708 +4708 @@
 {
         int numSamples;
+
         environment->GetIntValue("RenderSampler.samples", numSamples);
         cout << "samples" << numSamples << endl;
@@ -4716 +4717 @@
                 return;
 
-        // doing the query
+        //start the from point queries
         long startTime = GetTime();
         cout << "starting sampling of render cost ... ";
@@ -4728 +4729 @@
         vector<RenderCostSample>::const_iterator rit, rit_end = samples.end();
 
+        //std::map<ViewCell *, ObjectPvs> sampleMap;
+
         for (rit = samples.begin(); rit != rit_end; ++ rit)
         {
                 RenderCostSample sample = *rit;
-                //ViewCell *vc = GetViewCell(sample.)pos;
+                
+                ViewCell *vc = GetViewCell(sample.mPosition);
+                
+                AxisAlignedBox3 box(sample.mPosition - Vector3(1, 1, 1), sample.mPosition + Vector3(1, 1, 1));
+        
+                Mesh *hMesh = CreateMeshFromBox(box);
+                
+                DEL_PTR(hMesh);
+#if 0
+                if (!sampleMap.find(vc))
+                        sampleMap.insert(vc, sample.mVisibleObjects);
+                else
+                        sampleMap[vc].Merge(Merge(sample.mVisibleObjects);
+#endif
         }
 }

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

@@ -973 +973 @@
         void VisualizeWithFromPointQueries();
 
+        /** Evaluate from point queries for the current scene.
+        */
+        void EvalFromPointQueries();
+
 
         /// the view space partition BSP tree.

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

@@ -28 +28 @@
 int
 main(int argc, char **argv)
-{
-        
+{QApplication *app = new QApplication(argc, argv);
+
+        cout << "here222237" << endl;
 //Now just call this function at the start of your program and if you're
 //compiling in debug mode (F5), any leaks will be displayed in the Output
@@ -38 +39 @@
     _CrtSetReportMode(_CRT_ASSERT,_CRTDBG_MODE_FILE);
     _CrtSetReportFile(_CRT_ASSERT,_CRTDBG_FILE_STDERR); 
-
-  Debug.open("debug.log");
+cout << "here3" << endl;
+  Debug.open("debug.log");cout << "here2" << endl;
   environment = new Environment;
+  cout << "here122223" << endl; cout.flush();
   environment->Parse(argc, argv, USE_EXE_PATH);
   MeshKdTree::ParseEnvironment();
-
+cout << "here222283" << endl;
   char buff[128];
   environment->GetStringValue("Preprocessor.type", buff);
@@ -49 +51 @@
         
   Preprocessor *p;
-
+cout << "here22223" << endl;
   if (preprocessorType == "vss")
+  {cout << "here223" << endl;
         p = new VssPreprocessor();
+  }
   else
         if (preprocessorType == "rss")
@@ -63 +67 @@
                 else
                   if (preprocessorType == "render")
+                  {
+                          cout << "here23" << endl;
                         p = new RenderSampler();
+                  }
                   else {
                         cerr<<"Unknown preprocessor type"<<endl;
@@ -70 +77 @@
                   }
   
-
-  QApplication *app = NULL;
+ 
+  //QApplication *app = NULL;
 
   if (p->mUseGlRenderer || p->mUseGlDebugger) {
+          cout << "here1111" << endl;
         // create a qt application first (must be created before any opengl widget...
-        app = new QApplication(argc, argv);
-        
+        //app = new QApplication(argc, argv);
+          cout << "here1112" << endl;
         if (!QGLFormat::hasOpenGL() || !QGLPixelBuffer::hasOpenGLPbuffers()) {
+                cout << "here1133" << endl;cout.flush();
           QMessageBox::information(0, "OpenGL pbuffers", 
                                                            "This system does not support OpenGL/pbuffers.",
@@ -83 +92 @@
           return -1;
         }
+          cout << "here1119" << endl;
   }
-  
+   cout << "here1123" << endl;
   preprocessor = p;
   
@@ -93 +103 @@
   p->BuildKdTree();
   p->KdTreeStatistics(cout);
-  
+   cout << "here1199" << endl;
   // parse view cells related options
   p->PrepareViewCells();
   
-
+ cout << "here1117" << endl;
   // create a preprocessor thread
   PreprocessorThread *pt = new PreprocessorThread(p, app);
@@ -106 +116 @@
     p->Export(filename + "-kdtree.x3d", false, true, false);    
   }
-
+ cout << "here1118" << endl;
   if (p->mUseGlRenderer) {
-        
+          cout << "here1114" << endl;
         rendererWidget = new GlRendererWidget(p->mSceneGraph, p->mViewCellsManager, p->mKdTree);
         //  renderer->resize(640, 480);
+         cout << "here1115" << endl;
         rendererWidget->resize(640, 480);
         rendererWidget->show();
-        
+          cout << "here1113" << endl;
         if (p->GetRenderer()) {