Add a new tool called fgviewer.

Modified Files:
	configure.ac utils/Makefile.am
Added Files:
 	utils/fgviewer/.cvsignore utils/fgviewer/Makefile.am
	utils/fgviewer/fgviewer.cxx

diff --git a/configure.ac b/configure.ac
index 3ea1d4f501d180400e3c1639993fb46afa048cee..1af45ab9dfaaf21fb7e4d0f00563af965320aa6f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -729,6 +729,7 @@ AC_CONFIG_FILES([ \
        utils/propmerge/Makefile \
        utils/TerraSync/Makefile \
        utils/xmlgrep/Makefile \
+       utils/fgviewer/Makefile \
 ])
 AC_OUTPUT
 

diff --git a/utils/Makefile.am b/utils/Makefile.am
index 5989c57f1951a27d56de00ee2847b83d424318aa..1f183fec5e438cff82fa7a2efc12176b1e4cb7a8 100644 (file)
--- a/utils/Makefile.am
+++ b/utils/Makefile.am
@@ -1,4 +1,4 @@
 DIST_SUBDIRS = GPSsmooth TerraSync Modeller js_server fgadmin xmlgrep propmerge
 
-SUBDIRS = GPSsmooth TerraSync Modeller js_server propmerge
+SUBDIRS = GPSsmooth TerraSync Modeller js_server propmerge fgviewer
 

diff --git a/utils/fgviewer/.cvsignore b/utils/fgviewer/.cvsignore
new file mode 100644 (file)
index 0000000..d14287d
--- /dev/null
+++ b/utils/fgviewer/.cvsignore
@@ -0,0 +1,4 @@
+.deps
+Makefile
+Makefile.in
+fgviewer

diff --git a/utils/fgviewer/Makefile.am b/utils/fgviewer/Makefile.am
new file mode 100644 (file)
index 0000000..c0384d8
--- /dev/null
+++ b/utils/fgviewer/Makefile.am
@@ -0,0 +1,15 @@
+bin_PROGRAMS = fgviewer
+
+fgviewer_SOURCES = fgviewer.cxx
+fgviewer_LDADD = \
+       -lsgroute -lsgsky -lsgsound -lsgephem -lsgtgdb -lsgmaterial -lsgmodel \
+       -lsgbvh -lsgutil -lsgtiming -lsgio -lsgscreen -lsgmath -lsgbucket \
+       -lsgprops -lsgdebug -lsgmagvar -lsgmisc -lsgnasal -lsgxml -lsgsound \
+       -lsgserial -lsgstructure -lsgenvironment \
+       -lplibul \
+       $(OSG_LIBS) \
+       $(THREAD_LIBS) \
+       $(network_LIBS) \
+       -lz \
+       $(opengl_LIBS) \
+       $(openal_LIBS)

diff --git a/utils/fgviewer/fgviewer.cxx b/utils/fgviewer/fgviewer.cxx
new file mode 100644 (file)
index 0000000..83ab2c4
--- /dev/null
+++ b/utils/fgviewer/fgviewer.cxx
@@ -0,0 +1,102 @@
+#include <iostream>
+#include <cstdlib>
+
+#include <osg/ArgumentParser>
+#include <osgDB/ReadFile>
+#include <osgViewer/Viewer>
+
+#include <simgear/props/props.hxx>
+#include <simgear/misc/sg_path.hxx>
+#include <simgear/scene/material/matlib.hxx>
+#include <simgear/scene/tgdb/SGReaderWriterBTGOptions.hxx>
+#include <simgear/scene/tgdb/userdata.hxx>
+#include <simgear/scene/tgdb/TileEntry.hxx>
+#include <simgear/scene/model/ModelRegistry.hxx>
+#include <simgear/scene/model/modellib.hxx>
+
+class DummyLoadHelper : public simgear::ModelLoadHelper {
+public:
+    virtual osg::Node *loadTileModel(const string& modelPath, bool)
+    {
+        try {
+            SGSharedPtr<SGPropertyNode> prop = new SGPropertyNode;
+            return simgear::SGModelLib::loadModel(modelPath, prop);
+        } catch (...) {
+            std::cerr << "Error loading \"" << modelPath << "\"" << std::endl;
+            return 0;
+        }
+    }
+};
+
+int
+main(int argc, char** argv)
+{
+    // Just reference simgears reader writer stuff so that the globals get
+    // pulled in by the linker ...
+    // FIXME: make that more explicit clear and call an initialization function
+    simgear::ModelRegistry::instance();
+    sgUserDataInit(0);
+    DummyLoadHelper dummyLoadHelper;
+    simgear::TileEntry::setModelLoadHelper(&dummyLoadHelper);
+
+    // use an ArgumentParser object to manage the program arguments.
+    osg::ArgumentParser arguments(&argc, argv);
+
+    // construct the viewer.
+    osgViewer::Viewer viewer(arguments);
+    // ... for some reason, get rid of that FIXME!
+    viewer.setThreadingModel(osgViewer::Viewer::SingleThreaded);
+    
+    const char *fg_root_env = std::getenv("FG_ROOT");
+    std::string fg_root;
+    if (fg_root_env)
+        fg_root = fg_root_env;
+    else
+        fg_root = ".";
+
+    const char *fg_scenery_env = std::getenv("FG_SCENERY");
+    string_list path_list;
+    if (fg_scenery_env) {
+        path_list = sgPathSplit(fg_scenery_env);
+    } else {
+        SGPath path(fg_root);
+        path.append("Scenery");
+        path_list.push_back(path.str());
+    }
+    osgDB::FilePathList filePathList;
+    for (unsigned i = 0; i < path_list.size(); ++i) {
+        SGPath pt(path_list[i]), po(path_list[i]);
+        pt.append("Terrain");
+        po.append("Objects");
+        filePathList.push_back(path_list[i]);
+        filePathList.push_back(pt.str());
+        filePathList.push_back(po.str());
+    }
+
+    SGSharedPtr<SGPropertyNode> props = new SGPropertyNode;
+    props->getNode("sim/startup/season", true)->setStringValue("summer");
+    SGMaterialLib* ml = new SGMaterialLib;
+    SGPath mpath(fg_root);
+    mpath.append("materials.xml");
+    ml->load(fg_root, mpath.str(), props);
+    
+    SGReaderWriterBTGOptions* btgOptions = new SGReaderWriterBTGOptions;
+    btgOptions->getDatabasePathList() = filePathList;
+    btgOptions->setMatlib(ml);
+    
+    // read the scene from the list of file specified command line args.
+    osg::ref_ptr<osg::Node> loadedModel;
+    loadedModel = osgDB::readNodeFiles(arguments, btgOptions);
+
+    // if no model has been successfully loaded report failure.
+    if (!loadedModel.valid()) {
+        std::cout << arguments.getApplicationName()
+                  << ": No data loaded" << std::endl;
+        return EXIT_FAILURE;
+    }
+    
+    // pass the loaded scene graph to the viewer.
+    viewer.setSceneData(loadedModel.get());
+    
+    return viewer.run();
+}