Support Ogre materials with spaces

Signed-off-by: Louise Poubel <louise@openrobotics.org>
osrf · Nov 18, 2020 · 82ab597 · 82ab597
1 parent 909ab3c
commit 82ab597
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/gzbridge/ConfigLoader.cc b/gzbridge/ConfigLoader.cc
@@ -252,7 +252,12 @@ void ConfigLoader::_parseNodes(std::ifstream &stream, ConfigNode *parent)
 					}
 					else
 					{
-						key = newNode->getName() + ' ' + newNode->getValues().front();
+						key = newNode->getName();
+						for (auto value : newNode->getValues())
+						{
+							key += ' ' + value;
+						}
+						key.erase(std::remove(key.begin(), key.end(), '"'), key.end());
 					}
 
 					m_scriptList.insert(ScriptItem(key, newNode));

diff --git a/gzbridge/OgreMaterialParser.cc b/gzbridge/OgreMaterialParser.cc
@@ -51,7 +51,7 @@ std::string OgreMaterialParser::GetMaterialAsJson() const
         else
           first = false;
 
-        std::size_t index = name.rfind(" ");
+        std::size_t index = name.find(" ");
         if (index != std::string::npos)
         {
           name = name.substr(index+1);