Changeset 871 for GTP/trunk/Lib

Timestamp:

05/02/06 11:14:52 (19 years ago)

Author:

bittner

Message:

RenderSampler?

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• Environment.cpp (modified) (1 diff)
• GlRenderer.cpp (modified) (1 diff)
• Makefile (modified) (1 diff)
• Preprocessor.cpp (modified) (2 diffs)
• Preprocessor.h (modified) (2 diffs)
• PreprocessorThread.cpp (modified) (1 diff)
• RenderSampler.cpp (added)
• RenderSampler.h (added)
• RssPreprocessor.cpp (modified) (4 diffs)
• ViewCellsManager.cpp (modified) (7 diffs)
• ViewCellsManager.h (modified) (4 diffs)
• VssPreprocessor.cpp (modified) (1 diff)
• default.env (modified) (3 diffs)
• main.cpp (modified) (1 diff)

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

@@ -1673 +1673 @@
                                    "true");
 
+        RegisterOption("Preprocessor.exportVisibility",
+                                   optBool,
+                                   "preprocessor_export_visibility",
+                                   "true");
+
+        RegisterOption("Preprocessor.visibilityFile",
+                                   optString,
+                                   "preprocessor_visibility_file=",
+                                   "visibility.xml");
+
+        RegisterOption("Preprocessor.applyVisibilityFilter",
+                                   optBool,
+                                   "preprocessor_apply_filter",
+                                   "true");
+
+
 
         /**************************************************************************************/

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

@@ -841 +841 @@
   glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
   
-  ViewCell *viewcell;
+  ViewCell *viewcell = NULL;
 
   PrVs prvs;
   
-  if (!useFilter)
+  if (!useFilter) {
         viewcell = mViewCellsManager->GetViewCell(mViewPoint);
-  else {
+  } else {
         //  mViewCellsManager->SetMaxFilterSize(1);
         mViewCellsManager->GetPrVS(mViewPoint, prvs);

GTP/trunk/Lib/Vis/Preprocessing/src/Makefile

@@ -1 +1 @@
 #############################################################################
 # Makefile for building: preprocessor
-# Generated by qmake (2.00a) (Qt 4.1.2) on: út 25. IV 12:50:38 2006
+# Generated by qmake (2.00a) (Qt 4.1.2) on: út 2. V 11:07:44 2006
 # Project:  preprocessor.pro
 # Template: app

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

@@ -127 +127 @@
         environment->GetBoolValue("Preprocessor.computeVisibility", mComputeVisibility);
         environment->GetBoolValue("Preprocessor.detectEmptyViewSpace", mDetectEmptyViewSpace);
-
+        environment->GetBoolValue("Preprocessor.exportVisibility", mExportVisibility );
+
+        char buffer[256];
+        environment->GetStringValue("Preprocessor.visibilityFile",  buffer);
+        mVisibilityFileName = buffer;
+        environment->GetBoolValue("Preprocessor.visibilityFile", mApplyVisibilityFilter );
+        
         Debug << "detect empty view space=" << mDetectEmptyViewSpace << endl;
         Debug << "load polygons as meshes: " << mLoadPolygonsAsMeshes << endl;
@@ -255 +261 @@
 Preprocessor::ExportPreprocessedData(const string filename)
 {
-  return false;
-}
+  
+  mViewCellsManager->ExportViewCells(filename,
+                                                                         true);
+  
+  return true;
+}
+
+bool
+Preprocessor::PostProcessVisibility()
+{
+  
+  if (mApplyVisibilityFilter) {
+        cout<<"Applying visibility filter...";
+        mViewCellsManager->ApplyFilter(mKdTree,
+                                                                   0.05f,
+                                                                   0.05f);
+        cout<<"done.";
+  }
+  
+  // export the preprocessed information to a file
+  if (mExportVisibility)
+        ExportPreprocessedData(mVisibilityFileName);
+  
+  return true;
+}
+
 
 bool

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

@@ -69 +69 @@
     */
   virtual bool ComputeVisibility() = 0;
-  
+
+  /** Post Process the computed visibility. By default applys the visibility filter
+          (if specified in the environment and export the preprocessed data */
+  virtual bool PostProcessVisibility();
+
   /** View cells are either loaded or prepared for generation, according to the chosen environment
       object. Important evironment options are, e.g, the view cell type.
@@ -163 +167 @@
   bool mComputeVisibility;
 
+  bool mExportVisibility;
+  string mVisibilityFileName;
+  
+  bool mApplyVisibilityFilter;
+  
   GlRendererBuffer *GetRenderer() { return renderer;}
   

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

@@ -26 +26 @@
     mPreprocessor->ComputeVisibility();
         //      mPreprocessor->ExportPreprocessedData("scene.vis");
+        mPreprocessor->PostProcessVisibility();
   }
   

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

@@ -512 +512 @@
         SimpleRayContainer rays;
 
-        cout<<"Generating initial rays..."<<endl;
+        cout<<"Generating initial rays..."<<endl<<flush;
+
         GenerateRays(mInitialSamples/4, SPATIAL_BOX_BASED_DISTRIBUTION, rays);
         GenerateRays(mInitialSamples/4, OBJECT_BASED_DISTRIBUTION, rays);
@@ -518 +519 @@
         GenerateRays(mInitialSamples/4, OBJECT_DIRECTION_BASED_DISTRIBUTION, rays);
         
-        cout<<"Casting initial rays..."<<endl;
+        cout<<"Casting initial rays..."<<endl<<flush;
         CastRays(rays, mVssRays);
 
@@ -546 +547 @@
   if (mUseViewcells) {
 
-        cout<<"Computing sample contributions..."<<endl;
+        cout<<"Computing sample contributions..."<<endl<<flush;
         // evaluate contributions of the intitial rays
         mViewCellsManager->ComputeSampleContributions(mVssRays, true, false);
-        cout<<"done.\n";
+        cout<<"done.\n"<<flush;
         
         mStats <<
@@ -802 +803 @@
 
 
-  cout<<"Applying visibility filter...";
-  mViewCellsManager->ApplyFilter(mKdTree,
-                                                                 0.05f,
-                                                                 0.05f);
-  cout<<"done.";
+  //  mViewCellsManager->ExportViewCells("visibility.xml",
+  //                                                                     true);
+  
   
   return true;

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

@@ -1856 +1856 @@
 
 
-bool ViewCellsManager::ExportViewCells(const string filename)
+bool ViewCellsManager::ExportViewCells(const string filename, const bool exportPvs)
 {
         return false;
@@ -2272 +2272 @@
                 char filename[100];
                 environment->GetStringValue("ViewCells.filename", filename);
-                ExportViewCells(filename);
+                ExportViewCells(filename, mExportPvs);
         }
         
@@ -2719 +2719 @@
 
 
-bool BspViewCellsManager::ExportViewCells(const string filename)
+bool BspViewCellsManager::ExportViewCells(const string filename, const bool exportPvs)
 {
         cout << "exporting view cells to xml ... ";
@@ -2745 +2745 @@
         stream << "<ViewCells>" << endl;
 
-        mViewCellsTree->Export(stream, mExportPvs);
+        mViewCellsTree->Export(stream, exportPvs);
 
         stream << "</ViewCells>" << endl;
@@ -3964 +3964 @@
                 char filename[100];
                 environment->GetStringValue("ViewCells.filename", filename);
-                ExportViewCells(filename);
+                ExportViewCells(filename, mExportPvs);
         }
 
@@ -4710 +4710 @@
 
 
-bool VspBspViewCellsManager::ExportViewCells(const string filename)
+bool VspBspViewCellsManager::ExportViewCells(const string filename, const bool exportPvs)
 {
         cout << "exporting view cells to xml ... ";
@@ -4735 +4735 @@
         stream << "<ViewCells>" << endl;
         
-        mViewCellsTree->Export(stream, mExportPvs);
+        mViewCellsTree->Export(stream, exportPvs);
 
         stream << "</ViewCells>" << endl;

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

@@ -307 +307 @@
         /** Writes view cells to disc.
         */
-        virtual bool ExportViewCells(const string filename);
+        virtual bool ExportViewCells(const string filename, const bool exportPvs);
 
         /** Casts beam to collect view cells.
@@ -435 +435 @@
         bool LoadBoundingBoxes(const string filename, IndexedBoundingBoxContainer &boxes) const;
 
+  bool GetExportPvs() const {
+        return mExportPvs;
+  }
 
         /** Loads view cells from file. The view cells manager is created with 
@@ -678 +681 @@
         void Finalize(ViewCell *viewCell, const bool createMesh);
 
-        bool ExportViewCells(const string filename);
+        bool ExportViewCells(const string filename, const bool exportPvs);
 
         /** Constructs merge hierarchy which corresponds to the spatial hierarchy.
@@ -886 +889 @@
         void CreateMesh(ViewCell *vc);
 
-        bool ExportViewCells(const string filename);
+        bool ExportViewCells(const string filename, const bool exportPvs);
 
         int CastBeam(Beam &beam);

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

@@ -627 +627 @@
           VssRayContainer dummies;
           mViewCellsManager->Visualize(mObjects, dummies);
-          mViewCellsManager->ExportViewCells("test.xml");
+          mViewCellsManager->ExportViewCells("test.xml", mViewCellsManager->GetExportPvs());
   }
 

GTP/trunk/Lib/Vis/Preprocessing/src/default.env

@@ -9 +9 @@
 #       filename vienna.x3d
 # filename ../data/vienna/vienna-simple.x3d
-#filename ../data/vienna/vienna-buildings.x3d
+filename ../data/vienna/vienna-buildings.x3d
 #filename ../data/vienna/vienna-buildings.x3d;../data/vienna/vienna-roofs.x3d;../data/vienna/vienna-plane.x3d;../data/vienna/vienna-roads.x3d
 # filename ../data/vienna/viewcells-25-sel.x3d
-filename ../data/atlanta/atlanta2.x3d
+#filename ../data/atlanta/atlanta2.x3d
 #filename ../data/soda/soda.dat
 #filename ../data/soda/soda5.dat
@@ -89 +89 @@
 
 RssPreprocessor {
-        samplesPerPass 1000000
+        samplesPerPass 500000
         initialSamples 1000000
-        vssSamples 1000000
+        vssSamples 2000000
         vssSamplesPerPass 1000000
         useImportanceSampling false
@@ -274 +274 @@
 #       filename ../scripts/viewcells_atlanta.xml
 #       filename ../data/soda/soda5-viewcells2.xml
-        filename ../data/atlanta/viewcells_atlanta3.xml
-#       filename ../data/vienna/viewcells_vienna.xml
+#       filename ../data/atlanta/viewcells_atlanta3.xml
+        filename ../data/vienna/viewcells_vienna.xml
 #       filename ../data/PowerPlant/power_plant_viewcells_all3.xml
 }

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

@@ -63 +63 @@
                 else
                   if (preprocessorType == "render")
-;//                     p = new RenderSampler();
+                        p = new RenderSampler();
                   else {
                         cerr<<"Unknown preprocessor type"<<endl;