commradio: improvements for atis speech

[flightgear.git] / utils / fgviewer / fgviewer.cxx

diff --git a/utils/fgviewer/fgviewer.cxx b/utils/fgviewer/fgviewer.cxx
index 1e96dc46b5c53481662bb28286aa476517eadee7..e0ebcf250539cb0a2eb32d0b0d01c8ed5ffdd4c3 100644 (file)
--- a/utils/fgviewer/fgviewer.cxx
+++ b/utils/fgviewer/fgviewer.cxx
@@ -42,7 +42,7 @@
 #include "Renderer.hxx"
 #include "Viewer.hxx"
 
-#ifdef FG_HAVE_HLA
+#if FG_HAVE_HLA
 #include "HLACameraManipulator.hxx"
 #include "HLAViewerFederate.hxx"
 #endif
@@ -57,8 +57,8 @@ main(int argc, char** argv)
     // FIXME implement a flightgear similar argument parser into simgear and use this one
     osg::ArgumentParser arguments(&argc, argv);
 
-    logbuf::set_log_classes(SG_ALL);
-    logbuf::set_log_priority(SG_ALERT);
+    sglog().set_log_classes(SG_ALL);
+    sglog().set_log_priority(SG_ALERT);
 
     std::string fg_root;
     if (arguments.read("--fg-root", fg_root)) {
@@ -179,7 +179,7 @@ main(int argc, char** argv)
     // FIXME Ok, replace this by querying the root of the property tree
     sgUserDataInit(props.get());
     SGSceneFeatures::instance()->setTextureCompression(SGSceneFeatures::DoNotUseCompression);
-    SGMaterialLib* ml = new SGMaterialLib;
+    SGMaterialLibPtr ml = new SGMaterialLib;
     SGPath mpath(fg_root);
     mpath.append("Materials/default/materials.xml");
     try {
@@ -188,6 +188,7 @@ main(int argc, char** argv)
         SG_LOG(SG_GENERAL, SG_ALERT, "Problems loading FlightGear materials.\n"
                << "Probably FG_ROOT is not properly set.");
     }
+    ml->refreshActiveMaterials();
     simgear::SGModelLib::init(fg_root, props);
 
     // Set up the reader/writer options
@@ -210,9 +211,7 @@ main(int argc, char** argv)
     arguments.writeErrorMessages(std::cerr);
 
     if (props->getNode("hla/federate/federation")) {
-#if !defined FG_HAVE_HLA
-        SG_LOG(SG_GENERAL, SG_ALERT, "Unable to enter HLA/RTI viewer mode: HLA/RTI disabled at compile time.");
-#else
+#if FG_HAVE_HLA
         const SGPropertyNode* federateNode = props->getNode("hla/federate");
         
         SGSharedPtr<fgviewer::HLAViewerFederate> viewerFederate;
@@ -230,13 +229,16 @@ main(int argc, char** argv)
             objectModel = path.str();
         }
         viewerFederate->setFederationObjectModel(objectModel);
-
+        
         if (!viewerFederate->init()) {
             SG_LOG(SG_NETWORK, SG_ALERT, "Got error from federate init!");
         } else {
             viewer.setViewerFederate(viewerFederate.get());
             viewer.setCameraManipulator(new fgviewer::HLACameraManipulator(viewerFederate->getViewer()));
         }
+
+#else
+        SG_LOG(SG_GENERAL, SG_ALERT, "Unable to enter HLA/RTI viewer mode: HLA/RTI disabled at compile time.");
 #endif
     }