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

Timestamp:

02/15/07 14:45:30 (17 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• BvHierarchy.h (modified) (1 diff)
• ObjParser.cpp (modified) (2 diffs)
• ObjectsParser.cpp (modified) (7 diffs)
• ObjectsParser.h (modified) (1 diff)
• ObjectsParserXerces.h (modified) (1 diff)
• Preprocessor.cpp (modified) (4 diffs)
• PreprocessorFactory.cpp (modified) (1 diff)
• RssTree.cpp (modified) (1 diff)
• ViewCellsManager.cpp (modified) (1 diff)
• ViewCellsParser.cpp (modified) (1 diff)

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

@@ -365 +365 @@
 {
         friend class ViewCellsParseHandlers;
+        friend class ObjectsParseHandlers;
         friend class HierarchyManager;
 

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

@@ -236 +236 @@
 
         while (fgets(str, 1000, file) != NULL)
-        {++ line;
+        {
+                ++ line;
           switch (str[0]) 
                 {
                 case 'v': // vertex  or normal
                   {
-                        switch (str[1]) {
+                        switch (str[1]) 
+                        {
                         case 'n' :
-                          // normal do nothing
-                          break;
+                                // normal do nothing
+                                break;
                         default:
-                          float x, y, z; //cout << "v"; 
-                          sscanf(str + 1, "%f %f %f", &x, &y, &z);
-                          vertices.push_back(Vector3(x,y,z));
-                          //cout << "vertex: " << vertices.back() << endl;
+                                float x, y, z; //cout << "v";   
+                                sscanf(str + 1, "%f %f %f", &x, &y, &z);
+                                vertices.push_back(Vector3(x,y,z));
+                         
                         }
                         break;
@@ -258 +260 @@
                                 {
                                         Face *face = LoadFace(str, vertices, hashTable);
+
                                         if (!face) break;
         

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

@@ -88 +88 @@
         //if (!is_sorted(mPvsObjects.begin(), mPvsObjects.end(), ilt))
                 sort(mPvsObjects.begin(), mPvsObjects.end(), ilt);
-
+Debug << "here333";
         //if (!is_sorted(mPreprocessorObjects.begin(), mPreprocessorObjects.end(), ilt))
                 //sort(mPreprocessorObjects.begin(), mPreprocessorObjects.end(), ilt);
@@ -133 +133 @@
         if (element == "Leaf") 
         {
-                //cout << "l";
                 StartBvhLeaf(attributes);
         }
@@ -196 +195 @@
 }
 
+
 void ObjectsParseHandlers::StartBvhLeaf(AttributeList& attributes)
 {
@@ -217 +217 @@
                         sscanf(ptr, "%f %f %f", &maxBox.x, &maxBox.y, &maxBox.z);
                 }
-                /*if (attrName == "objects")
+                if (attrName == "objects")
                 {
                         StartBvhLeafObjects(objects, ptr);
-                }*/
+                }
         }
 
@@ -227 +227 @@
         BvhLeaf *leaf = new BvhLeaf(box, NULL, (int)objects.size());
 
-        //leaf->mObjects = objects;
-        //BvHierarchy::AssociateObjectsWithLeaf(leaf);
+        leaf->mObjects = objects;
+        BvHierarchy::AssociateObjectsWithLeaf(leaf);
 
         // new pvs object
@@ -370 +370 @@
 
                         GzFileInputSource isource(myFilePath);
+                        Debug<<"here93" << endl;
                         parser->parse(isource);
 #else
@@ -375 +376 @@
 
 #endif
-
+Debug<<"here932" << endl;
                         const unsigned long endMillis = XMLPlatformUtils::getCurrentMillis();
                         duration = endMillis - startMillis;

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

@@ -15 +15 @@
 {
 public:
-  ObjectsParser(): Parser() {}
+        
+        ObjectsParser(): Parser() {}
   
-  bool ParseObjects(const string &filename, 
-                                        ObjectContainer &pvsObjects,
-                                        const ObjectContainer &preprocessorObjects);
+        bool ParseObjects(const string &filename, 
+                                          ObjectContainer &pvsObjects,
+                                          const ObjectContainer &preprocessorObjects);
 };
 

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

@@ -25 +25 @@
 {
 public:
+
+        friend class BvHierarchy;
 
         // -----------------------------------------------------------------------

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

@@ -479 +479 @@
         const int files = SplitFilenames(filename, filenames);
         cout << "number of input files: " << files << endl;
+
         bool result = false;
         bool isObj = false;
@@ -533 +534 @@
                 
                                 result = parser->ParseFile(filename, 
-                                                                   mSceneGraph->GetRoot(),
-                                                                   mLoadMeshes,
-                                                                   fi);
-                                                
+                                                                                   mSceneGraph->GetRoot(),
+                                                                                   mLoadMeshes,
+                                                                                   fi);
+
                                 cout << "loaded " << (int)mSceneGraph->GetRoot()->mGeometry.size() << " entities" << endl;
+
                                 // only works for triangles
                                 if (result && !mLoadMeshes)
                                 {
                                         cout << "exporting binary obj to " << bnFile << "... " << endl;
+
                                         ExportBinaryObj(bnFile, mSceneGraph->GetRoot());
+                                
                                         cout << "finished" << endl;
                                 }
 
                                 delete parser;
-                        }
-                        else if (0)
-                        {
-                                ExportBinaryObj("../data/test.bn", mSceneGraph->GetRoot());
                         }
                 }
@@ -741 +741 @@
 
         Environment::GetSingleton()->GetStringValue("ViewCells.filename", buf);
-                
                 cout << "loading objects from " << buf << endl;
 
                 // load objects which will be used as pvs entries
                 ObjectContainer pvsObjects;
-
-                LoadObjects(buf, pvsObjects, mObjects);
+                if (0) LoadObjects(buf, pvsObjects, mObjects);
 
                 cout << "loading view cells from " << buf << endl;
@@ -1649 +1647 @@
 {
         ObjectsParser parser;
-
+Debug << "here322 " << filename << endl;
         const bool success = parser.ParseObjects(filename, 
                                                                                          pvsObjects, 

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

@@ -14 +14 @@
 Preprocessor *PreprocessorFactory::CreatePreprocessor(const string &preprocessorType)
 {
+        Debug << "here9191" << endl;
         if (preprocessorType == "vss")
-        {
+        {Debug << "here21112" << endl;
                 return new VssPreprocessor();
         }

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

@@ -2264 +2264 @@
   
   int startIndex = (int)rays.size();
-  //  Debug<<"B"<<flush;
-  
+    
   AxisAlignedBox3 box = GetBBox(leaf);
   AxisAlignedBox3 dirBox = GetDirBBox(leaf);

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

@@ -2609 +2609 @@
         }
 #else
-        cout<<"b";
         pvs.AddSample(obj, pdf);
 #endif

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

@@ -464 +464 @@
         if (element == "BoundingBox")
         {
-                // cout << "b";
                 StartBoundingBox(attributes);
         }