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

Timestamp:

10/12/06 01:05:47 (18 years ago)

Author:

mattausch

Message:

 

File:

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

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

@@ -660 +660 @@
                 //-- export bounding boxes
                 stream << "<BoundingBoxes>" << endl;
-                ObjectContainer::const_iterator oit, oit_end = objects.end();
+#if USE_KD_PVS 
+        KdIntersectableMap::const_iterator kit, kit_end = GetPreprocessor()->mKdTree->mKdIntersectables.end();
+
+                int id = 0;
+                for (kit = GetPreprocessor()->mKdTree->mKdIntersectables.begin(); kit != kit_end; ++ kit, ++ id)
+                {
+                        Intersectable *obj = (*kit).second;
+                        const AxisAlignedBox3 box = obj->GetBox();
+                
+                        obj->SetId(id);
+
+                        stream << "<BoundingBox" << " id=\"" << id << "\""
+                                   << " min=\"" << box.Min().x << " " << box.Min().y << " " << box.Min().z << "\""
+                                   << " max=\"" << box.Max().x << " " << box.Max().y << " " << box.Max().z << "\" />" << endl;
+                }
+#else
+        ObjectContainer::const_iterator oit, oit_end = objects.end();
 
                 for (oit = objects.begin(); oit != oit_end; ++ oit)
@@ -672 +688 @@
                                    << " max=\"" << box.Max().x << " " << box.Max().y << " " << box.Max().z << "\" />" << endl;
                 }
-
+#endif
                 stream << "</BoundingBoxes>" << endl;
         }
@@ -5339 +5355 @@
                 //-- The bounding boxes are used to identify 
                 //-- the objects in the rendering engine
-
-                stream << "<BoundingBoxes>" << endl;
-                ObjectContainer::const_iterator oit, oit_end = objects.end();
-        
-                for (oit = objects.begin(); oit != oit_end; ++ oit)
-                {
-                        const AxisAlignedBox3 box = (*oit)->GetBox();
-                        stream << "<BoundingBox" << " id=\"" << (*oit)->GetId() << "\""
-                                << " min=\"" << box.Min().x << " " << box.Min().y << " " << box.Min().z << "\""
-                                
-                                << " max=\"" << box.Max().x << " " << box.Max().y << " " << box.Max().z << "\" />" << endl;
-                }
-                
-                stream << "</BoundingBoxes>" << endl;
+                mHierarchyManager->ExportBoundingBoxes(stream, objects);
         }