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

Timestamp:

09/18/06 02:23:47 (18 years ago)

Author:

mattausch

Message:

debugging after merge

File:

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

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

@@ -233 +233 @@
         Parser *parser;
         vector<string> filenames;
-        int files = SplitFilenames(filename, filenames);
+        const int files = SplitFilenames(filename, filenames);
         cout << "number of input files: " << files << endl;
         bool result = false;
@@ -239 +239 @@
         // root for different files
         mSceneGraph->SetRoot(new SceneGraphNode());
+
+        // intel ray caster can only trace triangles
+        vector<FaceParentInfo> *fi = (mRayCastMethod == Preprocessor::INTEL_RAYCASTER) ?
+                &mFaceParents : NULL;
 
         if (files == 1) {
@@ -253 +257 @@
 
                 cout << filename << endl;
-
-                if (mRayCastMethod == Preprocessor::INTEL_RAYCASTER)
-                { 
-                        result = parser->ParseFile(
+                
+                result = parser->ParseFile(
                                 filename, 
                                 mSceneGraph->GetRoot(),
                                 mLoadMeshes,
-                                &mFaceParents);
-                }
-                else
-                { 
-                        result = parser->ParseFile(filename, mSceneGraph->GetRoot(), mLoadMeshes);
-                }
-                
+                                fi);
+                        
                 delete parser;
 
-        } else {
-                
-                for (int i= 0; i < filenames.size(); i++) {
-                  if (strstr(filenames[i].c_str(), ".x3d"))
-                        parser = new X3dParser;
-                  else 
-                        parser = new UnigraphicsParser;
-                  
-                  SceneGraphNode *node = new SceneGraphNode();
-                  bool success;
-                  
-                  if (mRayCastMethod == Preprocessor::INTEL_RAYCASTER)
-                  { 
-                          success = parser->ParseFile(
-                                  filename, 
-                                  node,
-                                  mLoadMeshes,
-                                  &mFaceParents);
-                  }
-                  else
-                  {
-                          success = parser->ParseFile(filename, node, mLoadMeshes);
-                  }
-
-                  if (success) 
-                  { 
-                          mSceneGraph->GetRoot()->mChildren.push_back(node);
-                          result = true; // at least one file parsed
-                  }
-                  
-                  delete parser;
+        } 
+        else {
+                vector<string>::const_iterator fit, fit_end = filenames.end();
+                
+                for (fit = filenames.begin(); fit != fit_end; ++ fit) 
+                {
+                        const string filename = *fit;
+
+                        cout << "parsing file " << filename.c_str() << endl;
+                        if (strstr(filename.c_str(), ".x3d"))
+                                parser = new X3dParser;
+                        else 
+                                parser = new UnigraphicsParser;
+
+                        SceneGraphNode *node = new SceneGraphNode();
+                        const bool success = parser->ParseFile(
+                                filename, 
+                                node,
+                                mLoadMeshes,
+                                fi);
+
+                        if (success) 
+                        { 
+                                mSceneGraph->GetRoot()->mChildren.push_back(node);
+                                result = true; // at least one file parsed
+                        }
+
+                        delete parser;
                 }
         }