Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

RobotAPI
- Activity
- Members
- Labels
- Container Registry
- Model registry

Snippets Groups Projects

cf276745

Commit cf276745 authored 4 years ago by Rainer Kartmann

Downloads
- Plain Diff

Merge branch 'arviz/armarxobjects' into 'master'

Add viz::Object::fileByObjectFinder() to specify ArmarXObjects ObjectID

See merge request ArmarX/RobotAPI!79

parents 9c107a83 49afe206

Loading

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

source/RobotAPI/components/ArViz/CMakeLists.txt 1 addition, 0 deletions

source/RobotAPI/components/ArViz/CMakeLists.txt
source/RobotAPI/components/ArViz/Client/Elements.cpp 26 additions, 0 deletions

source/RobotAPI/components/ArViz/Client/Elements.cpp
source/RobotAPI/components/ArViz/Client/Elements.h 19 additions, 0 deletions

source/RobotAPI/components/ArViz/Client/Elements.h
source/RobotAPI/libraries/ArmarXObjects/ObjectFinder.h 2 additions, 1 deletion

source/RobotAPI/libraries/ArmarXObjects/ObjectFinder.h

with 48 additions and 1 deletion

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment