Changeset 1614 for GTP/trunk

Timestamp:

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

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• BvHierarchy.cpp (modified) (2 diffs)
• BvHierarchy.h (modified) (3 diffs)
• HierarchyManager.cpp (modified) (1 diff)
• HierarchyManager.h (modified) (2 diffs)
• KdTree.h (modified) (1 diff)
• ViewCell.cpp (modified) (2 diffs)
• ViewCellsManager.cpp (modified) (3 diffs)

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

@@ -115 +115 @@
 }
 
+void BvhLeaf::CollectObjects(ObjectContainer &objects)
+{
+        ObjectContainer::const_iterator oit, oit_end = objects.end();
+        for (oit = objects.begin(); oit != oit_end; ++ oit)
+        {
+                objects.push_back(*oit);
+        }
+}
 
 /******************************************************************/
@@ -161 +169 @@
 }
 
+
+void BvhInterior::CollectObjects(ObjectContainer &objects)
+{
+        mFront->CollectObjects(objects);
+        mBack->CollectObjects(objects);
+}
 
 

GTP/trunk/Lib/Vis/Preprocessing/src/BvHierarchy.h

@@ -182 +182 @@
         void SetParent(BvhInterior *parent);
 
+        // collects all objects under this node
+        virtual void CollectObjects(ObjectContainer &objects) = 0;
         /** The bounding box specifies the node extent.
         */
@@ -255 +257 @@
                 return s << A.mBoundingBox;
         }
-
+virtual void CollectObjects(ObjectContainer &objects);
 protected:
 
@@ -291 +293 @@
                 mSubdivisionCandidate = candidate; 
         }
-
+virtual void CollectObjects(ObjectContainer &objects);
 public:
 

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

@@ -1103 +1103 @@
 }
 
-}
+
+void HierarchyManager::ExportBoundingBoxes(OUT_STREAM &stream, const ObjectContainer &objects)
+{
+        stream << "<BoundingBoxes>" << endl;
+            
+        if (mObjectSpaceSubdivisionType == KD_BASED_OBJ_SUBDIV)
+        {
+                KdIntersectableMap::const_iterator kit, kit_end = mOspTree->mKdIntersectables.end();
+
+                int id = 0;
+                for (kit = mOspTree->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)
+                {
+                        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;
+}
+
+}

GTP/trunk/Lib/Vis/Preprocessing/src/HierarchyManager.h

@@ -225 +225 @@
         } 
 
+        void ExportBoundingBoxes(OUT_STREAM &stream, const ObjectContainer &objects);
+
 
 protected:
@@ -333 +335 @@
                 const VssRayContainer &rays, 
                 const ObjectContainer &objects);
+
 
 protected:

GTP/trunk/Lib/Vis/Preprocessing/src/KdTree.h

@@ -589 +589 @@
   AxisAlignedBox3 mBox;
   KdTreeStatistics mStat;
-
+public:
   /// stores the kd node intersectables used for pvs
   KdIntersectableMap mKdIntersectables;

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

@@ -13 +13 @@
 #include "ViewCellsManager.h"
 #include "Exporter.h"
+#include "BvHierarchy.h"
+
 
 
@@ -2375 +2377 @@
         for (it = viewCell->GetPvs().mEntries.begin(); it != it_end; ++ it)
         {
-                stream << (*it).first->GetId() << " ";
+                Intersectable *obj = (*it).first;
+                // hack: just output full pvs
+                if (obj->Type() == Intersectable::BVH_INTERSECTABLE)
+                {
+                        ObjectContainer objects; 
+                        BvhNode *node = dynamic_cast<BvhIntersectable *>(obj)->GetItem();
+                        node->CollectObjects(objects);
+                
+                        ObjectContainer::const_iterator oit, oit_end = objects.end();
+                        for (oit = objects.begin(); oit != oit_end; ++ oit)
+                        {
+                                stream << (*oit)->GetId() << " ";
+                        }
+                }
+                else
+                {
+                        stream << (*it).first->GetId() << " ";
+                }
         }
 }

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);
         }