Changeset 708

Timestamp:

03/17/06 17:30:28 (18 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/Preprocessing

Files:

• data/sponza (added)
• data/sponza/sponza.x3d (added)
• src/Environment.cpp (modified) (1 diff)
• src/ViewCell.cpp (modified) (7 diffs)
• src/ViewCellsManager.cpp (modified) (5 diffs)
• src/VspBspTree.cpp (modified) (1 diff)

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

@@ -1321 +1321 @@
         RegisterOption("ViewCells.Visualization.colorCode",
                                         optString,
-                                        "view_cells_visualization_color_code",
+                                        "view_cells_visualization_color_code=",
                                         "PVS");
 
         RegisterOption("ViewCells.Visualization.clipPlanePos",
                                         optFloat,
-                                        "view_cells_visualization_clip_plane_pos",
+                                        "view_cells_visualization_clip_plane_pos=",
                                         "0.35");
         
         RegisterOption("ViewCells.Visualization.exportGeometry",
                                         optBool,
-                                        "view_cells_visualization_export_geometry",
+                                        "view_cells_visualization_export_geometry=",
                                         "false");
 
         RegisterOption("ViewCells.Visualization.exportRays",
                                         optBool,
-                                        "view_cells_visualization_export_rays",
+                                        "view_cells_visualization_export_rays=",
                                         "false");
 
         RegisterOption("ViewCells.pruneEmptyViewCells",
                                         optBool,
-                                        "view_cells_prune_empty_view_cells",
+                                        "view_cells_prune_empty=",
                                         "false");
 
         RegisterOption("ViewCells.processOnlyValidViewCells",
                                         optBool,
-                                        "view_cells_process_only_valid_view_cells",
+                                        "view_cells_process_only_valid_view_cells=",
                                         "false");
 

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

@@ -619 +619 @@
         }
 
-        
         // adjust stats and reset queue one final time
         mExpectedCost = realExpectedCost;
@@ -627 +626 @@
         UpdateActiveViewCells(activeViewCells);
 
-        
         // refine view cells and reset costs
         if (mRefineViewCells)
@@ -633 +631 @@
         else
                 ResetMergeQueue();
+
 
         // create a root node if the merge was not done till root level,
@@ -653 +652 @@
                 mRoot = activeViewCells[0];
         }
-
+        
         //-- empty merge queue just in case
         while (!mMergeQueue.empty())
@@ -675 +674 @@
         // assign colors for the view cells so that at least one is always consistent
         AssignRandomColors();
-        
+
         //TODO: should return sample contributions?
         return mergeStats.merged;
@@ -1686 +1685 @@
         
         tqueue.push(mRoot);
+        
         mRoot->SetColor(RandomColor(0.3f, 1.0f));
         
@@ -1718 +1718 @@
 
                                 if (maxViewCell)
+                                {
                                         maxViewCell->SetColor(vc->GetColor());
+                                }
                                 
                                 tqueue.push(v);

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

@@ -1223 +1223 @@
                 ViewCell *viewcell = *it;
 
-                if (viewcell->GetValid())// && mSampleEmptyViewCells) // HACK
+                if (viewcell->GetValid())
                 {
                         // HACK
@@ -3164 +3164 @@
 
         // check if new view cells turned invalid
+        Debug << "setting validity, min: " << mMinPvsSize << " max: " << mMaxPvsSize << endl;
+        cout << "setting validity, min: " << mMinPvsSize << " max: " << mMaxPvsSize << endl;
         SetValidity(mMinPvsSize, mMaxPvsSize); 
         // update valid view space according to valid view cells
-        mVspBspTree->ValidateTree();
+        if (0)
+                mVspBspTree->ValidateTree();
 
         // has to be recomputed
@@ -3183 +3186 @@
         }
 
+        
         //-- merge the individual view cells
         MergeViewCells(postProcessRays, objects);
         
+
         // only for testing
         TestSubdivision();
@@ -3763 +3768 @@
                                 {
                                         exporter->ExportPolygons(back.GetPolys());
-                                }
-                        
+                                }                       
                         }
                 }
@@ -4053 +4057 @@
                 vector<BspLeaf *> leaves;
                 mVspBspTree->CollectLeaves(leaves);
+        
                 mVspBspTree->CollectMergeCandidates(leaves, candidates);
         }

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

@@ -3168 +3168 @@
                         ViewCell *viewCell;
                         
-                        viewCell = mViewCellsTree->GetActiveViewCell(leaf->GetViewCell());
-                        //viewCell = leaf->GetViewCell();
+                        if (0)
+                                viewCell = mViewCellsTree->GetActiveViewCell(leaf->GetViewCell());
+                        else
+                                viewCell = leaf->GetViewCell();
 
                         if (!viewCell->Mailed())