Changeset 303 for trunk/VUT

Timestamp:

10/03/05 16:10:35 (19 years ago)

Author:

mattausch

Message:

debug variant of scen geometry bsp insertion

Location:

trunk/VUT/GtpVisibilityPreprocessor

Files:

• scripts/default.env (modified) (3 diffs)
• src/Preprocessor.cpp (modified) (2 diffs)
• src/ViewCellBsp.cpp (modified) (12 diffs)
• src/ViewCellBsp.h (modified) (1 diff)
• src/main.cpp (modified) (3 diffs)

trunk/VUT/GtpVisibilityPreprocessor/scripts/default.env

@@ -8 +8 @@
 #       filename glasgow1.x3d
 #       filename vienna.x3d
-        filename ../data/vienna/vienna-simple.x3d
-#       filename ../data/vienna/viewcells-25-sel.x3d
+#       filename ../data/vienna/vienna-simple.x3d
+        filename ../data/vienna/viewcells-25-sel.x3d
 #       filename ../data/atlanta/atlanta2.x3d
 #       filename ../data/soda/soda.dat
@@ -15 +15 @@
 #       viewcells ../data/atlanta/atlanta_viewcells_large.x3d
 #       viewcells ../data/atlanta/atlanta_viewcells_large2.x3d
-#       viewcells ../data/vienna/viewcells-25-sel.x3d
-        viewcells ../data/vienna/viewcells-25.x3d
+        viewcells ../data/vienna/viewcells-25-sel.x3d
+#       viewcells ../data/vienna/viewcells-25.x3d
 #       viewcells ../data/vienna/viewcells-large-sel.x3d
 }
@@ -75 +75 @@
         # least splits + balanced polygons
         #splitPlaneStrategy 12
+        splitPlaneStrategy 32
         #axis aligned + vertical axis
-        splitPlaneStrategy 66
+        #splitPlaneStrategy 66
+        
         # axis aligned + balanced view cells
         # splitPlaneStrategy 18
+        
         # largest polygon area
         #splitPlaneStrategy 32
+        
         # axus aligned + balanced polygons
         #splitPlaneStrategy 72
+        
 #       constructionMethod rays
-        constructionMethod viewCells
-#       constructionMethod sceneGeometry
+#       constructionMethod viewCells
+        constructionMethod sceneGeometry
         maxCandidates 25
         maxViewCells 999999
         Termination {
-                maxPolysForAxisAligned 200
-                maxPolygons 0
+                maxPolysForAxisAligned 50
+                maxPolygons 5
                 maxDepth 100
         }

trunk/VUT/GtpVisibilityPreprocessor/src/Preprocessor.cpp

@@ -95 +95 @@
         ObjectContainer objects;
         RayContainer rays;
-
+ViewCellContainer dummy;
         switch (BspTree::sConstructionMethod)
         {
@@ -102 +102 @@
                 break;
         case BspTree::SCENE_GEOMETRY:
+#if 0
                 CLEAR_CONTAINER(mViewCells); // we generate new view cells
-
                 mSceneGraph->CollectObjects(&objects);
                 mBspTree->Construct(objects, &mViewCells);
+#else
+                for (int i=0; i< mViewCells.size(); ++i)
+                        objects.push_back(mViewCells[i]);
+                
+                mBspTree->Construct(objects, &dummy);
+#endif
                 break;
         case BspTree::RAYS:

trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellBsp.cpp

@@ -22 +22 @@
 float BspTree::sCt_div_ci = 1.0f;
 float BspTree::sSplitBorder = 1.0f;
-float BspTree::sMaxCostRatio = 0.9;
+float BspTree::sMaxCostRatio = 0.9f;
 
 //-- factors for bsp tree split plane heuristics
@@ -260 +260 @@
 mRoot(NULL), 
 mViewCell(viewCell),
-//mStorePolys(true)
-mStorePolys(false)
+mStorePolys(true)
+//mStorePolys(false)
 {
         Randomize(); // initialise random generator for heuristics
@@ -437 +437 @@
                 else // reached leaf => subdivide current viewcell
                 {
-                        if (tData.mPolygons->size() > 0)
-                                Debug << "Subdividing further: polygon size: " << (int)tData.mPolygons->size() << ", view cell: " << tData.mViewCell << endl;
+                        //if (tData.mPolygons->size() > 0)
+                        //      Debug << "Subdividing further: polygon size: " << (int)tData.mPolygons->size() << ", view cell: " << tData.mViewCell << endl;
 
                         BspNode *root = Subdivide(tStack, tData, viewCells);            
@@ -504 +504 @@
                         // TODO: handle transformed mesh instances
                 default:
+                        Debug << "intersectable type not supported" << endl;
                         break;
                 }
@@ -528 +529 @@
         // construct tree from viewcell polygons
         Construct(polys);
-        //Export("bsp.x3d");
 }
 
@@ -542 +542 @@
         mStat.polys = Copy2PolygonSoup(objects, *polys);
 
+        bool tmpStorePolys = mStorePolys;
+        mStorePolys = false;
+
         // construct tree from polygon soup
         Construct(polys, viewCells);
+
+        mStorePolys = tmpStorePolys;
+        // filter scene bounding box down the tree in order to store split polygons
+        if (mStorePolys)
+        {
+                Mesh *polyMesh = new Mesh();
+
+                for (int i = 0; i < 6; ++i)
+                        polyMesh->AddRectangle(mBox.GetFace(i));
+
+                PolygonContainer *polys = new PolygonContainer();
+                                AddMesh2Polygons(polyMesh, *polys, NULL);
+                
+                InsertPolygons(polys);
+
+                delete polyMesh;
+        }
 }
 
@@ -585 +605 @@
         if ((tData.mPolygons->size() <= sTermMaxPolygons) || (tData.mDepth >= sTermMaxDepth))
         {
-//#ifdef _DEBUG
+#ifdef _DEBUG
                 Debug << "subdivision terminated at depth " << tData.mDepth << ", #polys: " << (int)tData.mPolygons->size() << endl;
-//#endif
+#endif
 
                 EvaluateLeafStats(tData);
@@ -602 +622 @@
                 }
                 //-- add viewcell stored in split polygon
-                else
-                {
-                        if (leaf->GetViewCell())
-                                Debug << "ERROR: leaf already has view cell " << endl;//leaf->mViewCellIdx << endl;
-
-                        //leaf->mViewCellIdx = counter; Debug << "insert view cell " << tData.mViewCell << endl;
+                else if (leaf->GetViewCell())
                         leaf->SetViewCell(tData.mViewCell);
-                }
-        
+                //else Debug << "Leaf already has view cell " << endl;
+
                 // remaining polygons are discarded or added to node
                 tData.mNode->ProcessPolygons(tData.mPolygons, mStorePolys);
@@ -635 +650 @@
         
     if (!viewCells)
-        {
+        {       // extract the pointer to the view cells
                 ExtractViewCells(&backViewCell,
                                                  &frontViewCell,
@@ -643 +658 @@
                                                  backPolys->empty());
         }
-    
+        
         // don't need coincident polygons anymore
         interior->ProcessPolygons(&coincident, mStorePolys);
@@ -683 +698 @@
                         foundFront = true;
                 }
+                //if (foundFront) Debug << "front viewCell: " << *frontViewCell << endl;
+                //if (foundBack) Debug << "back viewCell: " << *backViewCell << endl;
         }
 }
@@ -921 +938 @@
         {
                 Vector3 tinyAxis(0,0,0); tinyAxis[mBox.Size().TinyAxis()] = 1.0f;
-                // want to put a penalty on the dot product between the "tiny" vertical axis
+                // we put a penalty on the dot product between the "tiny" vertical axis
                 // and the split plane axis
+                // NOTE: weight with poly size because vertical split more important if too many polygons
                 val += sVerticalSplitsFactor * 
                            fabs(DotProd(candidatePlane.mNormal, tinyAxis)) * (float)polys.size();

trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellBsp.h

@@ -513 +513 @@
 
         /// if polygons should be stored in the tree
-        bool mStorePolys;
+        bool mStoreSplitPolys;
 
         /// view cell corresponding to unbounded space

trunk/VUT/GtpVisibilityPreprocessor/src/main.cpp

@@ -40 +40 @@
 
   // if BSP tree construction method needs predefined view cells
-  if (BspTree::sConstructionMethod == BspTree::VIEW_CELLS)
+
+  if (1)//(BspTree::sConstructionMethod == BspTree::VIEW_CELLS)
   {
           if (vcFilename != "")
@@ -52 +53 @@
   p->BuildBspTree();
   p->BspTreeStatistics(Debug);
-  p->Export("vc_bsptree.x3d", false, false, true);
+  p->Export("vc_bsptree2.x3d", false, false, true);
 
+#if 0
   //-- export the complementary view cells
   // i.e., the view cells not associated with leafs in the tree.
@@ -70 +72 @@
   if (exporter) 
   {     
+          Debug << Exporting complementary view cells" << endl;
           exporter->ExportViewCells(&vc_compl); // export view cells
           delete exporter;
   }
+#endif
 
 #endif