diff --git a/source/RobotAPI/libraries/ArmarXObjects/ObjectInfo.cpp b/source/RobotAPI/libraries/ArmarXObjects/ObjectInfo.cpp index c68e1b2710a1520db7e7c8fb4ea7944485ddcfe5..bbc89162cd8556c88ccde6f872a5da023b6adbd9 100644 --- a/source/RobotAPI/libraries/ArmarXObjects/ObjectInfo.cpp +++ b/source/RobotAPI/libraries/ArmarXObjects/ObjectInfo.cpp @@ -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; } diff --git a/source/RobotAPI/libraries/ArmarXObjects/ObjectInfo.h b/source/RobotAPI/libraries/ArmarXObjects/ObjectInfo.h index 634944e4cc52379977f784c370f48af1e84ed28d..9e91fa2bbfef02c7be4fe6e78f45d33355fd7b22 100644 --- a/source/RobotAPI/libraries/ArmarXObjects/ObjectInfo.h +++ b/source/RobotAPI/libraries/ArmarXObjects/ObjectInfo.h @@ -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;