Changeset 1608 for GTP

Timestamp:

10/11/06 00:57:43 (18 years ago)

Author:

bittner

Message:

vsp osp tests

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• GlRenderer.cpp (modified) (1 diff)
• GlRenderer.h (modified) (2 diffs)
• Makefile (modified) (1 diff)
• Preprocessor.cpp (modified) (1 diff)
• QtGlRenderer.cpp (modified) (2 diffs)
• ViewCellsManager.cpp (modified) (2 diffs)
• ViewCellsManager.h (modified) (1 diff)
• default.env (modified) (9 diffs)

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

@@ -284 +284 @@
 GlRenderer::InitGL()
 {
+  mSphere = (GLUquadric *)gluNewQuadric();
+  
   glMatrixMode(GL_PROJECTION);
   glLoadIdentity();

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

@@ -29 +29 @@
 struct VssRayContainer;
 
+  struct GLUquadric;
+  
 struct PvsRenderStatistics {
   
@@ -171 +173 @@
   string mSnapPrefix;
 
+  GLUquadric *mSphere;
+  
   KdTree *mKdTree;
 

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

@@ -1 +1 @@
 #############################################################################
 # Makefile for building: preprocessor
-# Generated by qmake (2.00a) (Qt 4.1.2) on: po 9. X 21:25:05 2006
+# Generated by qmake (2.00a) (Qt 4.1.2) on: út 10. X 22:38:46 2006
 # Project:  preprocessor.pro
 # Template: app

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

@@ -903 +903 @@
                   }
                 if (i % 10000 == 0)
-                  cout<<i<<"/"<<rays.size()<<"\r";
-        }
-        
-
+                  cout<<"\r"<<i<<"/"<<rays.size()<<"\r";
+        }
+        cout<<endl;
+        
         long t2 = GetTime();
 

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

@@ -998 +998 @@
           mWireFrame = true;
           RenderIntersectable(viewcell);
+          glPushMatrix();
+          glTranslatef(mViewPoint.x, mViewPoint.y, mViewPoint.z);
+          gluSphere((::GLUquadric *)mSphere,
+                                1e-3*Magnitude(mViewCellsManager->GetViewSpaceBox().Size()), 6, 6);
+          glPopMatrix();
           mWireFrame = false;
         }
@@ -1610 +1615 @@
 QtGlRendererWidget::SetViewCellGranularity(int number)
 {
-  if (mViewCellsManager) 
+  if (mViewCellsManager) {
         //      mViewCellsManager->SetMaxFilterSize(number);
     mViewCellsManager->CollectViewCells(number);
 
+        // $$ does not work so far:(
+        //      mViewCellsManager->UpdatePvsForEvaluation();
+        //      mViewCellsManager->FinalizeViewCells(false);
+  }
   updateGL();
 }

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

@@ -30 +30 @@
 
 // $$JB HACK
-#define USE_KD_PVS 1
-#define KD_PVS_AREA 1e-3f
+#define USE_KD_PVS 0
+#define KD_PVS_AREA 1e-4f
 
 namespace GtpVisibilityPreprocessor {
@@ -2472 +2472 @@
 
 
+void
+ViewCellsManager::UpdatePvsForEvaluation()
+{
+  ObjectPvs objPvs;
+  UpdatePvsForEvaluation(mViewCellsTree->GetRoot(), objPvs);
+}
+
 void ViewCellsManager::UpdatePvsForEvaluation(ViewCell *root, ObjectPvs &pvs)
 {

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

@@ -534 +534 @@
   }
 
+  void UpdatePvsForEvaluation();
+
 protected:
 

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

@@ -6 +6 @@
 Scene {
 
+#filename ../data/arena/export.obj
+
 # filename ../data/City4M/City4M.obj
-filename ../data/CityModel/CityModel.obj
+# filename ../data/CityModel/CityModel.obj
 # filename ../data/GrandCanyon/grandcanyon1_RotXmin90.obj
 # filename ../data/glasgow/glasgow1.x3d
@@ -14 +16 @@
 # filename ../data/vienna/vienna-buildings.x3d
 # filename ../data/vienna/city1500_flat_1.x3d
-filename ../data/vienna/vienna-buildings.x3d;../data/vienna/vienna-roofs.x3d;../data/vienna/vienna-roads.x3d
+#filename ../data/vienna/vienna-buildings.x3d;../data/vienna/vienna-roofs.x3d;../data/vienna/vienna-roads.x3d
 
 # ../data/vienna/vienna-plane.x3d;
 # filename ../data/vienna/viewcells-25-sel.x3d
 #filename ../data/atlanta/atlanta2.x3d
-#filename ../data/soda/soda.dat
+filename ../data/soda/soda.dat
 #filename ../data/test1/test2.x3d
 #filename ../data/soda/soda5.dat
@@ -53 +55 @@
         applyVisibilitySpatialFilter false
         visibilityFilterWidth   0.01
+        exportVisibility true
         visibilityFile visibility.xml
         loadMeshes false
@@ -76 +79 @@
         samplesPerPass 1000
         initialSamples 1000000
-        vssSamples 50000000
+        vssSamples 10000000
         vssSamplesPerPass 1000000
         useImportanceSampling true
@@ -145 +148 @@
                 minCost 4
                 maxDepth 30
-                maxCostRatio 0.99
+                maxCostRatio 1.0
                 ct_div_ci 0.5
                 maxNodes 300000
@@ -246 +249 @@
         }
 
+#       filename ../data/arena/viewcells-5000.xml
+
 #       filename ../data/atlanta/atlanta_viewcells_large.x3d
 #       filename ../data/vienna/viewcells-25-sel.x3d
@@ -255 +260 @@
 #       filename ../data/soda/soda5-viewcells.xml
 #       filename ../scripts/viewcells_atlanta.xml
-#       filename ../data/soda/soda-viewcells-5000.xml
+        filename ../data/soda/soda-viewcells-5000.xml
 #       filename ../data/test1/test-viewcells.xml
 
 #       filename ../data/soda/soda5-viewcell-single.xm
 #       filename ../data/soda/soda-viewcells-1000.xml.zip
+#       filename ../data/soda/soda-viewcells-vsposp.xml
+
+
 #       filename ../data/CityModel/CityModel-viewcells-5000.xml
 #       filename ../data/City4M/City4M-viewcells-5000.xml
@@ -272 +280 @@
 #       filename ../data/vienna/vienna_simple-21-04-avs2-viewCells.xml
 #       filename ../data/vienna/vienna-viewcells-5000.xml
-        filename ../data/vienna/vienna-viewcells-1000.xml.zip
+#       filename ../data/vienna/vienna-viewcells-1000.xml.zip
 #       filename ../data/vienna/vsposp-seq-viewCells.xml.gz
+
+#       filename ../data/vienna/city1500_flat_viewcells-1000.xml
+#       filename ../data/vienna/city1500_flat-vsposp.xml
+#       filename ../data/vienna/vienna-simple-vsposp.xml
 
 #       filename ../data/PowerPlant/power_plant_viewcells1.xml
@@ -338 +350 @@
 #               minGlobalCostRatio      0.0001
 # $$MAXVIEWCELLS
-                maxViewCells            5000
+                maxViewCells            1000