From c59190cc405b3498f0cb01d156d198ba4636933d Mon Sep 17 00:00:00 2001
From: Rainer Kartmann <rainer.kartmann@kit.edu>
Date: Sun, 27 Jun 2021 17:29:56 +0200
Subject: [PATCH] Add getters for files, fix output
---
.../libraries/ArmarXObjects/ObjectInfo.cpp | 16 +++++++++++++---
.../libraries/ArmarXObjects/ObjectInfo.h | 3 +++
2 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/source/RobotAPI/libraries/ArmarXObjects/ObjectInfo.cpp b/source/RobotAPI/libraries/ArmarXObjects/ObjectInfo.cpp
index c68e1b271..bbc89162c 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 634944e4c..9e91fa2bb 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;
--
GitLab