Changeset 1588 for GTP/trunk/Lib

Timestamp:

10/09/06 17:07:02 (18 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• SamplingStrategy.cpp (modified) (1 diff)
• ViewCellsManager.cpp (modified) (4 diffs)
• VspTree.cpp (modified) (4 diffs)

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

@@ -36 +36 @@
         Vector3 normal;
           
-        const int i = (int)RandomValue(0, float((int)mPreprocessor.mObjects.size() - 1));
+        const int i = (int)RandomValue(0, (float)mPreprocessor.mObjects.size() - 0.5f);
 
         Intersectable *object = mPreprocessor.mObjects[i];

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

@@ -4934 +4934 @@
         //-- compression
 
-//#if HAS_TO_BE_REDONE
         if (ViewCellsTreeConstructed() && mCompressViewCells)
         {
@@ -4945 +4944 @@
                 Debug << "number of entries after compress: " << pvsEntries << endl;
         }
-//#endif
 
         /////////////
@@ -5399 +5397 @@
         if (!ViewCellsConstructed())
                 return NULL;
+
         if (!mViewSpaceBox.IsInside(point))
                 return NULL;
+
         return mHierarchyManager->GetVspTree()->GetViewCell(point, active);
 }
@@ -5684 +5684 @@
         cout << "finished" << endl;
 
+        if (0)
+        for (int i = 0; i <50; ++ i)
+        {
+                Vector3 point = GetViewSpaceBox().GetRandomPoint();
+                ViewCell *vc = GetViewCell(point);
+        }
         disposeRays(evaluationSamples, NULL);
 }

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

@@ -374 +374 @@
 
 
-
 VspLeaf::VspLeaf(VspInterior *parent, ViewCellLeaf *viewCell): 
 VspNode(parent), mViewCell(viewCell), mPvs(NULL)
@@ -380 +379 @@
 }
 
+
 ViewCellLeaf *VspLeaf::GetViewCell() const
 {
         return mViewCell;
 }
+
 
 void VspLeaf::SetViewCell(ViewCellLeaf *viewCell)
@@ -2498 +2499 @@
                 if (node->IsLeaf()) 
                 {
+                        /*const AxisAlignedBox3 box = GetBoundingBox(dynamic_cast<VspLeaf *>(node));
+                        if (!box.IsInside(point))
+                                cerr << "error, point " << point << " should be in view cell " << box << endl;
+                        */      
                         viewcell = dynamic_cast<VspLeaf *>(node)->GetViewCell();
                         break;
@@ -2507 +2512 @@
                         // random decision
                         if (interior->GetPosition() - point[interior->GetAxis()] < 0)
+                        {
+                                nodeStack.push(interior->GetFront());
+                        }
+                        else
+                        {
                                 nodeStack.push(interior->GetBack());
-                        else
-                                nodeStack.push(interior->GetFront());
+                        }
                 }
         }