Merge branch 'merge/load-scenes-in-working-memory' into 'master'
Load and store of scenes from JSON files in object memory Closes #58 See merge request ArmarX/RobotAPI!173
Showing
- source/RobotAPI/components/armem/server/ObjectMemory/ObjectMemory.cpp 19 additions, 11 deletions...API/components/armem/server/ObjectMemory/ObjectMemory.cpp
- source/RobotAPI/components/armem/server/ObjectMemory/ObjectMemory.h 1 addition, 1 deletion...otAPI/components/armem/server/ObjectMemory/ObjectMemory.h
- source/RobotAPI/libraries/ArmarXObjects/ObjectFinder.cpp 20 additions, 11 deletionssource/RobotAPI/libraries/ArmarXObjects/ObjectFinder.cpp
- source/RobotAPI/libraries/ArmarXObjects/ObjectFinder.h 5 additions, 0 deletionssource/RobotAPI/libraries/ArmarXObjects/ObjectFinder.h
- source/RobotAPI/libraries/ArmarXObjects/ObjectID.cpp 5 additions, 0 deletionssource/RobotAPI/libraries/ArmarXObjects/ObjectID.cpp
- source/RobotAPI/libraries/ArmarXObjects/ObjectID.h 2 additions, 0 deletionssource/RobotAPI/libraries/ArmarXObjects/ObjectID.h
- source/RobotAPI/libraries/armem/CMakeLists.txt 7 additions, 2 deletionssource/RobotAPI/libraries/armem/CMakeLists.txt
- source/RobotAPI/libraries/armem/core/json_conversions.cpp 26 additions, 0 deletionssource/RobotAPI/libraries/armem/core/json_conversions.cpp
- source/RobotAPI/libraries/armem/core/json_conversions.h 12 additions, 0 deletionssource/RobotAPI/libraries/armem/core/json_conversions.h
- source/RobotAPI/libraries/armem/core/workingmemory/visitor.h 4 additions, 0 deletionssource/RobotAPI/libraries/armem/core/workingmemory/visitor.h
- source/RobotAPI/libraries/armem/core/workingmemory/visitor/FunctionalVisitor.cpp 23 additions, 0 deletions...es/armem/core/workingmemory/visitor/FunctionalVisitor.cpp
- source/RobotAPI/libraries/armem/core/workingmemory/visitor/FunctionalVisitor.h 101 additions, 0 deletions...ries/armem/core/workingmemory/visitor/FunctionalVisitor.h
- source/RobotAPI/libraries/armem/core/workingmemory/visitor/Visitor.cpp 0 additions, 0 deletions...PI/libraries/armem/core/workingmemory/visitor/Visitor.cpp
- source/RobotAPI/libraries/armem/core/workingmemory/visitor/Visitor.h 1 addition, 1 deletion...tAPI/libraries/armem/core/workingmemory/visitor/Visitor.h
- source/RobotAPI/libraries/armem_objects/CMakeLists.txt 4 additions, 0 deletionssource/RobotAPI/libraries/armem_objects/CMakeLists.txt
- source/RobotAPI/libraries/armem_objects/SceneSnapshot.cpp 53 additions, 0 deletionssource/RobotAPI/libraries/armem_objects/SceneSnapshot.cpp
- source/RobotAPI/libraries/armem_objects/SceneSnapshot.h 57 additions, 0 deletionssource/RobotAPI/libraries/armem_objects/SceneSnapshot.h
- source/RobotAPI/libraries/armem_objects/server/articulated_object_class/Segment.cpp 1 addition, 1 deletion...armem_objects/server/articulated_object_class/Segment.cpp
- source/RobotAPI/libraries/armem_objects/server/attachments/Segment.cpp 1 addition, 1 deletion...PI/libraries/armem_objects/server/attachments/Segment.cpp
- source/RobotAPI/libraries/armem_objects/server/class/Segment.cpp 14 additions, 1 deletion...RobotAPI/libraries/armem_objects/server/class/Segment.cpp
Loading
Please register or sign in to comment