Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

GenericJoint class #747

Merged
merged 37 commits into from
Aug 22, 2016
Merged

GenericJoint class #747

merged 37 commits into from
Aug 22, 2016

Conversation

jslee02
Copy link
Member

@jslee02 jslee02 commented Jul 21, 2016 •
edited
Loading

This change is Reviewable

jslee02 added 27 commits April 11, 2016 08:40
@jslee02
Merge remote-tracking branch 'origin/grey/aspects' into feature/gener…
3482c35 
…ic_joint
@jslee02
Add configuration space classes
58923c6
@jslee02
Add GeometricJoint class that will replace MultiDofJoint
5bd784c
@jslee02
Change BallJoint to inherit GeometricJoint as an exampler
6511375
@jslee02
Rollback accidently added changes in MultiDofJoint class
b7ffc2e
@jslee02
Apply GeometricJoint to more joint class: EulerJoint, FreeJoint, Plan…
be346b8 
…arJoint, PrismaticJoint, RevoluteJoint
@jslee02
Apply GeometricJoint to all the rest of joint classes
4f63265
@jslee02
Remove SingleDofJoint and MultiDofJoint (replaced by GeometricJoint)
c89a686
@jslee02
Remove remains of the name of SingleDofJoint and MultiDofJoint
dd1f251
@jslee02
Remove SO2 and SE2 spaces
0f6f916
@jslee02
Merge remote-tracking branch 'origin/grey/aspects' into geometric_joint
cce496e 
Conflicts:
	dart/dynamics/SingleDofJoint.cpp
	dart/dynamics/detail/MultiDofJoint.h
	unittests/testDynamics.cpp
	unittests/testSoftDynamics.cpp
@jslee02
Merge remote-tracking branch 'origin/grey/aspects' into geometric_joint
04d9f96 
Conflicts:
	apps/hardcodedDesign/Main.cpp
	dart/dynamics/ScrewJoint.cpp
	dart/dynamics/detail/GeometricJointAspect.h
	dart/dynamics/detail/SingleDofJointAspect.h
	dart/math/CMakeLists.txt
@jslee02
Update utility functions converting Euler angles to rotation matrix
e39f35b
@jslee02
Merge remote-tracking branch 'origin/grey/aspects' into geometric_joint
9702228
@jslee02
Merge remote-tracking branch 'origin/treat_warnings_as_error' into ge…
a3e783d 
…ometric_joint

Conflicts:
	dart/dynamics/DegreeOfFreedom.h
	dart/dynamics/GeometricJoint.h
	dart/dynamics/PrismaticJoint.h
	dart/dynamics/RevoluteJoint.h
	dart/dynamics/ScrewJoint.h
	dart/dynamics/SingleDofJoint.cpp
	dart/dynamics/SingleDofJoint.h
	dart/dynamics/Skeleton.h
	dart/dynamics/detail/GeometricJointAspect.h
	dart/dynamics/detail/MultiDofJoint.h
	dart/dynamics/detail/SingleDofJointAspect.cpp
	dart/dynamics/detail/SingleDofJointAspect.h
	dart/utils/SkelParser.cpp
	unittests/testDynamics.cpp
	unittests/testSoftDynamics.cpp
@jslee02
Add parameters to GeometricJointUniqueProperties constructor for init…
c40f39f 
…ial positions and velocities
@jslee02
Rename: RealVector[X]Space --> R[X]Space
a3220d5
@jslee02
Rename: BaseClass --> Base
cc485a2
@jslee02
Merge remote-tracking branch 'origin/grey/aspects' into geometric_joint
f608447
@jslee02
Remove unnecessary name scope specifiers
da1b139
@jslee02
Merge remote-tracking branch 'origin/master' into geometric_joint
9d914c3 
Conflicts:
	dart/dynamics/BallJoint.cpp
	dart/dynamics/BallJoint.hpp
	dart/dynamics/FreeJoint.cpp
	dart/dynamics/FreeJoint.hpp
	dart/dynamics/GeometricJoint.h
	dart/dynamics/MultiDofJoint.h
	dart/dynamics/MultiDofJoint.hpp
	dart/dynamics/SingleDofJoint.cpp
	dart/dynamics/SingleDofJoint.hpp
	dart/dynamics/TranslationalJoint.hpp
	dart/dynamics/detail/EulerJointAspect.hpp
	dart/dynamics/detail/GeometricJointAspect.h
	dart/dynamics/detail/MultiDofJoint.hpp
	dart/dynamics/detail/MultiDofJointAspect.h
	dart/dynamics/detail/MultiDofJointAspect.hpp
	dart/dynamics/detail/PlanarJointAspect.hpp
	dart/dynamics/detail/PrismaticJointAspect.hpp
	dart/dynamics/detail/RevoluteJointAspect.hpp
	dart/dynamics/detail/ScrewJointAspect.hpp
	dart/dynamics/detail/SingleDofJointAspect.cpp
	dart/dynamics/detail/SingleDofJointAspect.hpp
	dart/dynamics/detail/UniversalJointAspect.hpp
	dart/math/CMakeLists.txt
	dart/utils/SkelParser.cpp
	dart/utils/VskParser.cpp
@jslee02
Change depedent component for speedTest example to dart-utils
c8cd73b
@jslee02
Merge remote-tracking branch 'origin/master' into geometric_joint
01e88dd
@jslee02
Adding test for GenericJoint
3cc5698
@jslee02
Merge remote-tracking branch 'origin/release-6.1' into geometric_joint
c441bd8 
# Conflicts:
#	dart/dynamics/BallJoint.cpp
#	dart/dynamics/BallJoint.hpp
#	dart/dynamics/EulerJoint.cpp
#	dart/dynamics/EulerJoint.hpp
#	dart/dynamics/FreeJoint.cpp
#	dart/dynamics/FreeJoint.hpp
#	dart/dynamics/GeometricJoint.hpp
#	dart/dynamics/Joint.hpp
#	dart/dynamics/PlanarJoint.cpp
#	dart/dynamics/PlanarJoint.hpp
#	dart/dynamics/PrismaticJoint.cpp
#	dart/dynamics/PrismaticJoint.hpp
#	dart/dynamics/RevoluteJoint.cpp
#	dart/dynamics/RevoluteJoint.hpp
#	dart/dynamics/ScrewJoint.cpp
#	dart/dynamics/ScrewJoint.hpp
#	dart/dynamics/ShapeFrame.cpp
#	dart/dynamics/SingleDofJoint.cpp
#	dart/dynamics/SingleDofJoint.hpp
#	dart/dynamics/TranslationalJoint.cpp
#	dart/dynamics/TranslationalJoint.hpp
#	dart/dynamics/UniversalJoint.cpp
#	dart/dynamics/UniversalJoint.hpp
#	dart/dynamics/ZeroDofJoint.cpp
#	dart/dynamics/ZeroDofJoint.hpp
#	dart/dynamics/detail/MultiDofJoint.hpp
#	dart/dynamics/detail/SingleDofJointAspect.cpp
#	dart/dynamics/detail/SingleDofJointAspect.hpp
@jslee02
Rename GeometricJoint to GenericJoint
139e9fd
@jslee02
More renameRename GeometricJoint to GenericJoint -- continue
60461c7
@jslee02 jslee02 added this to the DART 6.1.0 milestone Jul 21, 2016
@mkoval
Copy link
Collaborator

mkoval commented Jul 21, 2016

It appears that this pull request should be merged after #749.

jslee02 added 2 commits July 22, 2016 07:28
@jslee02
Merge remote-tracking branch 'origin/release-6.1' into geometric_joint
8adf64b 
# Conflicts:
#	dart/dynamics/SingleDofJoint.cpp
#	dart/dynamics/SingleDofJoint.hpp
#	dart/dynamics/detail/MultiDofJoint.hpp
@jslee02
Update copyright
186caed
@jslee02 jslee02 changed the title [WIP] GenericJoint class GenericJoint class Aug 14, 2016
@jslee02 jslee02 merged commit 284cd3a into release-6.1 Aug 22, 2016
@jslee02 jslee02 deleted the geometric_joint branch August 25, 2016 00:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
DART 6.1.0
Development

Successfully merging this pull request may close these issues.
2 participants
@jslee02 @mkoval