Skip to content
Snippets Groups Projects

Resolve "Update ObjectFinder to PriorKnowledgeData"

Merged Rainer Kartmann requested to merge 59-update-objectfinder-to-priorknowledgedata into master
3 unresolved threads

Closes #59 (closed)

Edited by Rainer Kartmann

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
57 57
58 58 ObjectInfo::path ObjectInfo::objectDirectory() const
59 59 {
60 return path(_packageName) / _id.dataset() / _id.className();
60 return path(_packageName) / "objects" / _id.dataset() / _id.className();
  • 232 242 {
    233 243 if (_logError)
    234 244 {
    235 ARMARX_WARNING << "Expected simox object file for object '" << *this << "': " << simoxXML().absolutePath;
    245 ARMARX_WARNING << "Expected simox object file for object " << *this << ": " << simoxXML().absolutePath;
    236 246 }
    237 247 result = false;
    238 248 }
    239 if (!fs::is_regular_file(wavefrontObj().absolutePath))
    249 if (false and not fs::is_regular_file(wavefrontObj().absolutePath))
  • added 1 commit

    • 50fd9bc9 - Update floor object ID, fix height (was +1, now is -1)

    Compare with previous version

    By ARMAR-6 on 2021-06-28T12:50:20 (imported from GitLab)

  • 401 401
    402 402 ObjectFinder::path ObjectFinder::_rootDirAbs() const
    403 403 {
    404 return packageDataDir / packageName;
    404 return packageDataDir / packageName / "objects";
  • Rainer Kartmann marked this merge request as ready

    marked this merge request as ready

  • added 1 commit

    • a2fed110 - Improve handling of "objects" dir, finding articulated objects

    Compare with previous version

    By ARMAR-6 on 2021-06-28T17:07:14 (imported from GitLab)

  • Rainer Kartmann mentioned in commit 1a711741

    mentioned in commit 1a711741

  • Please register or sign in to reply
    Loading