Merge branch...
Merge branch 'feature/armem-object-memory-combined-segment-for-articulated-and-normal-objects' into 'master' Object memory: no longer instantiating articulated object class and instance segments See merge request ArmarX/RobotAPI!176
No related branches found
No related tags found
Showing
- scenarios/ArMemObjectMemory/ArMemObjectMemory.scx 1 addition, 1 deletionscenarios/ArMemObjectMemory/ArMemObjectMemory.scx
- scenarios/ArMemObjectMemory/config/ArticulatedObjectLocalizerExample.cfg 4 additions, 4 deletions...ObjectMemory/config/ArticulatedObjectLocalizerExample.cfg
- scenarios/ArMemObjectMemory/config/ArticulatedObjectLocalizerExample.instance1.cfg 254 additions, 0 deletions...ry/config/ArticulatedObjectLocalizerExample.instance1.cfg
- scenarios/ArMemObjectMemory/config/ObjectMemory.cfg 9 additions, 0 deletionsscenarios/ArMemObjectMemory/config/ObjectMemory.cfg
- source/RobotAPI/components/ArticulatedObjectLocalizerExample/ArticulatedObjectLocalizerExample.cpp 36 additions, 46 deletions...ectLocalizerExample/ArticulatedObjectLocalizerExample.cpp
- source/RobotAPI/components/ArticulatedObjectLocalizerExample/ArticulatedObjectLocalizerExample.h 10 additions, 15 deletions...bjectLocalizerExample/ArticulatedObjectLocalizerExample.h
- source/RobotAPI/components/armem/server/ObjectMemory/ObjectMemory.cpp 0 additions, 26 deletions...API/components/armem/server/ObjectMemory/ObjectMemory.cpp
- source/RobotAPI/components/armem/server/ObjectMemory/ObjectMemory.h 0 additions, 2 deletions...otAPI/components/armem/server/ObjectMemory/ObjectMemory.h
- source/RobotAPI/components/armem/server/RobotStateMemory/RobotStateMemory.cpp 7 additions, 1 deletion...onents/armem/server/RobotStateMemory/RobotStateMemory.cpp
- source/RobotAPI/libraries/ArmarXObjects/ObjectPose.h 5 additions, 0 deletionssource/RobotAPI/libraries/ArmarXObjects/ObjectPose.h
- source/RobotAPI/libraries/RobotAPIComponentPlugins/RobotUnitComponentPlugin.cpp 13 additions, 17 deletions...ies/RobotAPIComponentPlugins/RobotUnitComponentPlugin.cpp
- source/RobotAPI/libraries/RobotAPIComponentPlugins/RobotUnitComponentPlugin.h 16 additions, 5 deletions...aries/RobotAPIComponentPlugins/RobotUnitComponentPlugin.h
- source/RobotAPI/libraries/armem_objects/CMakeLists.txt 13 additions, 5 deletionssource/RobotAPI/libraries/armem_objects/CMakeLists.txt
- source/RobotAPI/libraries/armem_objects/client/articulated_object/ArticulatedObjectReader.cpp 61 additions, 0 deletions...cts/client/articulated_object/ArticulatedObjectReader.cpp
- source/RobotAPI/libraries/armem_objects/client/articulated_object/ArticulatedObjectReader.h 16 additions, 0 deletions...jects/client/articulated_object/ArticulatedObjectReader.h
- source/RobotAPI/libraries/armem_objects/client/articulated_object/ArticulatedObjectWriter.cpp 49 additions, 0 deletions...cts/client/articulated_object/ArticulatedObjectWriter.cpp
- source/RobotAPI/libraries/armem_objects/client/articulated_object/ArticulatedObjectWriter.h 21 additions, 0 deletions...jects/client/articulated_object/ArticulatedObjectWriter.h
- source/RobotAPI/libraries/armem_objects/client/articulated_object/Reader.cpp 22 additions, 16 deletions...raries/armem_objects/client/articulated_object/Reader.cpp
- source/RobotAPI/libraries/armem_objects/client/articulated_object/Reader.h 25 additions, 16 deletions...ibraries/armem_objects/client/articulated_object/Reader.h
- source/RobotAPI/libraries/armem_objects/client/articulated_object/Writer.cpp 60 additions, 56 deletions...raries/armem_objects/client/articulated_object/Writer.cpp
Loading
Please register or sign in to comment