Changeset 685 for GTP/trunk/Lib/Vis/Preprocessing/src

Timestamp:

03/10/06 08:23:09 (19 years ago)

Author:

bittner

Message:

 

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• Environment.cpp (modified) (2 diffs)
• GlRenderer.cpp (modified) (4 diffs)
• Preprocessor.cpp (modified) (1 diff)
• Preprocessor.h (modified) (1 diff)
• PreprocessorThread.cpp (modified) (1 diff)
• ViewCellsManager.cpp (modified) (5 diffs)
• VspBspTree.cpp (modified) (1 diff)
• VssPreprocessor.cpp (modified) (6 diffs)
• X3dExporter.cpp (modified) (1 diff)
• default.env (modified) (6 diffs)

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

@@ -1282 +1282 @@
                                         optBool,
                                         "view_cells_merge_empty=",
-                                        "false");
+                                        "true");
 
         RegisterOption("ViewCells.evaluateViewCells",
@@ -1604 +1604 @@
                                    "true");
 
+        RegisterOption("Preprocessor.computeVisibility",
+                                   optBool,
+                                   "preprocessor_compute_visibility=",
+                                   "true");
 
 

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

@@ -123 +123 @@
                 RenderViewCell(*it);
           }
+        } else {
+          //      cerr<<"Empty viewcell mesh\n";
         }
   }
@@ -732 +734 @@
 
   
-  RenderErrors();
-  RenderInfo();
-
-    if (mRenderViewCells) 
+  if (!mRenderViewCells) {
+        RenderErrors();
+        RenderInfo();
+  } else {
         RenderViewCells();
+
+        mWireFrame = true;
+        RenderScene();
+        mWireFrame = false;
+        RenderInfo();
+  }
 
   mFrame++;
@@ -816 +824 @@
   vl->addWidget(slider);
   slider->show();
-  slider->setRange(1, 10000);
+  slider->setRange(1, 5000);
   slider->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
   slider->setValue(500);
@@ -946 +954 @@
   SetupCamera();
   glEnable(GL_CULL_FACE);
+  //glDisable(GL_CULL_FACE);
   glCullFace(GL_FRONT);
   double eq[4];

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

@@ -30 +30 @@
   environment->GetBoolValue("Preprocessor.loadPolygonsAsMeshes", mLoadPolygonsAsMeshes);
   environment->GetBoolValue("Preprocessor.quitOnFinish", mQuitOnFinish);
+  environment->GetBoolValue("Preprocessor.computeVisibility", mComputeVisibility);
   Debug << "load polygons as meshes: " << mLoadPolygonsAsMeshes << endl;
 

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

@@ -159 +159 @@
   bool mQuitOnFinish;
   bool mLoadPolygonsAsMeshes;
+  bool mComputeVisibility;
 
 protected:

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

@@ -20 +20 @@
 PreprocessorThread::Main()
 {
-     
-  if (1) {
+  
+  if (mPreprocessor->mComputeVisibility) {
     mPreprocessor->ComputeVisibility();
         //      mPreprocessor->ExportPreprocessedData("scene.vis");

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

@@ -1754 +1754 @@
                                                                    const bool createMesh)
 {
-        CreateMesh(viewCell);
-
         float area = 0;
         float volume = 0;
@@ -1772 +1770 @@
                 area += geom.GetArea();
                 volume += geom.GetVolume();
+                CreateMesh(*it);
         }
 
@@ -3592 +3591 @@
                 vm->FinalizeViewCells(true);
 
+                vm->mViewCellsTree->AssignRandomColors();
                 Debug << (int)vm->mViewCells.size() << " view cells loaded" << endl;
         }
@@ -3670 +3670 @@
                                                                           const bool createMesh)
 {
-        CreateMesh(viewCell);
-
         float area = 0;
         float volume = 0;
@@ -3688 +3686 @@
                 area += geom.GetArea();
                 volume += geom.GetVolume();
+                CreateMesh(*it);
         }
 

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

@@ -1826 +1826 @@
                 
                 // clamp because of possible precision issues
-                if (0 && 
+                if (1 && 
                         (!splitSuccessFull || (pFront <= 0) || (pBack <= 0) || 
                         !geomFront.Valid() || !geomBack.Valid()))

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

@@ -13 +13 @@
 #include "Beam.h"
 #include "GlRenderer.h"
+#include "ViewCellBsp.h"
 
 bool use2dSampling = false;
@@ -47 +48 @@
 }
 
+
 VssPreprocessor::~VssPreprocessor()
 {
@@ -52 +54 @@
         DEL_PTR(mViewSpaceBox);
 }
+
 
 void
@@ -155 +158 @@
                 // cast again to ensure that there is no objectA
                 SetupRay(ray, pointB, direction);
-                ray.mFlags |= Ray::CULL_BACKFACES;
+                ray.mFlags |= Ray::CULL_BACKFACESw;
                 
                 if (mKdTree->CastRay(ray)) 
@@ -317 +320 @@
   vssRays.SelectRays(number, rays);
   
-  exporter->ExportRays(rays, RgbColor(1, 0, 0));
+  //exporter->ExportRays(rays, RgbColor(1, 0, 0));
 
   delete exporter;
@@ -401 +404 @@
   }
 }
-#include "ViewCellBsp.h"
+
 
 void VssPreprocessor::TestBeamCasting(VssTree *tree, 

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

@@ -1135 +1135 @@
 void X3dExporter::ExportGeometry(const ObjectContainer &objects)
 {
+#if 0
         for (int j = 0; j < objects.size(); ++ j)
                 ExportIntersectable(objects[j]);
+#else
+        // hack
+        PolygonContainer polys;
+        for (int j = 0; j < objects.size(); ++ j){
+                polys.push_back(new Polygon3(dynamic_cast<MeshInstance *>(objects[j])->GetMesh()->mVertices));
+        }
+
+        Mesh dummyMesh;
+        PolygonContainer::const_iterator it, it_end = polys.end();
+
+        for (it = polys.begin(); it != it_end; ++ it)
+          {
+                (*it)->AddToMesh(dummyMesh);
+          }
+        ExportMesh(&dummyMesh);
+        CLEAR_CONTAINER(polys);
+#endif
 }
 

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

@@ -23 +23 @@
         useGlRenderer true
 #       type sampling
-        type vss
-#       type rss
+#       type vss
+        type rss
         detectEmptyViewSpace true
         pvsRenderErrorSamples 10000
         quitOnFinish false
+        computeVisibility false
 }
 
@@ -39 +40 @@
         loadInitialSamples  false
         storeInitialSamples false
-        useViewSpaceBox true
+        useViewSpaceBox false
         enlargeViewSpace true
 }
@@ -75 +76 @@
 RssPreprocessor {
         samplesPerPass 100000
-        initialSamples 100000
-        vssSamples 100
-        vssSamplesPerPass 100
+        initialSamples 500000
+        vssSamples 5000000
+        vssSamplesPerPass 500000
         useImportanceSampling true
 
@@ -179 +180 @@
         maxStaticMemory 40
 
-        exportToFile true
-        loadFromFile false
+        exportToFile false
+        loadFromFile true
 
         #type kdTree
@@ -213 +214 @@
                 refine false
                 compress false
-                merge false
+                merge true
         }
 
@@ -245 +246 @@
 #       filename ../scripts/viewcells_vienna.xml
 #       filename ../scripts/viewcells_atlanta.xml
-        filename ../scripts/viewcells_soda5.xml
+#       filename ../scripts/viewcells_soda5-2.xml
+#       filename ../data/soda/soda5-viewcells.xml
+        filename ../scripts/viewcells_atlanta.xml
 }