VoiceSynthesizer: add some test/debug properties

[flightgear.git] / src / Canvas / FGCanvasSystemAdapter.cxx

diff --git a/src/Canvas/FGCanvasSystemAdapter.cxx b/src/Canvas/FGCanvasSystemAdapter.cxx
index 0f56e3ed198f02dc20f84edb754059d9ec71369f..69ea6c5a4b20b1e5f3ae470fc91a6cb0ac9d8dbf 100644 (file)
--- a/src/Canvas/FGCanvasSystemAdapter.cxx
+++ b/src/Canvas/FGCanvasSystemAdapter.cxx
@@ -1,9 +1,30 @@
+// Integrate Canvas into FlightGear
+//
+// Copyright (C) 2012  Thomas Geymayer <tomgey@gmail.com>
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License as
+// published by the Free Software Foundation; either version 2 of the
+// License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful, but
+// WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
 #include "FGCanvasSystemAdapter.hxx"
 
 #include <Main/globals.hxx>
+#include <Main/util.hxx>
+#include <Network/HTTPClient.hxx>
 #include <Viewer/renderer.hxx>
 
 #include <osgDB/ReadFile>
+#include <stdexcept>
 
 namespace canvas
 {
@@ -51,20 +72,46 @@ namespace canvas
   //----------------------------------------------------------------------------
   void FGCanvasSystemAdapter::removeCamera(osg::Camera* camera) const
   {
-    globals->get_renderer()->removeCamera(camera);
+    if( globals->get_renderer() )
+      globals->get_renderer()->removeCamera(camera);
   }
 
   //----------------------------------------------------------------------------
   osg::Image* FGCanvasSystemAdapter::getImage(const std::string& path) const
   {
-    SGPath tpath = globals->resolve_resource_path(path);
-    if( tpath.isNull() || !tpath.exists() )
+    if( SGPath(path).isAbsolute() )
+    {
+      const char* valid_path = fgValidatePath(path.c_str(), false);
+      if( valid_path )
+        return osgDB::readImageFile(valid_path);
+
+      SG_LOG(SG_IO, SG_ALERT, "canvas::Image: reading '" << path << "' denied");
+    }
+    else
     {
-      SG_LOG(SG_GL, SG_ALERT, "canvas::Image: No such image: " << path);
-      return 0;
+      SGPath tpath = globals->resolve_resource_path(path);
+      if( !tpath.isNull() )
+        return osgDB::readImageFile(tpath.c_str());
+
+      SG_LOG(SG_IO, SG_ALERT, "canvas::Image: No such image: '" << path << "'");
     }
 
-    return osgDB::readImageFile(tpath.c_str());
+    return 0;
+  }
+
+  //----------------------------------------------------------------------------
+  simgear::HTTP::Client* FGCanvasSystemAdapter::getHTTPClient() const
+  {
+    FGHTTPClient* http =
+      static_cast<FGHTTPClient*>(globals->get_subsystem("http"));
+
+    if( http )
+      return http->client();
+
+    SG_LOG( SG_IO,
+            SG_ALERT,
+            "FGCanvasSystemAdapter: Failed to get HTTP subsystem" );
+    return 0;
   }
 
 }