Add environment variable to locate plugins (#104)

* Add environment variable to locate plugins I just copied how this was done in Ignition GUI Signed-off-by: Levi Armstrong <[email protected]> * Add check for environment variable for ogre resource path Signed-off-by: Levi Armstrong <[email protected]> * Add check for environment variable for ogre2 resource path Signed-off-by: Levi Armstrong <[email protected]>
gazebosim · Jul 10, 2020 · 6338cdb · 6338cdb
1 parent e445c9b
commit 6338cdb
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/ogre/src/OgreRenderEngine.cc b/ogre/src/OgreRenderEngine.cc
@@ -78,7 +78,11 @@ RenderEngine *OgreRenderEnginePlugin::Engine() const
 OgreRenderEngine::OgreRenderEngine() :
   dataPtr(new OgreRenderEnginePrivate)
 {
-  this->ogrePaths.push_back(std::string(OGRE_RESOURCE_PATH));
+  this->ogrePaths.push_back(OGRE_RESOURCE_PATH);
+
+  const char *env = std::getenv("OGRE_RESOURCE_PATH");
+  if(env)
+    this->ogrePaths.push_back(std::string(env));
 }
 
 //////////////////////////////////////////////////

diff --git a/ogre2/src/Ogre2RenderEngine.cc b/ogre2/src/Ogre2RenderEngine.cc
@@ -82,6 +82,10 @@ Ogre2RenderEngine::Ogre2RenderEngine() :
   std::string ogrePath = std::string(OGRE2_RESOURCE_PATH);
   this->ogrePaths.push_back(ogrePath);
 
+  const char *env = std::getenv("OGRE2_RESOURCE_PATH");
+  if(env)
+    this->ogrePaths.push_back(std::string(env));
+
 #ifdef __APPLE__
   // on OSX the plugins may be placed in the parent lib directory
   if (ogrePath.rfind("OGRE") == ogrePath.size()-4u)

diff --git a/src/RenderEngineManager.cc b/src/RenderEngineManager.cc
@@ -83,6 +83,9 @@ class ignition::rendering::RenderEngineManagerPrivate
 
   /// \brief Plugin loader for managing render engine plugin libraries
   public: ignition::plugin::Loader pluginLoader;
+
+  /// \brief Environment variable which holds paths to look for plugins
+  public: std::string pluginPathEnv = "IGN_RENDERING_PLUGIN_PATH";
 
   /// \brief Mutex to protect the engines map.
   public: std::recursive_mutex enginesMutex;
@@ -373,7 +376,8 @@ bool RenderEngineManagerPrivate::LoadEnginePlugin(
   ignmsg << "Loading plugin [" << _filename << "]" << std::endl;
 
   ignition::common::SystemPaths systemPaths;
-
+  systemPaths.SetPluginPathEnv(this->pluginPathEnv);
+
   // Add default install folder.
   systemPaths.AddPluginPaths(std::string(IGN_RENDERING_PLUGIN_PATH));
   // Add extra search path.