Changeset 1144 for GTP/trunk/Lib/Vis/Preprocessing/src/VspOspTree.cpp

Timestamp:

07/20/06 09:51:26 (18 years ago)

Author:

mattausch

Message:

 

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/VspOspTree.cpp (modified) (17 diffs)

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

@@ -947 +947 @@
                 if (obj) 
                 {
-                        // potentially visible kd cells
                         if (mStoreKdPvs)
                         {
+                                // potentially visible kd cells
                                 KdLeaf *leaf = mOspTree->GetLeaf(ray->mTermination, ray->mTerminationNode);
                                 AddKdLeafToPvs(leaf, vc, ray->mPdf, contribution);
@@ -1076 +1076 @@
                 // add objects without the objects which are in several kd leaves
                 pvsSize += (int)(leaf->mObjects.size() - leaf->mMultipleObjects.size());
+                //Debug << "here11 " << (int)leaf->mObjects.size() << " " << leaf->mMultipleObjects.size() << endl;
         }
         else
@@ -1116 +1117 @@
         RayInfoContainer::const_iterator ri, ri_end = rays.end();
 
-        //-- set all kd nodes as belonging to the front pvs
+        //-- set all kd nodes / objects as belonging to the front pvs
 
         for (ri = rays.begin(); ri != ri_end; ++ ri)
@@ -1214 +1215 @@
                 Intersectable *object = *oit;
 
-                // object not previously in left pvs
+                // object not previously in pvs
                 if (!object->Mailed())
                 {
@@ -1946 +1947 @@
         nodeStack.push(mRoot);
 
-        const AxisAlignedBox3 box = GetBBox(n);
+        const AxisAlignedBox3 box = GetBoundingBox(n);
 
         while (!nodeStack.empty())
@@ -2007 +2008 @@
                         VspNode *next;
                         
-                        if (GetBBox(interior->GetBack()).Side(plane) < 0)
+                        if (GetBoundingBox(interior->GetBack()).Side(plane) < 0)
                         {
                                 next = interior->GetFront();
@@ -2013 +2014 @@
             else
                         {
-                                if (GetBBox(interior->GetFront()).Side(plane) < 0)
+                                if (GetBoundingBox(interior->GetFront()).Side(plane) < 0)
                                 {
                                         next = interior->GetBack();
@@ -2549 +2550 @@
 
 
-AxisAlignedBox3 VspTree::GetBBox(VspNode *node) const
+AxisAlignedBox3 VspTree::GetBoundingBox(VspNode *node) const
 {
         if (!node->GetParent())
@@ -2584 +2585 @@
                 nodeStack.pop();
 
-                const AxisAlignedBox3 bbox = GetBBox(node);
+                const AxisAlignedBox3 bbox = GetBoundingBox(node);
 
                 if (bbox.Includes(box))
@@ -3693 +3694 @@
 
 
-AxisAlignedBox3 OspTree::GetBBox(KdNode *node) const
+AxisAlignedBox3 OspTree::GetBoundingBox(KdNode *node) const
 {
         if (!node->mParent)
@@ -3814 +3815 @@
 KdLeaf *OspTree::GetLeaf(const Vector3 &pt, KdNode *node) const
 {
+        // start from root of tree
         if (node == NULL)
         {
@@ -3835 +3837 @@
                 else    
                 {       
+                        // find point
                         KdInterior *interior = dynamic_cast<KdInterior *>(node);
         
-                        // random decision
-                        if (interior->mPosition < pt[interior->mAxis])
+                        if (interior->mPosition > pt[interior->mAxis])
                         {
                                 nodeStack.push(interior->mBack);
@@ -3942 +3944 @@
 {
         // search nodes
-        std::map<KdNode *, KdIntersectable *>::const_iterator it = mKdIntersectables.find(node);
+        std::map<KdNode *, KdIntersectable *>::
+                const_iterator it = mKdIntersectables.find(node);
 
         if (it != mKdIntersectables.end()) 
@@ -4054 +4057 @@
                                                                                           RayInfoContainer &rays)
 {
-        // get clipped rays
-        mOspTree.ProcessRays(sampleRays, rays);
-
         // store pointer to this tree
         OspTree::OspSplitCandidate::sOspTree = &mOspTree;
         mOspTree.mOspStats.nodes = 1;
         
+        // compute bounding box from objects
         mOspTree.ComputeBoundingBox(objects, forcedObjectSpace);
 
@@ -4066 +4067 @@
         mGlobalCostMisses = 0;
 
+        // get clipped rays
+        mOspTree.ProcessRays(sampleRays, rays);
 
         // add first candidate for view space partition
@@ -4086 +4089 @@
 
                 
-        //mOspTree.ProcessMultipleRefs(NULL, kdleaf, NULL);
-
         // compute first split candidate
         OspTree::OspSplitCandidate *oSplitCandidate = 
                 new OspTree::OspSplitCandidate(oData);
+
     mOspTree.EvalSplitCandidate(*oSplitCandidate);
 
@@ -4252 +4254 @@
         /////////////////////////////////////////////////////////////
 
-
+        Debug << "**************** osp construction **************" << endl;
         cout << "starting osp contruction ... " << endl;
+
         startTime = GetTime();