Update ObjectFinder and ObjectInfo to structure of PriorKnowledgeData

source/RobotAPI/libraries/ArmarXObjects/ObjectFinder.cpp

@@ -57,7 +57,7 @@ namespace armarx
 
     bool ObjectFinder::isDatasetDirValid(const path& path) const
     {
-        return path.filename() != "Scenes" and std::filesystem::is_directory(path);
+        return std::filesystem::is_directory(path);
     }
 
 
@@ -401,7 +401,7 @@ namespace armarx
 
     ObjectFinder::path ObjectFinder::_rootDirAbs() const
     {
-        return packageDataDir / packageName;
+        return packageDataDir / packageName / "objects";
     }
 
     ObjectFinder::path ObjectFinder::_rootDirRel() const

source/RobotAPI/libraries/ArmarXObjects/ObjectFinder.h

@@ -15,17 +15,19 @@
 namespace armarx
 {
     /**
-     * @brief Used to find objects in the ArmarX objects repository [1].
+     * @brief Used to find objects in the ArmarX objects repository [1] (formerly [2]).
      *
-     * @see [1] https://gitlab.com/ArmarX/ArmarXObjects
+     * @see [1] https://gitlab.com/ArmarX/PriorKnowledgeData
+     * @see [2] https://gitlab.com/ArmarX/ArmarXObjects
      */
     class ObjectFinder : Logging
     {
     public:
         using path = std::filesystem::path;
-        inline static const std::string DefaultObjectsPackageName = "ArmarXObjects";
+        inline static const std::string DefaultObjectsPackageName = "PriorKnowledgeData";
 
     public:
+
         ObjectFinder(const std::string& objectsPackageName = DefaultObjectsPackageName);
 
         ObjectFinder(ObjectFinder&&)                 = default;

source/RobotAPI/libraries/ArmarXObjects/ObjectInfo.cpp

@@ -57,7 +57,7 @@ namespace armarx
 
     ObjectInfo::path ObjectInfo::objectDirectory() const
     {
-        return path(_packageName) / _id.dataset() / _id.className();
+        return path(_packageName) / "objects" / _id.dataset() / _id.className();
     }
 
     PackageFileLocation ObjectInfo::file(const std::string& _extension, const std::string& suffix) const