Changeset 2091 for GTP/trunk/Lib

Timestamp:

02/05/07 14:33:28 (18 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• Exporter.h (modified) (3 diffs)
• KdTree.cpp (modified) (1 diff)
• ViewCellsManager.cpp (modified) (1 diff)

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

@@ -118 +118 @@
 
   virtual void
-  ExportGeometry(
-        const ObjectContainer &objects, 
-        const bool exportSingleMesh = false, 
-        AxisAlignedBox3 *bbox = NULL);
+  ExportGeometry(const ObjectContainer &objects, 
+                                 const bool exportSingleMesh = false, 
+                                 AxisAlignedBox3 *bbox = NULL);
 
-  virtual void
+  virtual void 
   ExportMesh(Mesh *mesh) = 0;
 
@@ -137 +136 @@
   void SetFilled() { mWireframe = false; }
   
-  void SetForcedMaterial(const Material &m) {
-    mForcedMaterial = m;
-    mUseForcedMaterial = true;
+  void SetForcedMaterial(const Material &m) 
+  {
+          mForcedMaterial = m;
+          mUseForcedMaterial = true;
   }
-  void ResetForcedMaterial() {
-    mUseForcedMaterial = false;
+
+  void ResetForcedMaterial() 
+  {
+          mUseForcedMaterial = false;
   }
     
@@ -152 +154 @@
   void ExportKdIntersectable(const KdIntersectable &kdObj);
 
-  bool ExportBvHierarchy(
-          const BvHierarchy &bvHierarchy, 
-          const float maxPvs, 
-          AxisAlignedBox3 *box = NULL,
-          const bool exportBoundingBoxes = true);
+  bool ExportBvHierarchy(const BvHierarchy &bvHierarchy, 
+                                                 const float maxPvs, 
+                                                 AxisAlignedBox3 *box = NULL,
+                                                 const bool exportBoundingBoxes = true);
 
   virtual void ExportMeshInstance(MeshInstance *mi);
 
-  virtual void
-  ExportTransformedMeshInstance(TransformedMeshInstance *mi);
+  virtual void ExportTransformedMeshInstance(TransformedMeshInstance *mi);
 
-  virtual void ExportPolygon(Polygon3 *poly) = 0;
+  virtual void 
+  ExportPolygon(Polygon3 *poly) = 0;
+
+
+  ///////////////////////////
 
   bool mClampToBox;

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

@@ -1380 +1380 @@
 
         // sort objects by their id
-        std::stable_sort(objects.begin(), objects.end(), ilt);
+        sort(objects.begin(), objects.end(), ilt);
 
         mBox.Initialize();

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

@@ -6591 +6591 @@
         ///////////////
                 //-- export bounding boxes
-                //-- The bounding boxes are used to identify 
-                //-- the objects in the rendering engine
-                mHierarchyManager->ExportBoundingBoxes(stream, objects);
+                //-- we need the boxes to identify objects in the target engine
+
+                if (mUseKdPvs)
+                {
+                        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 id
+                                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
+                {
+                        mHierarchyManager->ExportBoundingBoxes(stream, objects);
+                }
         }