Changeset 3664 for OpenSceneGraph/trunk/examples/osglauncher/osglauncher.cpp

Timestamp:

11/18/04 14:46:13 (9 years ago)

Author:

robert

Message:

Added a search for the config file, and defaulting to osg.conf

Files:

• OpenSceneGraph/trunk/examples/osglauncher/osglauncher.cpp (modified) (3 diffs)

OpenSceneGraph/trunk/examples/osglauncher/osglauncher.cpp

@@ -31 +31 @@
 
 #include <osgDB/ReadFile>
+#include <osgDB/FileUtils>
 
 int runApp(std::string xapp);
@@ -221 +222 @@
 {
     std::cout << "Start reading confFile" << std::endl;
-
-    std::ifstream in(confFile);
+    
+    std::string fileName = osgDB::findDataFile(confFile);
+    if (fileName.empty())
+    {
+        std::cout << "Config file not found"<<confFile << std::endl;
+        return;
+    }
+    
+
+    std::ifstream in(fileName.c_str());
     if (!in)
     {
-        std::cout << "File " << confFile << " can not be opened!" << std::endl;
+        std::cout << "File " << fileName << " can not be opened!" << std::endl;
         exit(1);
     }
@@ -380 +389 @@
     if (argc<=1)
     {
-        std::cout << "Error: First argument missing!" << std::endl << "First argument -> confFile" << std::endl;
-        return 0;
-    }
-    
-    readConfFile(argv[1]);                                                                            // read ConfigFile        1
-       
+        readConfFile("osg.conf");                                                                          // read ConfigFile        1
+    }
+    else
+    {
+        readConfFile(argv[1]);                                                                          // read ConfigFile        1
+    }
+    
     // construct the viewer.
     osgProducer::Viewer viewer;