Changeset 2113 for GTP/trunk/Lib/Vis/Preprocessing/src/ViewCellsParser.cpp

Timestamp:

02/12/07 08:37:26 (17 years ago)

Author:

mattausch

Message:

warning: debug version

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/ViewCellsParser.cpp (modified) (17 diffs)

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

@@ -5 +5 @@
 #include <stdlib.h>
 #include <iostream>
+//#include <ext/algorithm>
+
 using namespace std;
 #include <xercesc/util/PlatformUtils.hpp>
@@ -76 +78 @@
 //  StdInParseHandlers: Constructors and Destructor
 // ---------------------------------------------------------------------------
-ViewCellsParseHandlers::ViewCellsParseHandlers(ObjectContainer *objects, 
-                                                                                           BoundingBoxConverter *bconverter):
+ViewCellsParseHandlers::ViewCellsParseHandlers(ObjectContainer &pvsObjects, 
+                                                                                           ObjectContainer &preprocessorObjects,
+                                                                                           BoundingBoxConverter *bconverter
+                                                                                           ):
   mElementCount(0)
   , mAttrCount(0)
@@ -92 +96 @@
   , mCurrentOspNode(NULL)
   , mCurrentBvhNode(NULL)
-  , mObjects(objects)
+  , mPvsObjects(pvsObjects)
+  , mPreprocessorObjects(preprocessorObjects)
   , mBoundingBoxConverter(bconverter)
   , mHierarchyManager(NULL)
@@ -98 +103 @@
   , nObjects(0)
 {
-        std::stable_sort(mObjects->begin(), mObjects->end(), ilt);
+        mCreatePvsObjects = mPvsObjects.empty();
+
+        // sort objects so we can search in them
+        //if (!is_sorted(mPvsObjects.begin(), mPvsObjects.end(), ilt))
+                sort(mPvsObjects.begin(), mPvsObjects.end(), ilt);
+
+        //if (!is_sorted(mPreprocessorObjects.begin(), mPreprocessorObjects.end(), ilt))
+                sort(mPreprocessorObjects.begin(), mPreprocessorObjects.end(), ilt);
 }
 
@@ -165 +177 @@
                 // the objects with the leaves, they can be classified geometrically
                 mHierarchyManager->mOspTree->
-                        InsertObjects(mHierarchyManager->mOspTree->mRoot, *mObjects);
+                        InsertObjects(mHierarchyManager->mOspTree->mRoot, mPvsObjects);
         }
 }
@@ -278 +290 @@
         // associate object ids with bounding boxes
         const long startTime = GetTime();
-        Debug<<"here32232"<<endl;
+        
         if (mBoundingBoxConverter)
-        {Debug<<"here3772"<<endl;
-                mBoundingBoxConverter->IdentifyObjects(mIBoundingBoxes, *mObjects);
+        {
+                mBoundingBoxConverter->IdentifyObjects(mIBoundingBoxes, mPvsObjects);
         }
 
@@ -394 +406 @@
 
 
-void ViewCellsParseHandlers::ExchangePvs(ViewCell *vc)
+void ViewCellsParseHandlers::ReplaceBvhPvs(ViewCell *vc)
 {
         //cout << "exchanging pvs" << endl;
@@ -404 +416 @@
 
         ObjectContainer oldIntersectables;
+
         // output PVS of view cell
         while (pit.HasMoreEntries())
@@ -454 +467 @@
         for (vit = mViewCells.begin(); vit != vit_end; ++ vit)
         {
-                ExchangePvs(*vit);
+                ReplaceBvhPvs(*vit);
         }
 }
@@ -486 +499 @@
         {
                 cout << "\nparsing view cells" << endl;
+                Debug << "\nparsing view cells" << endl;
                 
                 mCurrentState = PARSE_VIEWCELLS;
@@ -496 +510 @@
         if (element == "ViewSpaceHierarchy")
         {               
+                Debug << "\nparsing view space hierarchy" << endl;
                 cout << "\nparsing view space hierarchy" << endl;
                 mCurrentState = PARSE_VIEWSPACE_HIERARCHY;
@@ -505 +520 @@
         {
                 cout << "\nparsing object space hierarchy" << endl;
+                Debug << "\nparsing object space hierarchy" << endl;
+
                 mCurrentState = PARSE_OBJECTSPACE_HIERARCHY;
                 StartObjectSpaceHierarchy(attributes);
@@ -574 +591 @@
 
                 ObjectContainer::iterator oit = 
-                                                                lower_bound(mObjects->begin(), 
-                                                                                        mObjects->end(), 
+                                                                lower_bound(mPvsObjects.begin(), 
+                                                                                        mPvsObjects.end(), 
                                                                                         (Intersectable *)&dummyInst, ilt);      
 
-                if ((oit != mObjects->end()) && ((*oit)->GetId() == objId))
+                if ((oit != mPvsObjects.end()) && ((*oit)->GetId() == objId))
                 {
                         // $$JB we should store a float a per object which corresponds
@@ -669 +686 @@
                                 //std::stable_sort(objects.begin(), objects.end(), ilt);
                                 mHierarchyManager->mOspTree->mBoundingBox.Initialize();
-                                ObjectContainer::const_iterator oit, oit_end = mObjects->end();
+                                ObjectContainer::const_iterator oit, oit_end = mPvsObjects.end();
                                 
                                 //-- compute bounding box
-                                for (oit = mObjects->begin(); oit != oit_end; ++ oit)
+                                for (oit = mPvsObjects.begin(); oit != oit_end; ++ oit)
                                 {
                                         Intersectable *obj = *oit;
@@ -1324 +1341 @@
 
                 ObjectContainer::iterator oit =
-                        lower_bound(mObjects->begin(), 
-                                                mObjects->end(), 
+                        lower_bound(mPvsObjects.begin(), 
+                                                mPvsObjects.end(), 
                                                 (Intersectable *)&dummyInst, 
                                                 ilt);   
                                                         
-                if ((oit != mObjects->end()) && ((*oit)->GetId() == objId))
+                if ((oit != mPvsObjects.end()) && ((*oit)->GetId() == objId))
                 {
                         objects.push_back(*oit);
+                        Debug << "x";
                 }
                 else
                 {
-                        cerr << "StartBvhLeafObjects error: object with id " << objId << " does not exist" << endl;
+                        Debug << "y";
+                        //cerr << "StartBvhLeafObjects error: object with id " << objId << " does not exist" << endl;
                 }
         }
@@ -1412 +1431 @@
 
 
-bool ViewCellsParser::ParseViewCellsFile(const string filename, 
+bool ViewCellsParser::ParseViewCellsFile(const string &filename, 
                                                                                  ViewCellsManager **viewCells,
-                                                                                 ObjectContainer *objects,
+                                                                                 ObjectContainer &pvsObjects,
+                                                                                 ObjectContainer &preprocessorObjects,
                                                                                  BoundingBoxConverter *bconverter)
 {
@@ -1448 +1468 @@
   //  to do.
   //
-  ViewCellsParseHandlers handler(objects, bconverter);
+  ViewCellsParseHandlers handler(pvsObjects, preprocessorObjects, bconverter);
   parser->setDocumentHandler(&handler);
   parser->setErrorHandler(&handler);