Changeset 639 for GTP/trunk/Lib/Vis/Preprocessing/src/VspBspTree.cpp

Timestamp:

02/14/06 17:13:42 (18 years ago)

Author:

mattausch

Message:

 

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/VspBspTree.cpp (modified) (6 diffs)

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

@@ -18 +18 @@
 #include "Beam.h"
 
+#define USE_FIXEDPOINT_T 0
+
 
 //-- static members
@@ -66 +68 @@
 mViewCellsManager(NULL),
 mOutOfBoundsCell(NULL),
-mStoreRays(false),
+mStoreRays(true),
 mRenderCostWeight(0.5),
 mUseRandomAxis(false),
@@ -602 +604 @@
                         RayInfoContainer::const_iterator it, it_end = tData.mRays->end();
                         for (it = tData.mRays->begin(); it != it_end; ++ it)
+                        {
+                                (*it).mRay->Ref();                      
                                 leaf->mVssRays.push_back((*it).mRay);
+                        }
                 }
 
@@ -1886 +1891 @@
 
 
+void VspBspTree::CollectRays(VssRayContainer &rays)
+{
+        vector<BspLeaf *> leaves;
+
+        vector<BspLeaf *>::const_iterator lit, lit_end = leaves.end();
+
+        for (lit = leaves.begin(); lit != lit_end; ++ lit)
+        {
+                BspLeaf *leaf = *lit;
+                VssRayContainer::const_iterator rit, rit_end = leaf->mVssRays.end();
+
+                for (rit = leaf->mVssRays.begin(); rit != rit_end; ++ rit)
+                        rays.push_back(*rit);
+        }
+}
+
+
 void VspBspTree::ValidateTree()
 {
@@ -1988 +2010 @@
                                                   RayInfoContainer &rays,
                                                   RayInfoContainer &frontRays,
-                                                  RayInfoContainer &backRays)
+                                                  RayInfoContainer &backRays) const
 {
         int splits = 0;
@@ -2015 +2037 @@
                         {
                                 //-- split ray
-                                //-- test if start point behind or in front of plane
+                                //   test if start point behind or in front of plane
                                 const int side = plane.Side(bRay.ExtrapOrigin());