Changeset 487 for trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellsManager.cpp

Timestamp:

01/01/06 06:25:55 (19 years ago)

Author:

mattausch

Message:

fixed bug in raycasting
added valid view point regions, get view point only from valid regions

File:

• trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellsManager.cpp (modified) (13 diffs)

trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellsManager.cpp

@@ -21 +21 @@
 mTotalArea(0.0f)
 {
+        mSceneBox.Initialize();
         ParseEnvironment();
 }
@@ -30 +31 @@
 mVisualizationSamples(0)
 {
+        mSceneBox.Initialize();
         ParseEnvironment();
 }
@@ -81 +83 @@
 
 
+bool ViewCellsManager::GetViewPoint(Vector3 &viewPoint) const
+{
+        viewPoint = mSceneBox.GetRandomPoint();
+
+        return true;
+}
+
+
 void ViewCellsManager::ComputeSampleContributions(const VssRayContainer &rays)
 {
@@ -88 +98 @@
   
         VssRayContainer::const_iterator it, it_end = rays.end();
-        int i = 0;      
+
         for (it = rays.begin(); it != it_end; ++ it) 
-        {       Debug << "here " << i ++ << endl;
+        {       
                 ComputeSampleContributions(*(*it));
-                Debug << "**" << endl;
         }
 }
@@ -104 +113 @@
 
         for (it = mViewCells.begin(); it != it_end; ++ it)
+        {
                 (*it)->UpdateViewCellsStats(mViewCellsStats);
+        }
 }
 
@@ -295 +306 @@
 
 
+void ViewCellsManager::SetViewSpaceBox(const AxisAlignedBox3 &box)
+{
+        mSceneBox = box;
+}
+
+
 void ViewCellsManager::ResetViewCells()
 {
@@ -432 +449 @@
 
 int BspViewCellsManager::Construct(const ObjectContainer &objects, 
-                                                                   const VssRayContainer &rays,
-                                                                   AxisAlignedBox3 *sceneBbox)
+                                                                   const VssRayContainer &rays)
 {
         // if view cells were already constructed
@@ -1024 +1040 @@
 
 int KdViewCellsManager::Construct(const ObjectContainer &objects, 
-                                                                  const VssRayContainer &rays,
-                                                                  AxisAlignedBox3 *sceneBbox)
+                                                                  const VssRayContainer &rays)
 {
         // if view cells already constructed
@@ -1309 +1324 @@
 
 int VspKdViewCellsManager::Construct(const ObjectContainer &objects, 
-                                                                         const VssRayContainer &rays,
-                                                                         AxisAlignedBox3 *sceneBbox)
+                                                                         const VssRayContainer &rays)
 {
         // if view cells already constructed
@@ -1327 +1341 @@
                   << (int)constructionRays.size() << " samples" << endl;
 
-        mVspKdTree->Construct(constructionRays, sceneBbox);
+        mVspKdTree->Construct(constructionRays, &mSceneBox);
         Debug << mVspKdTree->GetStatistics() << endl;
 
@@ -1684 +1698 @@
 
 int VspBspViewCellsManager::Construct(const ObjectContainer &objects, 
-                                                                          const VssRayContainer &rays,
-                                                                          AxisAlignedBox3 *sceneBbox)
+                                                                          const VssRayContainer &rays)
 {
         // if view cells were already constructed
@@ -1697 +1710 @@
 
         GetRaySets(rays, mConstructionSamples, constructionRays, &savedRays);
-        
+
         Debug << "construction rays: " << (int)savedRays.size() << endl;
         Debug << "saved rays: " << (int)constructionRays.size() << endl;
 
-        mVspBspTree->Construct(constructionRays, sceneBbox);
+        mVspBspTree->Construct(constructionRays, &mSceneBox);
+
         Debug << mVspBspTree->GetStatistics() << endl;
-
         ResetViewCells();
 
@@ -1932 +1945 @@
         
 
+bool VspBspViewCellsManager::GetViewPoint(Vector3 &viewPoint) const
+{
+        if (!ViewCellsConstructed())
+                return ViewCellsManager::GetViewPoint(viewPoint);
+
+        const int limit = 10;
+
+        for (int i = 0; i < limit; ++ i)
+        {
+                viewPoint = mSceneBox.GetRandomPoint();
+                if (mVspBspTree->ViewPointValid(viewPoint))
+                        return true;
+        }
+
+        return false;
+}
+
 void VspBspViewCellsManager::ExportSplits(const ObjectContainer &objects,
                                                                                   const VssRayContainer &rays)