Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Simox
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Terraform modules

Snippets Groups Projects

ab9fad4c

Commit ab9fad4c authored 5 years ago by Rainer Kartmann

Downloads
- Plain Diff

Merge branch 'Ubuntu18.04' into mujoco-io

parents 746c978d 6946dbe8

No related branches found

No related tags found

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

GraspPlanning/ApproachMovementGenerator.cpp 4 additions, 0 deletions

GraspPlanning/ApproachMovementGenerator.cpp
GraspPlanning/ApproachMovementGenerator.h 4 additions, 0 deletions

GraspPlanning/ApproachMovementGenerator.h
GraspPlanning/ApproachMovementSurfaceNormal.cpp 4 additions, 1 deletion

GraspPlanning/ApproachMovementSurfaceNormal.cpp
GraspPlanning/GraspPlanner/GenericGraspPlanner.cpp 4 additions, 1 deletion

GraspPlanning/GraspPlanner/GenericGraspPlanner.cpp
GraspPlanning/MeshConverter.cpp 5 additions, 2 deletions

GraspPlanning/MeshConverter.cpp
GraspPlanning/MeshConverter.h 1 addition, 1 deletion

GraspPlanning/MeshConverter.h
VirtualRobot/Import/MeshImport/AssimpReader.cpp 65 additions, 50 deletions

VirtualRobot/Import/MeshImport/AssimpReader.cpp
VirtualRobot/Import/MeshImport/AssimpReader.h 6 additions, 6 deletions

VirtualRobot/Import/MeshImport/AssimpReader.h
VirtualRobot/Util/json/eigen_conversion.h 3 additions, 3 deletions

VirtualRobot/Util/json/eigen_conversion.h
VirtualRobot/XML/ObjectIO.h 1 addition, 0 deletions

VirtualRobot/XML/ObjectIO.h

with 97 additions and 64 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