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

Timestamp:

08/21/07 19:37:28 (17 years ago)

Author:

mattausch

Message:

 

File:

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

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

@@ -528 +528 @@
                                                                                  SimpleRay &ray)
 {
-        // do not use this function since it could return different viewpoints for
-        // different executions of the algorithm
+        // do not use this function since it could return different 
+        // viewpoints for different executions of the algorithm
+
         int tries = 0;
         Vector3 viewPoint, direction;
@@ -542 +543 @@
         Mesh *mesh = viewCell->GetMesh();
                 AxisAlignedBox3 box = mesh->mBox;
-                //cout <<"box: " << box << endl;
-                /*Vector3 pVector = Vector3(halton.GetNumber(1),
-                                                                  halton.GetNumber(2),
-                                                                  halton.GetNumber(3));*/
-
+                
                 Vector3 pVector = Vector3(Random(1.0f),
                                                                   Random(1.0f),
@@ -553 +550 @@
                 viewPoint =  box.GetPoint(pVector);
         
-                //const Vector3 dVector = Vector3(2 * M_PI * halton.GetNumber(4), M_PI*halton.GetNumber(5),0.0f);
                 const Vector3 dVector = Vector3(2 * M_PI * Random(1.0f), M_PI * Random(1.0f), 0.0f);
                 direction = Normalize(Vector3(sin(dVector.x), 0.0f, cos(dVector.x)));
-                //halton.GenerateNext();
 
                 ViewCell *v = GetViewCell(viewPoint);
@@ -564 +559 @@
                         mPreprocessor->GetRenderer()->mViewPoint = viewPoint;
                         mPreprocessor->GetRenderer()->mViewDirection = direction;
-                        //mPreprocessor->GetRenderer()->EvalPvsStat();
-
+                
                         if (mPreprocessor->GetRenderer()->ValidViewPoint())
                         {
@@ -574 +568 @@
                 }
 
-                // generate a new vector
-                //halton.GenerateNext();
-
-                //if (!box.IsInside(viewPoint))
-                //      cout << "error!" << endl;
                 if (++ tries > maxTries)
                 {
@@ -672 +661 @@
 
         DEL_PTR(mMixtureDistribution);
-        
         CLEAR_CONTAINER(mViewCellPoints);
 }
@@ -829 +817 @@
         
         // mix of sampling strategies
+#if 0
         vector<int>dummy;
-        //dummy.push_back(SamplingStrategy::OBJECT_BASED_DISTRIBUTION);
-        //dummy.push_back(SamplingStrategy::SPATIAL_BOX_BASED_DISTRIBUTION);
-        //dummy.push_back(SamplingStrategy::REVERSE_OBJECT_BASED_DISTRIBUTION);
-
+        dummy.push_back(SamplingStrategy::OBJECT_BASED_DISTRIBUTION);
+        dummy.push_back(SamplingStrategy::SPATIAL_BOX_BASED_DISTRIBUTION);
+        dummy.push_back(SamplingStrategy::REVERSE_OBJECT_BASED_DISTRIBUTION);
+#endif
         CastPassSamples(mInitialSamples, mStrategies, initialSamples);
 
@@ -1032 +1021 @@
         if (!Debug.is_open()) Debug.open("debug.log");
 
+        Debug << "here23" << endl;
         // give just an empty container as parameter:
         // this loading function is used in the engine, thus it
@@ -1045 +1035 @@
 
 
-void ViewCellsManager::LoadIndexedBoundingBoxes(IN_STREAM &stream, IndexedBoundingBoxContainer &iboxes)
-{
-        Vector3 bmin;
-        Vector3 bmax;
-        int id;
-
-        stream.read(reinterpret_cast<char *>(&bmin), sizeof(Vector3));
-        stream.read(reinterpret_cast<char *>(&bmax), sizeof(Vector3));
-        stream.read(reinterpret_cast<char *>(&id), sizeof(int));
-
-        AxisAlignedBox3 box(bmin, bmax);
-
-        iboxes.push_back(IndexedBoundingBox(id, box));
-        //Debug << "bbox: " << box << endl;
-}
-
-
-ViewCellsManager *ViewCellsManager::LoadViewCellsBin(const string &filename, 
-                                                                                                         ObjectContainer &pvsObjects,
-                                                                                                         ObjectContainer &preprocessorObjects,
-                                                                                                         bool finalizeViewCells,
-                                                                                                         BoundingBoxConverter *bconverter)
-{
-        IN_STREAM stream(filename.c_str());
-        
-        IndexedBoundingBoxContainer iboxes;
-        LoadIndexedBoundingBoxes(stream, iboxes);
-
-        if (bconverter)
-        {
-                // all bounding boxes gathered in this step => 
-                // associate object ids with bounding boxes
-                bconverter->IdentifyObjects(iboxes, pvsObjects);
-        }
-
-        // sort objects by id
-        sort(pvsObjects.begin(), pvsObjects.end(), ilt);
-
-        ViewCellsTree *vcTree = new ViewCellsTree();
-        VspTree *vspTree = new VspTree();
-
-        HierarchyManager *hm = new HierarchyManager(0);
-
-        vspTree->ImportBinary(stream, pvsObjects);
-        
-        VspOspViewCellsManager *vcm = new VspOspViewCellsManager(vcTree, hm);
-
-        return vcm;
+void ViewCellsManager::LoadIndexedBoundingBoxesBinary(IN_STREAM &stream, IndexedBoundingBoxContainer &iboxes)
+{
+        int numBoxes;
+        stream.read(reinterpret_cast<char *>(&numBoxes), sizeof(int));
+
+        for (int i = 0; i < numBoxes; ++ i)
+        {
+                Vector3 bmin;
+                Vector3 bmax;
+                int id;
+
+                stream.read(reinterpret_cast<char *>(&bmin), sizeof(Vector3));
+                stream.read(reinterpret_cast<char *>(&bmax), sizeof(Vector3));
+                stream.read(reinterpret_cast<char *>(&id), sizeof(int));
+
+                AxisAlignedBox3 box(bmin, bmax);
+                iboxes.push_back(IndexedBoundingBox(id, box));
+        }
 }
 
@@ -1100 +1060 @@
                                                                                                   ObjectContainer &preprocessorObjects,
                                                                                                   bool finalizeViewCells,
-                                                                                                  BoundingBoxConverter *bconverter)
-                                                                                                 
+                                                                                                  BoundingBoxConverter *bconverter)                                                                                              
 {
         ViewCellsParser parser;
@@ -1145 +1104 @@
         if (finalizeViewCells)
         {
+                // do some final computations, e.g.,
                 // create the meshes and compute view cell volumes
                 const bool createMeshes = true;
@@ -1250 +1210 @@
 }
 
+
 void ViewCellsManager::EvalViewCellHistogram(const string filename, 
                                                                                          const int nViewCells)
@@ -1257 +1218 @@
 
         ViewCellContainer viewCells;
-        // $$ JB hack - the collect best viewcells does not work?
-#if 1
+        
+        // the collect best viewcells does not work?
         mViewCellsTree->CollectBestViewCellSet(viewCells, nViewCells);
-#else
-        viewCells = mViewCells;
-#endif
 
         float maxRenderCost, minRenderCost;
@@ -3192 +3150 @@
                         if (boxesIn.eof())
                                 break;
-
                         
                         AxisAlignedBox3 box(bmin, bmax);
                         MeshInstance *mi = new MeshInstance(NULL);
 
-                        // HACK: set bounding box to new box
-                        //mi->mBox = box;
-                        //boxes.push_back(mi);
                         boxes.push_back(IndexedBoundingBox(id, box));
                 }
@@ -3256 +3210 @@
                 return;
 
-        if (viewSpaceFilterSize >= 0.0f) {
-
+        if (viewSpaceFilterSize >= 0.0f) 
+        {
                 const bool usePrVS = false;
 
-                if (!usePrVS) {
+                if (!usePrVS)
+                {
                         AxisAlignedBox3 box = GetViewCellBox(viewCell);
                         box.Enlarge(Vector3(viewSpaceFilterSize/2));
@@ -3278 +3233 @@
                                 pvs = interPvs;
                         }
-                } else 
+                } 
+                else 
                 {
                         PrVs prvs;
@@ -3349 +3305 @@
                                                                          )
 {
-  // now compute a new Pvs by including also objects intersecting the 
-  // extended boxes of visible objects
-  Intersectable::NewMail();
-
-  ObjectPvsIterator pit = pvs.GetIterator();
-
-  while (pit.HasMoreEntries())
-      pit.Next()->Mail();
-
-  ObjectPvs nPvs;
-  int nPvsSize = 0;
-  
-  ObjectPvsIterator pit2 = pvs.GetIterator();
-
-  while (pit2.HasMoreEntries())
-  {             
-          // now go through the pvs again
-          Intersectable *object = pit2.Next();
-
-          //    Vector3 center = object->GetBox().Center();
-          //    AxisAlignedBox3 box(center - Vector3(spatialFilterSize/2),
-          //                                            center + Vector3(spatialFilterSize/2));
-
-          AxisAlignedBox3 box = object->GetBox();
-          box.Enlarge(Vector3(spatialFilterSize/2));
-
-          ObjectContainer objects;
-
-          // $$ warning collect objects takes only unmailed ones!
-          kdTree->CollectObjects(box, objects);
-          //    cout<<"collected objects="<<objects.size()<<endl;
-          ObjectContainer::const_iterator noi = objects.begin();
-          for (; noi != objects.end(); ++ noi) 
-          {
-                  Intersectable *o = *noi;
-                  cout<<"w";
-                  // $$ JB warning: pdfs are not correct at this point!   
-                  nPvs.AddSample(o, Limits::Small);
-                  nPvsSize ++;
-          }
-  }
-
-  // cout<<"nPvs size = "<<nPvsSize<<endl;
-  pvs.MergeInPlace(nPvs);
+        // now compute a new Pvs by including also objects intersecting the 
+        // extended boxes of visible objects
+        Intersectable::NewMail();
+
+        ObjectPvsIterator pit = pvs.GetIterator();
+
+        while (pit.HasMoreEntries())
+                pit.Next()->Mail();
+
+        ObjectPvs nPvs;
+        int nPvsSize = 0;
+
+        ObjectPvsIterator pit2 = pvs.GetIterator();
+
+        while (pit2.HasMoreEntries())
+        {               
+                // now go through the pvs again
+                Intersectable *object = pit2.Next();
+
+                //      Vector3 center = object->GetBox().Center();
+                //      AxisAlignedBox3 box(center - Vector3(spatialFilterSize/2),
+                //                                              center + Vector3(spatialFilterSize/2));
+
+                AxisAlignedBox3 box = object->GetBox();
+                box.Enlarge(Vector3(spatialFilterSize/2));
+
+                ObjectContainer objects;
+
+                // $$ warning collect objects takes only unmailed ones!
+                kdTree->CollectObjects(box, objects);
+                //      cout<<"collected objects="<<objects.size()<<endl;
+                ObjectContainer::const_iterator noi = objects.begin();
+                for (; noi != objects.end(); ++ noi) 
+                {
+                        Intersectable *o = *noi;
+                        cout<<"w";
+                        // $$ JB warning: pdfs are not correct at this point!     
+                        nPvs.AddSample(o, Limits::Small);
+                        nPvsSize ++;
+                }
+        }
+
+        // cout<<"nPvs size = "<<nPvsSize<<endl;
+        pvs.MergeInPlace(nPvs);
 }
 
@@ -3433 +3389 @@
                                                            )
 {
+        pvs.Reserve(viewCell->GetFilteredPvsSize());
+
         PvsFilterStatistics stats;
 
         AxisAlignedBox3 vbox = GetViewCellBox(viewCell);
-        Vector3 center = vbox.Center();
+        const Vector3 center = vbox.Center();
+        
         // copy the PVS
-        Intersectable::NewMail();
+        if (!mUseKdPvs)
+                Intersectable::NewMail();
+        else
+                KdNode::NewMail();
+
         ObjectPvs basePvs = viewCell->GetPvs();
         ObjectPvsIterator pit = basePvs.GetIterator();
 
-        pvs.Reserve(viewCell->GetFilteredPvsSize());
-
         if (!mUseKdPvs)
-        {
-                // first mark all objects from this pvs
+        {       // first mark all objects from this pvs
                 while (pit.HasMoreEntries())    
                         pit.Next()->Mail();
@@ -3453 +3413 @@
         int pvsSize = 0;
         int nPvsSize = 0;
-        float samples = (float)basePvs.GetSamples();
-
-        Debug<<"f #s="<<samples<<"  pvs size = "<<basePvs.GetSize();
+        
+        //Debug<<"f #s="<<samples<<"  pvs size = "<<basePvs.GetSize();
         //  cout<<"Filter size = "<<filterSize<<endl;
         //  cout<<"vbox = "<<vbox<<endl;
@@ -3468 +3427 @@
         // and gobal estimate for the view cell
         // (total #rays intersecting the viewcell)
-        int minLocalSamples = 2;
-
-        float viewCellRadius = 0.5f*Magnitude(vbox.Diagonal());
-
-        // now compute the filter box around the current viewCell
+        const int minLocalSamples = 2;
+        const float viewCellRadius = 0.5f * Magnitude(vbox.Diagonal());
+
+        float samples = (float)basePvs.GetSamples();
+
+        //////////
+        //-- now compute the filter box around the current viewCell
 
         if (useViewSpaceFilter) 
         {
-                //      float radius = Max(viewCellRadius/100.0f, avgRadius - viewCellRadius);
-                float radius = viewCellRadius/100.0f;
+                // float radius = Max(viewCellRadius/100.0f, avgRadius - viewCellRadius);
+                float radius = viewCellRadius / 100.0f;
                 vbox.Enlarge(radius);
                 cout<<"vbox = "<<vbox<<endl;
+
                 ViewCellContainer viewCells;
                 ComputeBoxIntersections(vbox, viewCells);
@@ -3487 +3449 @@
                 for (int i = 0; it != it_end; ++ it, ++ i)
                 {
-                        
                         if ((*it) != viewCell) 
                         {
@@ -3592 +3553 @@
                         }
                 }
+                
                 stats.mAvgFilterRadius /= (stats.mLocalFilterCount + stats.mGlobalFilterCount);
         }
@@ -3613 +3575 @@
         viewCell->SetFilteredPvsSize(pvs.GetSize());
 
-        Intersectable::NewMail();
+        //cout << "pvssize: " << pvs.GetSize() << endl;
+        // warning: not thread-safe!
+        if (!mUseKdPvs)
+                Intersectable::NewMail();
+
         return stats;
 }
@@ -3735 +3701 @@
         Intersectable::NewMail();
 
+
         ///////////
         //-- merge pvss
 
+        PvsData pvsData;
+
         vector<ObjectPvs>::iterator oit = pvsList.begin();
-
-        PvsData pvsData;
 
         for (vit = interior->mChildren.begin(); vit != vit_end; ++ vit, ++ oit)
@@ -4786 +4753 @@
                         exporter->SetWireframe();
 
-                        // matt: we don't have no kd pvs
+                        // matt: we do not use kd pvs
 #if 0
                         KdPvsMap::iterator kit = object->mKdPvs.mEntries.begin();
@@ -5919 +5886 @@
 {
         Environment::GetSingleton()->GetIntValue("Hierarchy.Construction.samples", mInitialSamples);
-
         Environment::GetSingleton()->GetBoolValue("ViewCells.compressObjects", mCompressObjects);
 
@@ -5926 +5892 @@
 
         mHierarchyManager = CreateHierarchyManager(hierarchyType);
+
         mHierarchyManager->SetViewCellsManager(this);
         mHierarchyManager->SetViewCellsTree(mViewCellsTree);
@@ -6247 +6214 @@
                                                                                                         ) const
 {
+        Plane3 plane;
+        if (clipPlane)
+        {
+                // arbitrary plane definition
+                plane = clipPlane->GetPlane();
+        }
+
         ViewCellContainer leaves;
         mViewCellsTree->CollectLeaves(vc, leaves);
+
         ViewCellContainer::const_iterator it, it_end = leaves.end();
-
-        Plane3 plane;
-        if (clipPlane)
-        {
-                // arbitrary plane definition
-                plane = clipPlane->GetPlane();
-        }
 
         for (it = leaves.begin(); it != it_end; ++ it)
@@ -6522 +6490 @@
                 {
                         Material m;
-
                         Intersectable::NewMail();
                         
@@ -6636 +6603 @@
                 return false;
 
-        cout << "exporting binary" << endl;
-        string fname("test.vc");
-        return ExportBinaryViewCells(fname, exportPvs, objects);
+        /*if (strstr(filename.c_str(), ".bn"))
+        {
+                cout << "exporting view cells to binary format" << endl;
+                return ExportViewCellsBinary(filename, exportPvs, objects);
+        }*/
+
+        cout << "exporting binary" << endl; string fname("test.vc"); return ExportViewCellsBinary(fname, exportPvs, objects);
 
         const long starttime = GetTime();
@@ -6662 +6633 @@
 
                         int id = 0;
-
                         vector<KdIntersectable *>::const_iterator kit, kit_end = mPreprocessor->mKdTree->mKdIntersectables.end();
                         
@@ -6697 +6667 @@
 
 
-        //////////////////////
+        /////////////////
         //-- export the view space hierarchy
         
@@ -6707 +6677 @@
         stream << "</ViewSpaceHierarchy>" << endl;
 
-        //////////////////////  
-        //-- export the object space partition
+        /////////////////
+        //-- export the object space hierarchy
         
         mHierarchyManager->ExportObjectSpaceHierarchy(stream);
@@ -6720 +6690 @@
 
 
-bool VspOspViewCellsManager::ExportBinaryViewCells(const string filename, 
+bool VspOspViewCellsManager::ExportViewCellsBinary(const string filename, 
                                                                                                    const bool exportPvs, 
                                                                                                    const ObjectContainer &objects)
@@ -6736 +6706 @@
         CreateUniqueViewCellIds();
 
-        int numBoundingBoxes = mPreprocessor->mKdTree->mKdIntersectables.size();
-        stream.write(reinterpret_cast<char *>(&numBoundingBoxes), sizeof(int));
+        int numBoxes = mPreprocessor->mKdTree->mKdIntersectables.size();
+        stream.write(reinterpret_cast<char *>(&numBoxes), sizeof(int));
 
 
@@ -6751 +6721 @@
         {
                 Intersectable *obj = (*kit);
+                // set the kd node id to identify the kd node as a pvs entry
+                obj->SetId(id);
+
                 const AxisAlignedBox3 &box = obj->GetBox();
-
-                // setting the kd node id important to identify the kd node as pvs entry
-                obj->SetId(id);
-
                 Vector3 bmin = box.Min();
                 Vector3 bmax = box.Max();
@@ -6764 +6733 @@
         }
 
+        cout << "written " << numBoxes << " kd nodes" << endl;
 
         ///////////////
         //-- export the view cells and the pvs
 
-        int numViewCells = mCurrentViewCellsStats.viewCells;
+        int numViewCells = mViewCells.size();
         stream.write(reinterpret_cast<char *>(&numViewCells), sizeof(int));
 
@@ -6777 +6747 @@
         stream.write(reinterpret_cast<char *>(&vmax), sizeof(Vector3));
 
-        // todo
+
+        //////////
+        //-- export binary view cells
+
         mViewCellsTree->ExportBinary(stream);
 
 
-        //////////////////////
+        /////////
         //-- export the view space hierarchy
         
         mHierarchyManager->GetVspTree()->ExportBinary(stream);
         
+
+        ////////
+        //-- export the object space hierarchy
+
+        //mHierarchyManager->ExportObjectSpaceHierarchyBinary();
+    
         stream.close();
         
+        mHierarchyManager->GetVspTree()->TestOutput("output.txt");
+
         cout << "finished in " << TimeDiff(starttime, GetTime()) * 1e-3 << " secs" << endl;
         return true;
@@ -6888 +6869 @@
         if (!(ViewCellsTreeConstructed() && mCompressViewCells))
                 return;
+
 
         ////////////
@@ -7042 +7024 @@
                 cout << "computing histogram for " << pass << " view cells" << endl;
 
-                /////////////////////////////
+                ///////////////////
                 //-- evaluate histogram for pvs size
 
@@ -7060 +7042 @@
 
         if (mHierarchyManager->mUseTraversalTree)
-        {
-                // create a traversal tree for optimal view cell casting
+        {       // create a traversal tree for optimal view cell casting
                 mHierarchyManager->CreateTraversalTree();
         }
@@ -7097 +7078 @@
                         {
                                 ComputeSampleContribution(*tmpRays[i], addContributions, true, useHitObjects);
-
-                                //////////
                                 // compare results
-                                cout << "ray " << i << ": " << (int)tmpRays[i]->mViewCells.size() << " " << (int)packet.mViewCells[i].size() << endl;
+                                cout << "ray " << i << ": " << (int)tmpRays[i]->mViewCells.size() << " " 
+                                         << (int)packet.mViewCells[i].size() << endl;
                         }
                         
@@ -7127 +7107 @@
                                                                           BoundingBoxConverter *bconverter)                                                                                              
 {
-        ViewCellsParser parser;
-        ViewCellsManager *vm = NULL;
+        if (!Debug.is_open()) Debug.open("debug.log");
+
+        IN_STREAM stream(filename.c_str());
+
+        if (!stream.is_open())
+        {
+                Debug << "View cells loading failed: could not open file" << endl;
+                return NULL;
+        }
+
+        Debug << "loading boxes" << endl;
 
         const long startTime = GetTime();
-        const bool success = false;
-
-        if (!success)
-        {
-                Debug << "Error: loading view cells failed!" << endl;
-                DEL_PTR(vm);
-
+
+        IndexedBoundingBoxContainer iboxes;
+        ViewCellsManager::LoadIndexedBoundingBoxesBinary(stream, iboxes);
+
+        Debug << (int)iboxes.size() << " boxes loaded" << endl;
+
+        /*IndexedBoundingBoxContainer::const_iterator bit, bit_end = iboxes.end();
+        for (bit = iboxes.begin(); bit != bit_end; ++ bit)
+        {
+                IndexedBoundingBox ibox = *bit;
+                cerr << "box: " << ibox.first << " " << ibox.second << endl;
+        }*/
+
+
+        if (bconverter)
+        {
+                // all bounding boxes gathered in this step => 
+                // associate object ids with bounding boxes
+                bconverter->IdentifyObjects(iboxes, pvsObjects);
+        }
+
+        // sort objects by id
+        sort(pvsObjects.begin(), pvsObjects.end(), ilt);
+        
+
+        /////////////
+        //-- load the view cells
+        
+        int numViewCells;
+        stream.read(reinterpret_cast<char *>(&numViewCells), sizeof(int));
+
+        Debug << "loading " << numViewCells << " view cells " << endl;
+
+        Vector3 vmin, vmax;
+
+        stream.read(reinterpret_cast<char *>(&vmin), sizeof(Vector3));
+        stream.read(reinterpret_cast<char *>(&vmax), sizeof(Vector3));
+
+        AxisAlignedBox3 viewSpaceBox(vmin, vmax);
+
+        Debug << "view space box: " << viewSpaceBox << endl;
+
+    ViewCellsTree *vcTree = new ViewCellsTree();
+
+        if (!vcTree->ImportBinary(stream, pvsObjects))
+        {
+                Debug << "Error: loading view cells tree failed!" << endl;
+                delete vcTree;
+        
                 return NULL;
         }
-        
-        ViewCellContainer leaves;
+
+        Debug << "loading the view space partition tree" << endl;
+        VspTree *vspTree = new VspTree();
+
+        vspTree->mBoundingBox = viewSpaceBox;
+
+        if (!vspTree->ImportBinary(stream, pvsObjects))
+        {
+                Debug << "Error: loading vsp tree failed!" << endl;
+                delete vcTree; delete vspTree;
+
+                return NULL;
+        }
+
+
+        HierarchyManager * hm = 
+                new HierarchyManager(HierarchyManager::BV_BASED_OBJ_SUBDIV);
+
+        hm->SetVspTree(vspTree);
+
+
+        /////////
+        //-- create view cells manager
+        
+        VspOspViewCellsManager *vm = new VspOspViewCellsManager(vcTree, hm);
+
+
+
+        //////////////
+        //-- do some more preparation
 
         vm->mViewCells.clear();
-        vm->mViewCellsTree->CollectLeaves(vm->mViewCellsTree->GetRoot(), leaves);
-
-        ViewCellContainer::const_iterator it, it_end = leaves.end();
-
-        for (it = leaves.begin(); it != it_end; ++ it)
-        {
-                vm->mViewCells.push_back(*it);
-        }
+
+        ViewCellContainer viewCells;
+        vcTree->CollectLeaves(vcTree->GetRoot(), viewCells);
+
+        ViewCellContainer::const_iterator cit, cit_end = viewCells.end();
+
+        for (cit = viewCells.begin(); cit != cit_end; ++ cit)
+        {
+                vm->mViewCells.push_back(*cit);
+        }
+
+
+        //////////////
+        //-- associate view cells with vsp leaves
+
+        vector<VspLeaf *> vspLeaves;
+        vspTree->CollectLeaves(vspLeaves);
+
+        vector<VspLeaf *>::const_iterator vit, vit_end = vspLeaves.end();
+        cit = viewCells.begin();
+
+        for (vit = vspLeaves.begin(); vit != vit_end; ++ vit, ++ cit)
+        {
+                VspLeaf *leaf = *vit;
+                VspViewCell *vc = static_cast<VspViewCell *>(*cit);
+
+                leaf->SetViewCell(vc);
+                vc->mLeaves.push_back(leaf);
+        }
+
 
         vm->mViewCellsFinished = true;
@@ -7163 +7244 @@
         }
 
-        cout << (int)vm->mViewCells.size() << " view cells loaded in "
-                 << TimeDiff(startTime, GetTime()) * 1e-3f << " secs" << endl;
-
         Debug << (int)vm->mViewCells.size() << " view cells loaded in "
-                  << TimeDiff(startTime, GetTime()) * 1e-3f << " secs" << endl;
-        
+                  << TimeDiff(startTime, GetTime()) * 1e-6f << " secs" << endl;
+
+        vspTree->TestOutput("input.txt");
+
         return vm;
 }