Changeset 344 for trunk

Timestamp:

10/21/05 04:01:49 (19 years ago)

Author:

mattausch

Message:

 

Location:

trunk/VUT

Files:

• GtpVisibilityPreprocessor/scripts/default.env (modified) (6 diffs)
• GtpVisibilityPreprocessor/src/Polygon3.cpp (modified) (2 diffs)
• GtpVisibilityPreprocessor/src/SamplingPreprocessor.cpp (modified) (4 diffs)
• GtpVisibilityPreprocessor/src/ViewCellBsp.h (modified) (1 diff)
• GtpVisibilityPreprocessor/src/main.cpp (modified) (1 diff)
• scripts/GtpVisibility.suo (modified) (previous)

trunk/VUT/GtpVisibilityPreprocessor/scripts/default.env

@@ -8 +8 @@
 #       filename glasgow1.x3d
 #       filename vienna.x3d
-#       filename ../data/vienna/vienna-simple.x3d
-        filename ../data/vienna/vienna-buildings.x3d
+        filename ../data/vienna/vienna-simple.x3d
+#       filename ../data/vienna/vienna-buildings.x3d
 #       filename ../data/vienna/viewcells-25-sel.x3d
 #       filename ../data/atlanta/atlanta2.x3d
@@ -56 +56 @@
 
 Sampling {
-        totalSamples    1000000
+        totalSamples    100
         samplesPerPass  20
 }
@@ -69 +69 @@
         
 #       filename ../data/atlanta/atlanta_viewcells_large.x3d
-        filename ../data/vienna/viewcells-25-sel.x3d
-#       filename ../data/vienna/viewcells-25.x3d
+#       filename ../data/vienna/viewcells-25-sel.x3d
+        filename ../data/vienna/viewcells-25.x3d
 #       filename ../data/vienna/viewcells-large-sel.x3d
 }
@@ -76 +76 @@
 BspTree {
         Construction {
-                input fromRays
-        #       input fromViewCells
+        #       input fromRays
+                input fromViewCells
         #       input fromSceneGeometry
                 samples 200000
-                sideTolerance 0.002
+                sideTolerance 0.005
         }
 
@@ -113 +113 @@
         #splitPlaneStrategy 130
         
-        splitPlaneStrategy 130
+        splitPlaneStrategy 66
         
         maxCandidates 50
@@ -120 +120 @@
                 # autopartition
                 maxRays -1
-                maxPolygons 20
+                maxPolygons 0
                 maxDepth 100
                 
                 #axis aligned split
-                maxPolysForAxisAligned 200
+                maxPolysForAxisAligned 100
                 maxCostRatio 0.9
                 ct_div_ci 0.5

trunk/VUT/GtpVisibilityPreprocessor/src/Polygon3.cpp

@@ -169 +169 @@
                 // 3 vertices enough to decide coincident
                 else if (((++ count) >= 3) && !onFrontSide && !onBackSide)
-                {   
+                {   //if (DotProd(plane.mNormal, GetNormal()) > 0)
                         return Plane3::COINCIDENT; 
                 }
@@ -182 +182 @@
                 return Plane3::FRONT_SIDE;
         }
-
+        //if (DotProd(plane.mNormal, GetNormal()) < 0) return Plane3::FRONT_SIDE;
         return Plane3::COINCIDENT; // plane and polygon are coincident
 }

trunk/VUT/GtpVisibilityPreprocessor/src/SamplingPreprocessor.cpp

@@ -579 +579 @@
     delete exporter;
   }
-  
+  //-- several visualizations and statistics
   if (1) {
   if (mViewCellsType == BSP_VIEW_CELLS)
@@ -606 +606 @@
                           exporter->ResetForcedMaterial();
 
-                          if (1)
+                          // export scene geometry
+                          if (0)
                           {
                                   Material m;//= RandomMaterial();
@@ -654 +655 @@
                   exporter->SetForcedMaterial(m);
 
-                  // output pvs of view cell
+                  // output PVS of view cell
                   for (; it != vc->GetPvs().mEntries.end(); ++ it) 
                   {
@@ -665 +666 @@
                   }
                 
-                  // output rest of the objects
-                  if (1)
+                  // output rest of the sobjects
+                  if (0)
                   {
                           Material m;//= RandomMaterial();

trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellBsp.h

@@ -598 +598 @@
         /// view cell corresponding to unbounded space
         ViewCell *mRootCell;
-
+        /// should view cells be stored or generated in the leaves?
         bool mGenerateViewCells;
 

trunk/VUT/GtpVisibilityPreprocessor/src/main.cpp

@@ -101 +101 @@
   }
 
-  if (1) {
+  if (0) {
     Camera camera;
     //camera.LookAtBox(p->mKdTree->GetBox());