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

Timestamp:

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

Author:

mattausch

Message:

 

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/VspTree.cpp (modified) (7 diffs)

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

@@ -3854 +3854 @@
 void VspTree::ExportBinInterior(OUT_STREAM &stream, VspInterior *interior)
 {
-        int interiorid = TYPE_INTERIOR;
-        stream.write(reinterpret_cast<char *>(&interiorid), sizeof(int));
+        int type = TYPE_INTERIOR;
+        stream.write(reinterpret_cast<char *>(&type), sizeof(int));
 
         int axis = interior->GetAxis();
@@ -3867 +3867 @@
 void VspTree::ExportBinLeaf(OUT_STREAM &stream, VspLeaf *leaf)
 {
-        ViewCell *viewCell = mViewCellsTree->GetActiveViewCell(leaf->GetViewCell());
-
         int type = TYPE_LEAF;
-
-        int id = -1;
-        if (viewCell != mOutOfBoundsCell)
-                id = viewCell->GetId();
-
         stream.write(reinterpret_cast<char *>(&type), sizeof(int));
-        stream.write(reinterpret_cast<char *>(&id), sizeof(int));
-
-        int pvsSize = viewCell->GetPvs().GetSize();
-        stream.write(reinterpret_cast<char *>(&pvsSize), sizeof(int));
-
-        ObjectPvsIterator pit = viewCell->GetPvs().GetIterator();
-
-        // write PVS of view cell
-        while (pit.HasMoreEntries())
-        {
-                Intersectable *intersect = pit.Next();
-                id = intersect->GetId();
-                stream.write(reinterpret_cast<char *>(&id), sizeof(int));
-        }
 }
 
@@ -3943 +3922 @@
                                                                 const ObjectContainer &pvsObjects)
 {
-#if TODO
         int leafId = TYPE_LEAF;
         int objId = leafId;
-        int size;
-
-        stream.read(reinterpret_cast<char *>(&size), sizeof(int));
-        KdLeaf *leaf = new KdLeaf(parent, size);
-
-        MeshInstance dummyInst(NULL);
-        
-        // read object ids
-        // note: could also do this geometrically
-        for (int i = 0; i < size; ++ i)
-        {       
-                stream.read(reinterpret_cast<char *>(&objId), sizeof(int));
-                dummyInst.SetId(objId);
-
-                ObjectContainer::const_iterator oit =
-                        lower_bound(objects.begin(), objects.end(), (Intersectable *)&dummyInst, ilt);
-                                                                
-                if ((oit != objects.end()) && ((*oit)->GetId() == objId))
-                        leaf->mObjects.push_back(*oit);
-                else
-                        Debug << "error: object with id " << objId << " does not exist" << endl;
-        }
+        
+        VspLeaf *leaf = new VspLeaf(parent);
+
+        // pvs is loaded by view cell
         return leaf;
-#endif
-return NULL;
 }
 
@@ -3982 +3940 @@
 
         if (nodeType == TYPE_LEAF)
+        {
+                //cerr << "l";
                 return ImportBinLeaf(stream, static_cast<VspInterior *>(parent), objects);
+        }
 
         if (nodeType == TYPE_INTERIOR)
+        {
+                //cerr << "i";
                 return ImportBinInterior(stream, static_cast<VspInterior *>(parent));
-
-        Debug << "error! loading failed!" << endl;
+        }
+
+        cerr << "error! loading vsp node failed!" << endl;
         return NULL;
 }
@@ -4024 +3988 @@
         // hack: we make a new root
         DEL_PTR(mRoot);
-  
         mRoot = ImportNextNode(stream, NULL, pvsObjects);
 
@@ -4042 +4005 @@
                         mVspStats.nodes += 2;
 
-                        //Debug << "i" ;
                         VspInterior *interior = static_cast<VspInterior *>(node);
                         interior->SetBoundingBox(tData.mBox);
@@ -4070 +4032 @@
                 }
         }
+
         return true;
 }
 
 
-}
+void VspTree::TestOutput(const std::string &filename)
+{
+        ofstream str(filename.c_str());
+
+        vector<VspLeaf *> vspLeaves;
+        CollectLeaves(vspLeaves);
+
+        vector<VspLeaf *>::const_iterator vit, vit_end = vspLeaves.end();
+
+        for (vit = vspLeaves.begin(); vit != vit_end; ++ vit)
+        {
+                VspLeaf *leaf = *vit;
+                ViewCell *vc = leaf->GetViewCell();
+
+                str << "\nleaf: " << GetBoundingBox(leaf) << endl;
+
+                ObjectPvsIterator pit = vc->GetPvs().GetIterator();
+
+                while (pit.HasMoreEntries())
+                {
+                        Intersectable *obj = pit.Next();
+                        str << obj->GetId() << " ";
+                }
+        }
+}
+
+
+}