Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

85d4557c

Commit 85d4557c authored 2 years ago by Fabian Reister

Downloads
- Plain Diff

Merge branch 'fix/urdf-collision-models' into 'master'

Fix/urdf collision models

See merge request sw/simox/simox!125

parents fcf7c515 7176e4fd

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

VirtualRobot/CollisionDetection/CollisionModel.cpp 6 additions, 3 deletions

VirtualRobot/CollisionDetection/CollisionModel.cpp
VirtualRobot/Import/URDF/SimoxURDFFactory.cpp 144 additions, 7 deletions

VirtualRobot/Import/URDF/SimoxURDFFactory.cpp
VirtualRobot/Import/URDF/SimoxURDFFactory.h 9 additions, 1 deletion

VirtualRobot/Import/URDF/SimoxURDFFactory.h
VirtualRobot/Visualization/CoinVisualization/CoinVisualizationFactory.cpp 3 additions, 0 deletions

...ualization/CoinVisualization/CoinVisualizationFactory.cpp
VirtualRobot/XML/BaseIO.cpp 7 additions, 2 deletions

VirtualRobot/XML/BaseIO.cpp

with 169 additions and 13 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