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

Timestamp:

08/08/07 15:50:33 (17 years ago)

Author:

mattausch

Message:

fixed obj loading error

File:

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

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

@@ -1021 +1021 @@
                                                                                                  
 {
+        // give just an empty container as parameter:
+        // this loading function is used in the engine, thus it
+        // does not need to load the entities the preprocessor works on
         ObjectContainer preprocessorObjects;
 
@@ -1058 +1061 @@
         }
         
-        if (0)
+        if (0) //hack: should work with reset function, but something is wrong ..
         {
                 vm->ResetViewCells();
@@ -1064 +1067 @@
         else
         {
-                //hack: should work with reset function
                 ViewCellContainer leaves;
 
@@ -1111 +1113 @@
         OUT_STREAM stream(filename.c_str());
 
-        // for output we need unique ids for each view cell
+        // we need unique ids for each view cell
         CreateUniqueViewCellIds();
 
@@ -1287 +1289 @@
 
         ViewCellContainer viewCells;
+
 #ifdef USE_BIT_PVS
         cout << "objects size: " << (int)ObjectPvsIterator::sObjects.size() << endl;
         cout << "pvs size: " <<  ObjectPvs::sPvsSize << endl;
 #endif
+
         // $$ JB hack - the collect best viewcells does not work?
 #if 0
@@ -1297 +1301 @@
         viewCells = mViewCells;
 #endif
+
         ViewCellContainer::iterator it = viewCells.begin(), it_end = viewCells.end();           
+        
         for (; it != it_end; ++it) 
         {
-                if (1)
-                        (*it)->UpdatePvsCost();
-                else
-                        (*it)->SetTrianglesInPvs((float)(*it)->GetFilteredPvsSize());
+                (*it)->UpdatePvsCost();
         }
 
@@ -1364 +1367 @@
                         ++ smallerSum;
                 }
-                
-                //              if (0 && (i < (int)viewCells.size()))
-                //                Debug << "new pvs cost increase: " << mViewCellsTree->GetTrianglesInPvs(viewCells[i]) 
-                //                              << " " << currentPvs << endl;
                 
                 const float volRatioDif = volDif / totalVol;
@@ -1843 +1842 @@
                                                            const float filterWidth)
 {
-  ViewCell *currentViewCell = GetViewCell(viewPoint);
-
-  if (mMaxFilterSize < 1) {
-        prvs.mViewCell = currentViewCell;
-        return;
-  }
-  
-  const AxisAlignedBox3 box = GetFilterBBox(viewPoint, filterWidth);
-  
-  if (currentViewCell) 
-        {
-          ViewCellContainer viewCells;
-          ComputeBoxIntersections(box, viewCells);
-          
-          ViewCell *root = ConstructLocalMergeTree2(currentViewCell, viewCells);
-          prvs.mViewCell = root;
-          
+        ViewCell *currentViewCell = GetViewCell(viewPoint);
+
+        if (mMaxFilterSize < 1) {
+                prvs.mViewCell = currentViewCell;
+                return;
+        }
+
+        const AxisAlignedBox3 box = GetFilterBBox(viewPoint, filterWidth);
+
+        if (currentViewCell) 
+        {
+                ViewCellContainer viewCells;
+                ComputeBoxIntersections(box, viewCells);
+
+                ViewCell *root = ConstructLocalMergeTree2(currentViewCell, viewCells);
+                prvs.mViewCell = root;
+
         } 
-  else
-        {
-          prvs.mViewCell = NULL;
-          //prvs.mPvs = root->GetPvs();
+        else
+        {
+                prvs.mViewCell = NULL;
+                //prvs.mPvs = root->GetPvs();
         }
 }
@@ -4077 +4076 @@
 
         //////////
-        //-- some view cells for output
+        //-- export visualizations of some view cells
 
         ViewCell::NewMail();
@@ -4116 +4115 @@
                 for (vit = leaves.begin(); vit != vit_end; ++ vit)
                         {       
-                                // prepare some rays for output
+                                // prepare some rays for visualization
                                 VssRayContainer::const_iterator rit, rit_end = (*vit)->GetOrCreateRays()->end();
                                 for (rit = (*vit)->GetOrCreateRays()->begin(); rit != rit_end; ++ rit)
@@ -4126 +4125 @@
                         const int raysOut = min((int)collectRays.size(), maxRays);
 
-                        // prepare some rays for output
+                        // prepare some rays for visualization
                         VssRayContainer::const_iterator rit, rit_end = collectRays.end();
                         for (rit = collectRays.begin(); rit != rit_end; ++ rit)
@@ -4381 +4380 @@
         OUT_STREAM stream(filename.c_str());
 
-        // for output we need unique ids for each view cell
+        // we need unique ids for each view cell
         CreateUniqueViewCellIds();
 
@@ -4611 +4610 @@
                 ViewCell::NewMail();
 
-                //-- some rays for output
+                //-- some rays for visualization
                 const int raysOut = min((int)sampleRays.size(), mVisualizationSamples);
                 Debug << "visualization using " << raysOut << " samples" << endl;
 
-                //-- some random view cells and rays for output
+                //-- some random view cells and rays for visualization
                 vector<KdLeaf *> kdLeaves;
 
@@ -5400 +5399 @@
 
         //////////
-        //-- some view cells for output
+        //-- export some view cells for visualization
 
         ViewCell::NewMail();
@@ -5453 +5452 @@
                         const int raysOut = min((int)collectRays.size(), maxRays);
                 
-                        // prepare some rays for output
+                        // prepare some rays for visualization
                         VssRayContainer::const_iterator rit, rit_end = collectRays.end();
                         for (rit = collectRays.begin(); rit != rit_end; ++ rit)
@@ -5483 +5482 @@
                 {
                         Intersectable::NewMail();
-
                         ObjectPvsIterator pit = pvs.GetIterator();
 
@@ -6585 +6583 @@
         OUT_STREAM stream(filename.c_str());
 
-        // for output we need unique ids for each view cell
+        // we need unique ids for each view cell
         CreateUniqueViewCellIds();
 
@@ -6600 +6598 @@
                 {
                         stream << "<BoundingBoxes>" << endl;
+
+                        int id = 0;
+
                         vector<KdIntersectable *>::const_iterator kit, kit_end = mPreprocessor->mKdTree->mKdIntersectables.end();
-
-                        int id = 0;
-
+                        
                         for (kit = mPreprocessor->mKdTree->mKdIntersectables.begin(); kit != kit_end; ++ kit, ++ id)
                         {
@@ -6657 +6656 @@
 }
 
+
+bool VspOspViewCellsManager::ExportBinaryViewCells(const string filename, 
+                                                                                                   const bool exportPvs, 
+                                                                                                   const ObjectContainer &objects)
+{
+        if (!ViewCellsConstructed() || !ViewCellsTreeConstructed())
+                return false;
+
+        const long starttime = GetTime();
+        cout << "exporting view cells to binary format ... ";
+        
+        OUT_STREAM stream(filename.c_str());
+
+        // we need unique ids for each view cell
+        CreateUniqueViewCellIds();
+
+        int numBoundingBoxes = mPreprocessor->mKdTree->mKdIntersectables.size();
+        stream.write(reinterpret_cast<char *>(&numBoundingBoxes), sizeof(int));
+
+
+    ///////////////
+        //-- export bounding boxes
+        //-- we need the boxes to identify objects in the target engine
+
+        vector<KdIntersectable *>::const_iterator kit, kit_end = mPreprocessor->mKdTree->mKdIntersectables.end();
+
+        int id = 0;
+
+        for (kit = mPreprocessor->mKdTree->mKdIntersectables.begin(); kit != kit_end; ++ kit, ++ id)
+        {
+                Intersectable *obj = (*kit);
+                const AxisAlignedBox3 &box = obj->GetBox();
+
+                // set kd node id
+                obj->SetId(id);
+                Vector3 bmin = box.Min();
+                Vector3 bmax = box.Max();
+
+                stream.write(reinterpret_cast<char *>(&bmin), sizeof(Vector3));
+                stream.write(reinterpret_cast<char *>(&bmax), sizeof(Vector3));
+                stream.write(reinterpret_cast<char *>(&id), sizeof(int));
+        }
+
+
+        ///////////////
+        //-- export the view cells and the pvs
+
+
+        int numViewCells = mCurrentViewCellsStats.viewCells;
+        stream.write(reinterpret_cast<char *>(&numViewCells), sizeof(int));
+
+        Vector3 vmin = mViewSpaceBox.Min();
+        Vector3 vmax = mViewSpaceBox.Max();
+
+        stream.write(reinterpret_cast<char *>(&vmin), sizeof(Vector3));
+        stream.write(reinterpret_cast<char *>(&vmax), sizeof(Vector3));
+
+
+        //////////////////////
+        //-- export the view space hierarchy
+        
+        mHierarchyManager->GetVspTree()->ExportBinary(stream);
+        
+        stream.close();
+        
+        cout << "finished in " << TimeDiff(starttime, GetTime()) * 1e-3 << " secs" << endl;
+        return true;
+}
 
 
@@ -6966 +7033 @@
                                 //////////
                                 // compare results
-
                                 cout << "ray " << i << ": " << (int)tmpRays[i]->mViewCells.size() << " " << (int)packet.mViewCells[i].size() << endl;
                         }
-
-                        
                         
                         CLEAR_CONTAINER(tmpRays);
                 }
         }
-cout << "=================\nhere6"<<endl;
+        
         CLEAR_CONTAINER(tmpRays);
 
@@ -6990 +7054 @@
 
 
-}
+
+ViewCellsManager *LoadViewCellsBinary(const string &filename, 
+                                                                          ObjectContainer &pvsObjects,
+                                                                          bool finalizeViewCells,
+                                                                          BoundingBoxConverter *bconverter)                                                                                              
+{
+        ViewCellsParser parser;
+        ViewCellsManager *vm = NULL;
+
+        const long startTime = GetTime();
+        const bool success = false;
+
+        if (!success)
+        {
+                Debug << "Error: loading view cells failed!" << endl;
+                DEL_PTR(vm);
+
+                return NULL;
+        }
+        
+        ViewCellContainer leaves;
+
+        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);
+        }
+
+        vm->mViewCellsFinished = true;
+        vm->mMaxPvsSize = (int)pvsObjects.size();
+
+        if (finalizeViewCells)
+        {
+                // create the meshes and compute view cell volumes
+                const bool createMeshes = true;
+                vm->FinalizeViewCells(createMeshes);
+        }
+
+        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;
+        
+        return vm;
+}
+
+}