Changeset 2544 for GTP/trunk/Lib/Vis/Preprocessing/src/Preprocessor.cpp

Timestamp:

08/22/07 08:01:21 (17 years ago)

Author:

mattausch

Message:

 

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/Preprocessor.cpp (modified) (13 diffs)

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

@@ -33 +33 @@
 
 
+inline static bool ilt(Intersectable *obj1, Intersectable *obj2)
+{
+        return obj1->mId < obj2->mId;
+}
+
+
 Preprocessor *preprocessor = NULL;
   
@@ -403 +409 @@
           ((rayCastMethod == RayCaster::INTEL_RAYCASTER) && mLoadMeshes) ?
           &mFaceParents : NULL;
-        
+
         if (files == 1) 
-          {
+        {
                 if (strstr(filename.c_str(), ".x3d"))
-                  {
+                {
                         parser = new X3dParser;
-                        
+
                         result = parser->ParseFile(filename, 
-                                                                           mSceneGraph->GetRoot(),
-                                                                           mLoadMeshes,
-                                                                           fi);
+                                mSceneGraph->GetRoot(),
+                                mLoadMeshes,
+                                fi);
                         delete parser;
                 }
@@ -421 +427 @@
 
                         result = parser->ParseFile(filename, 
-                                                                           mSceneGraph->GetRoot(),
-                                                                           mLoadMeshes,
-                                                                           fi);
+                                mSceneGraph->GetRoot(),
+                                mLoadMeshes,
+                                fi);
                         delete parser;
                 }
@@ -432 +438 @@
                         // hack: load binary dump
                         const string bnFile = ReplaceSuffix(filename, ".obj", ".bn");
-                        
+
                         if (!mLoadMeshes)
                         {
@@ -439 +445 @@
 
                         // parse obj
-            if (!result)
+                        if (!result)
                         {
                                 cout << "no binary dump available or loading full meshes, parsing file" << endl;
                                 parser = new ObjParser;
-                
-                                result = parser->ParseFile(filename, 
-                                                                   mSceneGraph->GetRoot(),
-                                                                   mLoadMeshes,
-                                                                   fi);
-                                                
+
+                                result = parser->ParseFile(filename, mSceneGraph->GetRoot(), mLoadMeshes, fi);
+
                                 cout << "loaded " << (int)mSceneGraph->GetRoot()->mGeometry.size() << " entities" << endl;
 
@@ -457 +460 @@
 
                                         ExportBinaryObj(bnFile, mSceneGraph->GetRoot());
-                                
+
                                         cout << "finished" << endl;
                                 }
@@ -467 +470 @@
                 {
                         parser = new UnigraphicsParser;
-                        result = parser->ParseFile(filename, 
-                                                                           mSceneGraph->GetRoot(),
-                                                                           mLoadMeshes,                                                           
-                                                                           fi);
+                        result = parser->ParseFile(filename, mSceneGraph->GetRoot(), mLoadMeshes, fi);
                         delete parser;
                 }
-                
+
                 cout << filename << endl;
         } 
@@ -479 +479 @@
         {
                 vector<string>::const_iterator fit, fit_end = filenames.end();
-                
+
                 for (fit = filenames.begin(); fit != fit_end; ++ fit) 
                 {
@@ -506 +506 @@
                 }
         }
-        
+
         if (result) 
-        { 
-                mSceneGraph->AssignObjectIds();
- 
+        {  
                 int intersectables, faces;
                 mSceneGraph->GetStatistics(intersectables, faces);
@@ -520 +518 @@
                 mObjects.reserve(intersectables);
                 mSceneGraph->CollectObjects(&mObjects);
-                
-                // temp hack
-                //ExportObj("cropped_vienna.obj", mObjects);
+        
+                mSceneGraph->AssignObjectIds();
+
                 mSceneGraph->GetRoot()->UpdateBox();
                                 
@@ -605 +603 @@
 bool
 Preprocessor::Export( const string &filename,
-                                          const bool scene,
-                                          const bool kdtree
-                                          )
-{
-  Exporter *exporter = Exporter::GetExporter(filename);
-        
-  if (exporter) {
-    if (2 && scene)
-      exporter->ExportScene(mSceneGraph->GetRoot());
-
-    if (1 && kdtree) {
-      exporter->SetWireframe();
-      exporter->ExportKdTree(*mKdTree);
-    }
-
-    delete exporter;
-    return true;
-  }
-
-  return false;
+                                         const bool scene,
+                                         const bool kdtree
+                                         )
+{
+        Exporter *exporter = Exporter::GetExporter(filename);
+
+        if (exporter) {
+                if (2 && scene)
+                        exporter->ExportScene(mSceneGraph->GetRoot());
+
+                if (1 && kdtree) {
+                        exporter->SetWireframe();
+                        exporter->ExportKdTree(*mKdTree);
+                }
+
+                delete exporter;
+                return true;
+        }
+
+        return false;
 }
 
@@ -631 +629 @@
 {
         // load the view cells assigning the found objects to the pvss
-#if 1
+#if 0
         cerr << "loading binary view cells" << endl;
         ViewCellsManager *dummyViewCellsManager = 
@@ -816 +814 @@
 // use ascii format to store rays
 #define USE_ASCII 0
-
-
-static inline bool ilt(Intersectable *obj1, Intersectable *obj2)
-{
-        return obj1->mId < obj2->mId;
-}