Merge branch 'armem/articulated-instances' into 'armem/dev'
Object memory: articulated objects no longer as separate class and instance segments See merge request ArmarX/RobotAPI!175
No related branches found
No related tags found
Showing
- source/RobotAPI/interface/objectpose/object_pose_types.ice 11 additions, 0 deletionssource/RobotAPI/interface/objectpose/object_pose_types.ice
- source/RobotAPI/libraries/ArmarXObjects/ObjectPose.cpp 4 additions, 0 deletionssource/RobotAPI/libraries/ArmarXObjects/ObjectPose.cpp
- source/RobotAPI/libraries/ArmarXObjects/ObjectPose.h 3 additions, 0 deletionssource/RobotAPI/libraries/ArmarXObjects/ObjectPose.h
- source/RobotAPI/libraries/ArmarXObjects/aron/ObjectPose.xml 7 additions, 0 deletionssource/RobotAPI/libraries/ArmarXObjects/aron/ObjectPose.xml
- source/RobotAPI/libraries/ArmarXObjects/aron_conversions/objpose.cpp 2 additions, 0 deletions...tAPI/libraries/ArmarXObjects/aron_conversions/objpose.cpp
- source/RobotAPI/libraries/armem_objects/SceneSnapshot.cpp 22 additions, 0 deletionssource/RobotAPI/libraries/armem_objects/SceneSnapshot.cpp
- source/RobotAPI/libraries/armem_objects/SceneSnapshot.h 5 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/instance/Segment.cpp 7 additions, 1 deletion...otAPI/libraries/armem_objects/server/instance/Segment.cpp
- source/RobotAPI/libraries/armem_objects/server/instance/Visu.cpp 40 additions, 15 deletions...RobotAPI/libraries/armem_objects/server/instance/Visu.cpp
- source/RobotAPI/libraries/armem_objects/server/instance/Visu.h 6 additions, 0 deletions...e/RobotAPI/libraries/armem_objects/server/instance/Visu.h
- source/RobotAPI/libraries/armem_robot/aron_conversions.cpp 50 additions, 0 deletionssource/RobotAPI/libraries/armem_robot/aron_conversions.cpp
- source/RobotAPI/libraries/armem_robot/aron_conversions.h 15 additions, 1 deletionsource/RobotAPI/libraries/armem_robot/aron_conversions.h
Loading
Please register or sign in to comment