Merge branch 'master' of https://gitlab.com/ArmarX/RobotAPI into skillProviderSkillObserver
# Conflicts: # source/RobotAPI/libraries/CMakeLists.txt
Showing
- CMakeLists.txt 2 additions, 1 deletionCMakeLists.txt
- data/RobotAPI/robots/CameraOnTripod/CameraOnTripod.xml 30 additions, 0 deletionsdata/RobotAPI/robots/CameraOnTripod/CameraOnTripod.xml
- data/RobotAPI/robots/CameraOnTripod/models/camera.wrl 614 additions, 0 deletionsdata/RobotAPI/robots/CameraOnTripod/models/camera.wrl
- etc/cmake/Findsick_scan_base.cmake 6 additions, 1 deletionetc/cmake/Findsick_scan_base.cmake
- etc/mongocxx/install_mongocxx.sh 2 additions, 3 deletionsetc/mongocxx/install_mongocxx.sh
- scenarios/ArMemObjectMemory/ArMemObjectMemory.scx 3 additions, 3 deletionsscenarios/ArMemObjectMemory/ArMemObjectMemory.scx
- scenarios/ArMemObjectMemory/config/RobotStateComponent.cfg 4 additions, 4 deletionsscenarios/ArMemObjectMemory/config/RobotStateComponent.cfg
- source/RobotAPI/components/ArViz/ArVizStorage.cpp 129 additions, 24 deletionssource/RobotAPI/components/ArViz/ArVizStorage.cpp
- source/RobotAPI/components/ArViz/ArVizStorage.h 11 additions, 3 deletionssource/RobotAPI/components/ArViz/ArVizStorage.h
- source/RobotAPI/components/ArViz/CMakeLists.txt 53 additions, 31 deletionssource/RobotAPI/components/ArViz/CMakeLists.txt
- source/RobotAPI/components/ArViz/Client/Client.cpp 100 additions, 0 deletionssource/RobotAPI/components/ArViz/Client/Client.cpp
- source/RobotAPI/components/ArViz/Client/Client.h 289 additions, 92 deletionssource/RobotAPI/components/ArViz/Client/Client.h
- source/RobotAPI/components/ArViz/Client/Elements.cpp 137 additions, 0 deletionssource/RobotAPI/components/ArViz/Client/Elements.cpp
- source/RobotAPI/components/ArViz/Client/Elements.h 24 additions, 172 deletionssource/RobotAPI/components/ArViz/Client/Elements.h
- source/RobotAPI/components/ArViz/Client/Layer.h 11 additions, 12 deletionssource/RobotAPI/components/ArViz/Client/Layer.h
- source/RobotAPI/components/ArViz/Client/ScopedClient.h 2 additions, 2 deletionssource/RobotAPI/components/ArViz/Client/ScopedClient.h
- source/RobotAPI/components/ArViz/Client/drawer/ArVizDrawerBase.cpp 0 additions, 35 deletions...botAPI/components/ArViz/Client/drawer/ArVizDrawerBase.cpp
- source/RobotAPI/components/ArViz/Client/elements/Color.h 2 additions, 2 deletionssource/RobotAPI/components/ArViz/Client/elements/Color.h
- source/RobotAPI/components/ArViz/Client/elements/ElementOps.h 77 additions, 5 deletions...ce/RobotAPI/components/ArViz/Client/elements/ElementOps.h
- source/RobotAPI/components/ArViz/Coin/ElementVisualizer.h 1 addition, 0 deletionssource/RobotAPI/components/ArViz/Coin/ElementVisualizer.h
Loading
Please register or sign in to comment