Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

c588c857

Commit c588c857 authored 6 years ago by Rainer Kartmann

Downloads
- Patches
- Plain Diff

Fixed recursive merging and meshes from included files

parent ec7fa67e

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

VirtualRobot/examples/MjcfConverter/MjcfConverter.cpp 67 additions, 55 deletions

VirtualRobot/examples/MjcfConverter/MjcfConverter.cpp
VirtualRobot/examples/MjcfConverter/MjcfDocument.cpp 3 additions, 3 deletions

VirtualRobot/examples/MjcfConverter/MjcfDocument.cpp
VirtualRobot/examples/MjcfConverter/SimoxXMLDocument.cpp 57 additions, 25 deletions

VirtualRobot/examples/MjcfConverter/SimoxXMLDocument.cpp
VirtualRobot/examples/MjcfConverter/SimoxXMLDocument.h 12 additions, 7 deletions

VirtualRobot/examples/MjcfConverter/SimoxXMLDocument.h
VirtualRobot/examples/MjcfConverter/main.cpp 1 addition, 6 deletions

VirtualRobot/examples/MjcfConverter/main.cpp
VirtualRobot/examples/MjcfConverter/utils.h 5 additions, 0 deletions

VirtualRobot/examples/MjcfConverter/utils.h

with 145 additions and 96 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