Changeset 931 for GTP/trunk/Lib/Vis/Preprocessing

Timestamp:

05/08/06 18:57:11 (19 years ago)

Author:

mattausch

Message:

added bounding boxes to xml description

Location:

GTP/trunk/Lib/Vis/Preprocessing

Files:

• scripts/Preprocessor.vcproj (modified) (1 diff)
• src/GlRenderer.cpp (modified) (1 diff)
• src/Preprocessor.cpp (modified) (1 diff)
• src/ViewCellsManager.cpp (modified) (12 diffs)
• src/ViewCellsManager.h (modified) (11 diffs)
• src/ViewCellsParser.cpp (modified) (9 diffs)
• src/ViewCellsParser.h (modified) (2 diffs)
• src/ViewCellsParserXerces.h (modified) (5 diffs)
• src/VssPreprocessor.cpp (modified) (1 diff)

GTP/trunk/Lib/Vis/Preprocessing/scripts/Preprocessor.vcproj

@@ -123 +123 @@
                         </File>
                         <File
+                                RelativePath="..\src\BoundingBoxConverter.h">
+                        </File>
+                        <File
                                 RelativePath="..\src\Camera.cpp">
                         </File>

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

@@ -930 +930 @@
         RenderIntersectable(*oi);
 
-  ViewCell *viewcell;
+  ViewCell *viewcell = NULL;
 
   QImage im1, im2;

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

@@ -265 +265 @@
 {
   
-  mViewCellsManager->ExportViewCells(filename,
-                                                                         true);
+  mViewCellsManager->ExportViewCells(filename, true, mObjects);
   
   return true;

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

@@ -15 +15 @@
 #include "VssPreprocessor.h"
 #include "RssPreprocessor.h"
+#include "BoundingBoxConverter.h"
+
 
 namespace GtpVisibilityPreprocessor {
@@ -1858 +1860 @@
 
 
-bool ViewCellsManager::ExportViewCells(const string filename, const bool exportPvs)
+bool ViewCellsManager::ExportViewCells(const string filename, const bool exportPvs, const ObjectContainer &objects)
 {
         return false;
@@ -1956 +1958 @@
                                                                                  IndexedBoundingBoxContainer &boxes) const
 {
-        // HACK: needed only for lower_bound algorithm to find the 
-        // intersected objects
-
         Vector3 bmin, bmax;
         int id;
@@ -2021 +2020 @@
 }
 
+
+float ViewCellsManager::GetFilterWidth() 
+{
+        return mFilterWidth;
+}
+
+
+float ViewCellsManager::GetAbsFilterWidth() 
+{
+        return Magnitude(mViewSpaceBox.Size()) * mFilterWidth;
+}
+
+
+bool ViewCellsManager::ExportBoundingBoxes(ofstream &xmlstream, 
+                                                                                   const ObjectContainer &objects) const
+{
+        //-- export the view cells and the pvs
+        xmlstream << "<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();
+
+                        //-- the bounding boxes
+                        xmlstream << "<BoundingBox" << " id=\"" << mi->GetId() << "\""
+                                      << " min=\"" << box.Min().x << " " << box.Min().y << " " << box.Min().z << "\""
+                                          << " max=\"" << box.Max().x << " " << box.Max().y << " " << box.Max().z << "\" />" << endl;
+        }
+
+        xmlstream << "</BoundingBoxes>" << endl;
+
+        return true;
+}
+
+
 /**********************************************************************/
-/*                   BspViewCellsManager implementation               */
+/*                 BspViewCellsManager implementation                 */
 /**********************************************************************/
 
@@ -2282 +2319 @@
                 char filename[100];
                 environment->GetStringValue("ViewCells.filename", filename);
-                ExportViewCells(filename, mExportPvs);
+                ExportViewCells(filename, mExportPvs, objects);
         }
         
         // export bounding boxes
-        if (mExportBboxesForPvs)
+        if (0 && mExportBboxesForPvs)
         {
                 char filename[100];
@@ -2729 +2766 @@
 
 
-bool BspViewCellsManager::ExportViewCells(const string filename, const bool exportPvs)
+bool BspViewCellsManager::ExportViewCells(const string filename, const bool exportPvs, const ObjectContainer &objects)
 {
         cout << "exporting view cells to xml ... ";
@@ -3974 +4011 @@
                 char filename[100];
                 environment->GetStringValue("ViewCells.filename", filename);
-                ExportViewCells(filename, mExportPvs);
+                ExportViewCells(filename, mExportPvs, objects);
         }
 
@@ -4687 +4724 @@
 
 ViewCellsManager *ViewCellsManager::LoadViewCells(const string filename, 
-                                                                                                  ObjectContainer *objects)
+                                                                                                  ObjectContainer *objects,
+                                                                                                  BoundingBoxConverter *bconverter)
 {
         ViewCellsParser parser;
@@ -4695 +4733 @@
         Debug << "vc filename: " << filename << endl;
 
-        if (parser.ParseFile(filename, &vm, objects))
+        //BoundingBoxConverter bconverter;
+
+        if (parser.ParseFile(filename, &vm, objects, bconverter))
         {
                 //vm->PrepareLoadedViewCells();
@@ -4719 +4759 @@
 
 
-
-bool VspBspViewCellsManager::ExportViewCells(const string filename, const bool exportPvs)
+bool VspBspViewCellsManager::ExportViewCells(const string filename, 
+                                                                                         const bool exportPvs, 
+                                                                                         const ObjectContainer &objects)
 {
         cout << "exporting view cells to xml ... ";
@@ -4737 +4778 @@
                    << " max=\"" << mViewSpaceBox.Max().x << " " << mViewSpaceBox.Max().y << " " << mViewSpaceBox.Max().z << "\" />" << endl;
 
-
+        ExportBoundingBoxes(stream, objects);
 
         //-- the type of the view cells hierarchy
@@ -4750 +4791 @@
 
 
-        //-- export the hierarchy
+        //-- export the spatial hierarchy
         stream << "<Hierarchy>" << endl;
         mVspBspTree->Export(stream);

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

@@ -32 +32 @@
 class ViewCellsTree;
 class MergeCandidate;
+class BoundingBoxConverter;
+
 
 struct BspRay;
@@ -50 +52 @@
 };
 
-
-struct IndexedBoundingBox: public std::pair<int, AxisAlignedBox3>
-{
-        typedef std::pair<int, AxisAlignedBox3> IndexedBoundingBoxParent;
-
-        IndexedBoundingBox(int idx, const AxisAlignedBox3 &box): IndexedBoundingBoxParent(idx, box)
-        {
-
-        }
-};
 
 /**     Manages different higher order operations on the view cells.
@@ -77 +69 @@
         enum {BSP, KD, VSP_KD, VSP_BSP};
   
-        /// view cells evaluation type
+        /// render cost evaluation type
         enum {PER_OBJECT, PER_TRIANGLE};
 
@@ -308 +300 @@
         /** Writes view cells to disc.
         */
-        virtual bool ExportViewCells(const string filename, const bool exportPvs);
+        virtual bool ExportViewCells(const string filename, const bool exportPvs, const ObjectContainer &objects);
 
         /** Casts beam to collect view cells.
@@ -418 +410 @@
         float EvalRenderCost(Intersectable *obj) const;
 
-    void
-        ApplyFilter(KdTree *kdTree,
-                                const float viewSpaceFilterSize,
-                                const float spatialFilterSize
-                                );
-
-  void
-  ApplySpatialFilter(
-                                         KdTree *kdTree,
-                                         const float spatialFilterSize,
-                                         ObjectPvs &pvs
-                                         );
+   
         
         /** Returns bounding box of a view cell.
@@ -438 +419 @@
         */
         bool ExportBoundingBoxes(const string filename, const ObjectContainer &objects) const;
-
+    
         /** Load the bounding boxes into the container.
         */
         bool LoadBoundingBoxes(const string filename, IndexedBoundingBoxContainer &boxes) const;
 
-  bool GetExportPvs() const {
-        return mExportPvs;
-  }
+        bool GetExportPvs() const 
+        {
+                return mExportPvs;
+        }
 
         /** Loads view cells from file. The view cells manager is created with 
@@ -452 +434 @@
                 @returns the view cells manager if loading was successful, false otherwise
         */
-        static ViewCellsManager *LoadViewCells(const string filename, ObjectContainer *objects);
-
-  float GetFilterWidth() {
-        return mFilterWidth;
-  }
-
-  float GetAbsFilterWidth() {
-        return Magnitude(mViewSpaceBox.Size())*mFilterWidth;
-  }
+        static ViewCellsManager *LoadViewCells(const string filename, 
+                                                                                   ObjectContainer *objects, 
+                                                                                   BoundingBoxConverter *bconverter = NULL);
+
+
+        ////////////////////////////////////////////////////////7
+        // visiblity filter options
+        // TODO: write own visibiltiy filter class
+        void ApplyFilter(KdTree *kdTree,
+                                         const float viewSpaceFilterSize,
+                                         const float spatialFilterSize);
+
+        void ApplySpatialFilter(KdTree *kdTree,
+                                                        const float spatialFilterSize,
+                                                        ObjectPvs &pvs);
+
+         void ApplyFilter(ViewCell *viewCell,
+                                          KdTree *kdTree,
+                                          const float viewSpaceFilterSize,
+                                          const float spatialFilterSize,
+                                          ObjectPvs &pvs);
+
+        float GetFilterWidth();
+
+        float GetAbsFilterWidth();
+
+        
+        /** Returns the bounding box of filter width.
+        */
+        AxisAlignedBox3 GetFilterBBox(const Vector3 &viewPoint, const float width) const;
 
 protected:
-    void
-        ApplyFilter(ViewCell *viewCell,
-                                KdTree *kdTree,
-                                const float viewSpaceFilterSize,
-                                const float spatialFilterSize,
-                                ObjectPvs &pvs
-                                );
-
-  
-        /** Returns the bounding box of filter width.
-        */
-        AxisAlignedBox3 GetFilterBBox(const Vector3 &viewPoint, const float width) const;
+        /** Exports bounding boxes as xml stream
+        */
+        bool ExportBoundingBoxes(ofstream &xmlstream, const ObjectContainer &objects) const;
 
         /** Intersects box with the tree and returns the number of intersected boxes.
@@ -486 +480 @@
         virtual void TestFilter(const ObjectContainer &objects) {};
 
-        /**
-                if the view cells tree was already constructed or not.
+        /** If the view cells tree was already constructed or not.
         */
         bool ViewCellsTreeConstructed() const;
@@ -495 +488 @@
                                                 VssRayContainer &vssRays) const;
 
+        /** Parse the options from the environment file.
+        */
         void ParseEnvironment();
 
@@ -700 +695 @@
         void Finalize(ViewCell *viewCell, const bool createMesh);
 
-        bool ExportViewCells(const string filename, const bool exportPvs);
+        bool ExportViewCells(const string filename, const bool exportPvs, const ObjectContainer &objects);
 
         /** Constructs merge hierarchy which corresponds to the spatial hierarchy.
@@ -908 +903 @@
         void CreateMesh(ViewCell *vc);
 
-        bool ExportViewCells(const string filename, const bool exportPvs);
+        bool ExportViewCells(const string filename, const bool exportPvs, const ObjectContainer &objects);
 
         int CastBeam(Beam &beam);

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

@@ -65 +65 @@
 //  StdInParseHandlers: Constructors and Destructor
 // ---------------------------------------------------------------------------
-ViewCellsParseHandlers::ViewCellsParseHandlers(ObjectContainer *objects):
+ViewCellsParseHandlers::ViewCellsParseHandlers(ObjectContainer *objects, BoundingBoxConverter *bconverter):
   mElementCount(0)
   , mAttrCount(0)
@@ -77 +77 @@
   , mCurrentViewCell(NULL)
   , mCurrentBspNode(NULL)
-{
-        mObjects = objects;
+  , mObjects(objects)
+  , mBoundingBoxConverter(bconverter)
+{
+        // mObjects = objects;
 }
 
@@ -132 +134 @@
 }
 
+
 inline static bool vlt(ViewCell *v1, ViewCell *v2)
 {
@@ -144 +147 @@
 }
 
+
+void ViewCellsParseHandlers::EndBoundingBoxes()
+{
+        // bounding boxes gathered: associate object ids with bounding boxes
+        if (mBoundingBoxConverter)
+                mBoundingBoxConverter->IdentifyObjects(mIBoundingBoxes, *mObjects);
+}
 
 
@@ -208 +218 @@
         if (element == "ViewSpaceBox")
         {
+                Debug << "v";
+                StartViewSpaceBox(attributes);
+        }
+
+        // decides the used view cell hierarchy
+        if (element == "BoundingBox")
+        {
                 Debug << "b";
-                StartViewSpaceBox(attributes);
-        }
-
+                StartBoundingBox(attributes);
+        }
 
         // use different methods for the given view cell hierarchy types
@@ -379 +395 @@
 
 
+void ViewCellsParseHandlers::StartBoundingBox(AttributeList& attributes)
+{
+        int len = attributes.getLength();
+
+        Vector3 bmin, bmax;
+        int id;
+
+        for (int i = 0; i < len; ++ i) 
+        {
+                string attrName(StrX(attributes.getName(i)).LocalForm());
+                StrX attrValue(attributes.getValue(i));
+                const char *ptr = attrValue.LocalForm();
+
+
+                if (attrName == "id")
+                {
+                        sscanf(ptr, "%d", &id);
+                }
+
+                if (attrName == "min") 
+                {
+                        sscanf(ptr, "%f %f %f",
+                                   &bmin.x, &bmin.y, &bmin.z);
+                }
+                else if (attrName == "max") 
+                {
+                        sscanf(ptr, "%f %f %f",
+                                   &bmax.x, &bmax.y, &bmax.z);
+                }
+        }
+
+        AxisAlignedBox3 box(bmin, bmax);
+        mIBoundingBoxes.push_back(IndexedBoundingBox(id, box));
+
+        Debug << "view space box: " << mViewSpaceBox << endl;
+}
+
+
 void ViewCellsParseHandlers::StartBspLeaf(AttributeList& attributes)
 {
@@ -637 +691 @@
 bool ViewCellsParser::ParseFile(const string filename, 
                                                                 ViewCellsManager **viewCells,
-                                                                ObjectContainer *objects)
+                                                                ObjectContainer *objects,
+                                                                BoundingBoxConverter *bconverter)
 {
   // Initialize the XML4C system
@@ -669 +724 @@
   //  to do.
   //
-  ViewCellsParseHandlers handler(objects);
+  ViewCellsParseHandlers handler(objects, bconverter);
   parser->setDocumentHandler(&handler);
   parser->setErrorHandler(&handler);
@@ -724 +779 @@
   XMLPlatformUtils::Terminate();
   
-   // assign new view cells manager
+  //-- assign new view cells manager
   *viewCells = handler.mViewCellsManager;
   

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

@@ -9 +9 @@
 class ViewCellsManager;
 class VspBspTree;
+class BoundingBoxConverter;
 
 class ViewCellsParser : public Parser
@@ -18 +19 @@
   bool ParseFile(const string filename, 
                                  ViewCellsManager **viewCells,
-                                 ObjectContainer *objects);
+                                 ObjectContainer *objectsm,
+                                 BoundingBoxConverter *bconverter);
 };
 

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

@@ -7 +7 @@
 #include <xercesc/sax/HandlerBase.hpp>
 #include "Mesh.h"
+#include "BoundingBoxConverter.h"
 
 namespace GtpVisibilityPreprocessor {
@@ -27 +28 @@
   //  Constructors and Destructor
   // -----------------------------------------------------------------------
-  ViewCellsParseHandlers(ObjectContainer *objects);
+  ViewCellsParseHandlers(ObjectContainer *objects, BoundingBoxConverter *bconverter);
   ~ViewCellsParseHandlers();
   
@@ -78 +79 @@
   ViewCellsManager *mViewCellsManager;
   ObjectContainer *mObjects;
+  BoundingBoxConverter *mBoundingBoxConverter;
 
   AxisAlignedBox3 mViewSpaceBox;
+
+  IndexedBoundingBoxContainer mIBoundingBoxes;
 
   bool mParseViewCells;
@@ -90 +94 @@
   void StartViewCell(ViewCell *viewCell, AttributeList&  attributes);
   void EndViewCells();
+  void EndBoundingBoxes();
         
   void StartHierarchy(AttributeList& attributes);
@@ -96 +101 @@
   void StartViewSpaceBox(AttributeList&  attributes);
 
+  void StartBoundingBox(AttributeList& attributes);
   void StartViewCellLeaf(AttributeList& attributes);
   void StartViewCellInterior(AttributeList& attributes);

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

@@ -627 +627 @@
           VssRayContainer dummies;
           mViewCellsManager->Visualize(mObjects, dummies);
-          mViewCellsManager->ExportViewCells("test.xml", mViewCellsManager->GetExportPvs());
+          mViewCellsManager->ExportViewCells("test.xml", mViewCellsManager->GetExportPvs(), mObjects);
   }