Changeset 2606 for GTP/trunk/Lib/Vis/Preprocessing/src/ViewCellsManager.cpp

Timestamp:

01/17/08 15:56:37 (16 years ago)

Author:

bittner

Message:

merge on nemo

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/ViewCellsManager.cpp (modified) (4 diffs)

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

@@ -2474 +2474 @@
 int ViewCellsManager::GetNumViewCells() const
 {
-        return (int)mViewCells.size();
+  return (int)mViewCells.size();
 }
 
@@ -2493 +2493 @@
                   
                   // set only the termination object
+                  //              if (vssRay->mTerminationObject == NULL) 
+                  //                    cerr<<"Error NULL termination object!"<<endl;
                   vssRay->mTerminationObject = GetIntersectable(*vssRay, true);
-                }
-        }
+#if 0
+                  if (vssRay->mTerminationObject == NULL) {
+                        cerr<<"Error in DeterminePvsObjects - termination object maps to NULL!"<<endl;
+                  }
+#endif
+                }
+        }
+  
 }
 
@@ -3247 +3255 @@
                 for (int i = 0; it != it_end; ++ it, ++ i)
                 {
-                        if ((*it) != viewCell) 
+                  if ((*it) != viewCell) 
                         {
-                                //cout<<"v"<<i<<" pvs="<<(*it)->GetPvs().mEntries.size()<<endl;
-                                basePvs.MergeInPlace((*it)->GetPvs());
+                          //cout<<"v"<<i<<" pvs="<<(*it)->GetPvs().mEntries.size()<<endl;
+                          basePvs.MergeInPlace((*it)->GetPvs());
                         }
-
-                        // update samples and globalC
-                        samples = (float)pvs.GetSamples();
-                        //      cout<<"neighboring viewcells = "<<i-1<<endl;
-                        //      cout<<"Samples' = "<<samples<<endl;
+                  
+                  // update samples and globalC
+                  samples = (float)pvs.GetSamples();
+                  //    cout<<"neighboring viewcells = "<<i-1<<endl;
+                  //    cout<<"Samples' = "<<samples<<endl;
                 }
         }
@@ -3342 +3350 @@
 
                         if (filteredBoxes)
-                                filteredBoxes->push_back(box);
-
+                          filteredBoxes->push_back(box);
+                        
                         objects.clear();
 
                         // $$ warning collect objects takes only unmailed ones!
-                        if (mUseKdPvs) 
-                                GetPreprocessor()->mKdTree->CollectKdObjects(box, objects);
-                        else
-                                CollectObjects(box, objects);
-
+                        if (mUseKdPvs) {
+                          //                      GetPreprocessor()->mKdTree->CollectKdObjects(box, objects);
+                          GetPreprocessor()->mKdTree->CollectSmallKdObjects(box, objects, 0.1f);
+
+                        } else
+                          CollectObjects(box, objects);
+                        
                         //      cout<<"collected objects="<<objects.size()<<endl;
                         ObjectContainer::const_iterator noi = objects.begin();
                         for (; noi != objects.end(); ++ noi) 
-                        {
+                          {
                                 Intersectable *o = *noi;
                                 // $$ JB warning: pdfs are not correct at this point!