FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Robert Osfield 2004-11-18 13:46:13 +00:00
parent ced404fa4f
commit 51c43cb12d
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
examples/osglauncher/osglauncher.cpp
View File

@ -30,6 +30,7 @@
#include <osgProducer/Viewer> #include <osgProducer/Viewer>
#include <osgDB/ReadFile> #include <osgDB/ReadFile>
#include <osgDB/FileUtils>
int runApp(std::string xapp); int runApp(std::string xapp);
@ -220,11 +221,19 @@ int runApp(std::string xapp)
void readConfFile(char* confFile) // read confFile 1 void readConfFile(char* confFile) // read confFile 1
{ {
std::cout << "Start reading confFile" << std::endl; std::cout << "Start reading confFile" << std::endl;
std::string fileName = osgDB::findDataFile(confFile);
if (fileName.empty())
{
std::cout << "Config file not found"<<confFile << std::endl;
return;
}
std::ifstream in(confFile); std::ifstream in(fileName.c_str());
if (!in) if (!in)
{ {
std::cout << "File " << confFile << " can not be opened!" << std::endl; std::cout << "File " << fileName << " can not be opened!" << std::endl;
exit(1); exit(1);
} }
std::string imageBuffer; std::string imageBuffer;
@ -379,12 +388,13 @@ int main( int argc, char **argv )
{ {
if (argc<=1) if (argc<=1)
{ {
std::cout << "Error: First argument missing!" << std::endl << "First argument -> confFile" << std::endl; readConfFile("osg.conf"); // read ConfigFile 1
return 0; }
else
{
readConfFile(argv[1]); // read ConfigFile 1
} }
readConfFile(argv[1]); // read ConfigFile 1
// construct the viewer. // construct the viewer.
osgProducer::Viewer viewer; osgProducer::Viewer viewer;