Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

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

Snippets Groups Projects

08127678

Commit 08127678 authored 4 years ago by Christian Dreher

Downloads
- Plain Diff

Merge branch 'master' of gitlab.com:ArmarX/RobotAPI

parents 4be6f27f 91515964

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

source/RobotAPI/components/ArViz/CMakeLists.txt 2 additions, 0 deletions

source/RobotAPI/components/ArViz/CMakeLists.txt
source/RobotAPI/components/ArViz/Client/Client.h 62 additions, 24 deletions

source/RobotAPI/components/ArViz/Client/Client.h
source/RobotAPI/components/ArViz/Client/ClientCGALExtensions.h 5 additions, 0 deletions

...e/RobotAPI/components/ArViz/Client/ClientCGALExtensions.h
source/RobotAPI/components/ArViz/Client/elements/Mesh.h 27 additions, 1 deletion

source/RobotAPI/components/ArViz/Client/elements/Mesh.h
source/RobotAPI/components/ArViz/Client/elements/MeshCGALExtensions.h 109 additions, 0 deletions

...API/components/ArViz/Client/elements/MeshCGALExtensions.h
source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointCartesianNaturalPositionController.cpp 1 addition, 1 deletion

...tControllers/NJointCartesianNaturalPositionController.cpp
source/RobotAPI/interface/units/RobotUnit/NJointCartesianWaypointController.ice 1 addition, 1 deletion

...ace/units/RobotUnit/NJointCartesianWaypointController.ice

with 207 additions and 27 deletions

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