Changeset 1262

Timestamp:

08/23/06 00:45:59 (18 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• ViewCellsManager.cpp (modified) (8 diffs)
• ViewCellsParser.cpp (modified) (6 diffs)
• VspTree.cpp (modified) (4 diffs)

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

@@ -723 +723 @@
 
         //-- the view space bounding box
-        stream << "<ViewSpaceBox" 
-                   << " min=\"" << mViewSpaceBox.Min().x << " " << mViewSpaceBox.Min().y << " " << mViewSpaceBox.Min().z << "\""
-                   << " max=\"" << mViewSpaceBox.Max().x << " " << mViewSpaceBox.Max().y << " " << mViewSpaceBox.Max().z << "\" />" << endl;
-
-        if (exportPvs) {
-        //-- export bounding boxes
-        stream << "<BoundingBoxes>" << endl;
-
-        ObjectContainer::const_iterator oit, oit_end = objects.end();
-
-        for (oit = objects.begin(); oit != oit_end; ++ oit)
-        {
+        //stream << "<ViewSpaceBox" 
+        //         << " min=\"" << mViewSpaceBox.Min().x << " " << mViewSpaceBox.Min().y << " " << mViewSpaceBox.Min().z << "\""
+        //         << " max=\"" << mViewSpaceBox.Max().x << " " << mViewSpaceBox.Max().y << " " << mViewSpaceBox.Max().z << "\" />" << endl;
+
+        if (exportPvs) 
+        {
+                //-- export bounding boxes
+                stream << "<BoundingBoxes>" << endl;
+
+                ObjectContainer::const_iterator oit, oit_end = objects.end();
+
+                for (oit = objects.begin(); oit != oit_end; ++ oit)
+                {
                         MeshInstance *mi = dynamic_cast<MeshInstance *>(*oit);
                         const AxisAlignedBox3 box = mi->GetBox();
@@ -742 +743 @@
                                    << " min=\"" << box.Min().x << " " << box.Min().y << " " << box.Min().z << "\""
                                    << " max=\"" << box.Max().x << " " << box.Max().y << " " << box.Max().z << "\" />" << endl;
-        }
-
-        stream << "</BoundingBoxes>" << endl;
-        }
+                }
+
+                stream << "</BoundingBoxes>" << endl;
+        }
+
+
+        // the type of hierarchy: this must be known before to build 
+        // the view cells manager
+        stream << "<ViewSpaceHierarchyType name=\"vspBspTree\" />" << endl;
 
         //-- export the view cells and the pvs
-        stream << "<HierarchyType name=\"vspBspTree\" />" << endl;
 
         const int numViewCells = mCurrentViewCellsStats.viewCells;
@@ -759 +764 @@
 
 
-        //-- export the spatial hierarchy
-        
-        // the type of the view cells hierarchy
-        stream << "<Hierarchy>" << endl;
+        //-- export the view space hierarchy
+        
+        stream << "<ViewSpaceHierarchy type=\"bsp\""
+                   << " min=\"" << mViewSpaceBox.Min().x << " " << mViewSpaceBox.Min().y << " " << mViewSpaceBox.Min().z << "\""
+                   << " max=\"" << mViewSpaceBox.Max().x << " " << mViewSpaceBox.Max().y << " " << mViewSpaceBox.Max().z << "\" />" << endl;
+
         mVspBspTree->Export(stream);
-        stream << endl << "</Hierarchy>" << endl;
+        stream << endl << "</ViewSpaceHierarchy>" << endl;
 
         stream << "</VisibilitySolution>" << endl;
@@ -5007 +5014 @@
 
         //-- compression
+
         if (ViewCellsTreeConstructed() && mCompressViewCells)
         {
@@ -5469 +5477 @@
         //-- export view space bounding box
         
-        stream << "<ViewSpaceBox" 
-                   << " min=\"" << mViewSpaceBox.Min().x << " " << mViewSpaceBox.Min().y << " " << mViewSpaceBox.Min().z << "\""
-                   << " max=\"" << mViewSpaceBox.Max().x << " " << mViewSpaceBox.Max().y << " " << mViewSpaceBox.Max().z << "\" />" << endl;
+        //stream << "<ViewSpaceBox" 
+        //         << " min=\"" << mViewSpaceBox.Min().x << " " << mViewSpaceBox.Min().y << " " << mViewSpaceBox.Min().z << "\""
+        //         << " max=\"" << mViewSpaceBox.Max().x << " " << mViewSpaceBox.Max().y << " " << mViewSpaceBox.Max().z << "\" />" << endl;
 
         
@@ -5493 +5501 @@
         stream << "</BoundingBoxes>" << endl;
 
+        // the type of the view space hierarchy:
+        // must be known beforehand because necessary for building view cels
+        //stream << "<ViewSpaceHierarchyType name=\"vspTree\" />" << endl;
+
 
         //-- export the view cells and the pvs
 
-        stream << "<Hierarchy name=\"vspTree\" />" << endl;
         const int numViewCells = mCurrentViewCellsStats.viewCells;
 
@@ -5506 +5517 @@
         //-- export the view space hierarchy
         
-        // the type of the view space partition
-        stream << "<ViewSpaceHierarchy>" << endl;
+        stream << "<ViewSpaceHierarchy type=\"vsp\""
+                   << " min=\"" << mViewSpaceBox.Min().x << " " << mViewSpaceBox.Min().y << " " << mViewSpaceBox.Min().z << "\""
+                   << " max=\"" << mViewSpaceBox.Max().x << " " << mViewSpaceBox.Max().y << " " << mViewSpaceBox.Max().z << "\" />" << endl;
+
         mVspTree->Export(stream);
-        stream << endl << "</ViewSpacePartitioin>" << endl;
+        stream << endl << "</ViewSpaceHierarchy>" << endl;
 
         
@@ -5515 +5528 @@
         
         // the type of the view cells hierarchy
-        stream << "<ObjectSpaceHierarchy>" << endl;
-        mOspTree->Export(stream);
-        stream << endl << "</ObjectSpaceHierarchy>" << endl;
-
+        if (mHierarchyManager->GetObjectSpaceSubdivisonType() == 
+                HierarchyManager::KD_BASED_OBJ_SUBDIV)
+        {
+                stream << "<ObjectSpaceHierarchy type=\"osp\">" << endl;
+                mOspTree->Export(stream);
+                stream << endl << "</ObjectSpaceHierarchy>" << endl;
+        }
+        else if (mHierarchyManager->GetObjectSpaceSubdivisonType() == 
+                 HierarchyManager::BV_BASED_OBJ_SUBDIV)
+        {
+                stream << "<ObjectSpaceHierarchy type=\"bvh\">" << endl;
+                mBvHierarchy->Export(stream);
+                stream << endl << "</ObjectSpaceHierarchy>" << endl;
+        }
 
         stream << "</VisibilitySolution>" << endl;

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

@@ -108 +108 @@
 void ViewCellsParseHandlers::endElement(const XMLCh* const name)
 {
-  StrX lname(name);
-  string element(lname.LocalForm());
-
-  if (element == "ViewCells")
-          EndViewCells();
-
-  if (element == "BoundingBoxes")
-          EndBoundingBoxes();
-
-  // inside the view cell description
-  if (mCurrentTask == PARSE_VIEWCELLS)
-  {
-          if (element == "Interior")
-                  EndViewCellInterior();
-  }
-  else
-  {
-          if (element == "Interior")
-                  EndBspInterior();
-  }
+        StrX lname(name);
+        string element(lname.LocalForm());
+
+        if (element == "ViewCells")
+                EndViewCells();
+
+        if (element == "BoundingBoxes")
+                EndBoundingBoxes();
+
+        // inside the view cell description
+        if (mCurrentTask == PARSE_VIEWCELLS)
+        {
+                if (element == "Interior")
+                        EndViewCellInterior();
+        }
+        else
+        {
+                if (element == "Interior")
+                        EndBspInterior();
+        }
 }
 
@@ -150 +150 @@
 }
 
+
 void ViewCellsParseHandlers::EndViewCellInterior()
 {
@@ -204 +205 @@
                         const char *ptr = attrValue.LocalForm();
                         
-                        //-- the view cells manager is created here
+                        // the view cells manager is created here
                         CreateViewCellsManager(ptr);
                 }
@@ -720 +721 @@
                 mBspTree = new BspTree();
                 mBspTree->mBox = mViewSpaceBox;
-                //mCurrentBspNode = mBspTree->GetRoot();
 
                 mViewCellsManager = new BspViewCellsManager(mBspTree);
@@ -729 +729 @@
 
                 mVspBspTree = new VspBspTree();
-                //mCurrentBspNode = mVspBspTree->GetRoot();
                 mViewCellsManager = new VspBspViewCellsManager(mVspBspTree);
 
@@ -746 +745 @@
                 mVspTree->mBoundingBox = mViewSpaceBox;
         }
-
 
         mViewCellsTree = mViewCellsManager->GetViewCellsTree();

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

@@ -1081 +1081 @@
         case HierarchyManager::BV_BASED_OBJ_SUBDIV:
                 {
-                        BvhLeaf *leaf = mHierarchyManager->mBvHierarchy->GetLeaf(obj, NULL);
+                        BvhLeaf *leaf = mHierarchyManager->mBvHierarchy->GetLeaf(obj);
 
                         if (!leaf->Mailed())
@@ -1088 +1088 @@
                                 leaf->mCounter = 1;
 
-                                ++ pvsSize;
+                                pvsSize += (int)leaf->mObjects.size();
                         }
                         else
@@ -1266 +1266 @@
                         {
                                 leaf->Mail();
-                                ++ pvs;
+                                pvs += (int)leaf->mObjects.size();
                         }
                         break;
@@ -1311 +1311 @@
 
                         if (-- leaf->mCounter == 0)
-                                ++ pvs;
+                                pvs += (int)leaf->mObjects.size();
                         break;
                 }