Skip to content
Snippets Groups Projects
Commit 6dc3342b authored by Rainer Kartmann's avatar Rainer Kartmann
Browse files

Add getters for files, fix output

parent 3a27d600
No related branches found
No related tags found
1 merge request!171Periodic merge of armem/dev into master
......@@ -81,6 +81,16 @@ namespace armarx
return file(".xml");
}
PackageFileLocation ObjectInfo::articulatedSimoxXML() const
{
return file(".xml", "_articulated");
}
PackageFileLocation ObjectInfo::meshWrl() const
{
return file(".wrl");
}
PackageFileLocation ObjectInfo::wavefrontObj() const
{
return file(".obj");
......@@ -232,15 +242,15 @@ namespace armarx
{
if (_logError)
{
ARMARX_WARNING << "Expected simox object file for object '" << *this << "': " << simoxXML().absolutePath;
ARMARX_WARNING << "Expected simox object file for object " << *this << ": " << simoxXML().absolutePath;
}
result = false;
}
if (!fs::is_regular_file(wavefrontObj().absolutePath))
if (false and not fs::is_regular_file(wavefrontObj().absolutePath))
{
if (_logError)
{
ARMARX_WARNING << "Expected wavefront object file (.obj) for object '" << *this << "': " << wavefrontObj().absolutePath;
ARMARX_WARNING << "Expected wavefront object file (.obj) for object " << *this << ": " << wavefrontObj().absolutePath;
}
result = false;
}
......
......@@ -64,6 +64,9 @@ namespace armarx
PackageFileLocation file(const std::string& extension, const std::string& suffix = "") const;
PackageFileLocation simoxXML() const;
PackageFileLocation articulatedSimoxXML() const;
PackageFileLocation meshWrl() const;
PackageFileLocation wavefrontObj() const;
PackageFileLocation boundingBoxJson() const;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment