Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

ad3727d8

Commit ad3727d8 authored 5 years ago by Kevin Hitzler

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/SecondHandsDemo' into Ubuntu18.04

 Conflicts:
	VirtualRobot/CMakeLists.txt

parents 3d008290 ec4546aa

No related branches found

No related tags found

Loading

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

VirtualRobot/CMakeLists.txt 172 additions, 219 deletions

VirtualRobot/CMakeLists.txt
VirtualRobot/math/Grid3D.cpp 49 additions, 12 deletions

VirtualRobot/math/Grid3D.cpp
VirtualRobot/math/Grid3D.h 19 additions, 12 deletions

VirtualRobot/math/Grid3D.h
VirtualRobot/math/Helpers.cpp 90 additions, 1 deletion

VirtualRobot/math/Helpers.cpp
VirtualRobot/math/Helpers.h 63 additions, 1 deletion

VirtualRobot/math/Helpers.h
VirtualRobot/math/LinearInterpolatedOrientation.h 1 addition, 3 deletions

VirtualRobot/math/LinearInterpolatedOrientation.h
VirtualRobot/math/LinearInterpolatedPose.cpp 44 additions, 0 deletions

VirtualRobot/math/LinearInterpolatedPose.cpp
VirtualRobot/math/LinearInterpolatedPose.h 46 additions, 0 deletions

VirtualRobot/math/LinearInterpolatedPose.h
VirtualRobot/math/MathForwardDefinitions.h 1 addition, 0 deletions

VirtualRobot/math/MathForwardDefinitions.h
VirtualRobot/math/Plane.cpp 7 additions, 0 deletions

VirtualRobot/math/Plane.cpp
VirtualRobot/math/Plane.h 1 addition, 0 deletions

VirtualRobot/math/Plane.h

with 493 additions and 248 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