Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

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

Snippets Groups Projects

406030f8

Commit 406030f8 authored 3 years ago by Rainer Kartmann

Downloads
- Plain Diff

Merge branch 'move-scene-snapshot' into 'master'

Move SceneSnapshot to ArmarXObjects

See merge request ArmarX/RobotAPI!216

parents 7e09b9ee aa42e85c

No related branches found

No related tags found

Loading

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

source/RobotAPI/libraries/ArmarXObjects/CMakeLists.txt 2 additions, 0 deletions

source/RobotAPI/libraries/ArmarXObjects/CMakeLists.txt
source/RobotAPI/libraries/ArmarXObjects/Scene.cpp 44 additions, 0 deletions

source/RobotAPI/libraries/ArmarXObjects/Scene.cpp
source/RobotAPI/libraries/ArmarXObjects/Scene.h 59 additions, 0 deletions

source/RobotAPI/libraries/ArmarXObjects/Scene.h
source/RobotAPI/libraries/ArmarXObjects/forward_declarations.h 6 additions, 0 deletions

...e/RobotAPI/libraries/ArmarXObjects/forward_declarations.h
source/RobotAPI/libraries/ArmarXObjects/json_conversions.cpp 47 additions, 0 deletions

source/RobotAPI/libraries/ArmarXObjects/json_conversions.cpp
source/RobotAPI/libraries/ArmarXObjects/json_conversions.h 12 additions, 2 deletions

source/RobotAPI/libraries/ArmarXObjects/json_conversions.h
source/RobotAPI/libraries/armem_objects/CMakeLists.txt 0 additions, 4 deletions

source/RobotAPI/libraries/armem_objects/CMakeLists.txt
source/RobotAPI/libraries/armem_objects/SceneSnapshot.cpp 0 additions, 90 deletions

source/RobotAPI/libraries/armem_objects/SceneSnapshot.cpp
source/RobotAPI/libraries/armem_objects/server/instance/Segment.cpp 12 additions, 10 deletions

...otAPI/libraries/armem_objects/server/instance/Segment.cpp
source/RobotAPI/libraries/armem_objects/server/instance/Segment.h 7 additions, 7 deletions

...obotAPI/libraries/armem_objects/server/instance/Segment.h

with 189 additions and 113 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