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

Changing header extension from .h to .hpp #653

Closed
wants to merge 66 commits into from
Closed

Changing header extension from .h to .hpp #653

wants to merge 66 commits into from

Conversation

jslee02
Copy link
Member

@jslee02 jslee02 commented Mar 29, 2016

This PR changes head extension from .h to .hpp as proposed in #568.

Exceptions: ode files and lodepng.h

This pull request includes #652. See this to see only the changes made after #652.

jslee02 added 30 commits February 15, 2016 09:42
@jslee02
Decoupling collision detection engine and collision objects from Coll…
37d59b8 
…isionDetector
@jslee02
Add group-group collision detection functionality
0b2da84
@jslee02
Add object-group collision detection functionality
a0b1305
@jslee02
Change owership management of collision objects -- still need more work
054fc14
@jslee02
Implement FCLMeshEngine
1d437c6
@jslee02
Improve memory management for objects of new collision detection API
88d56ab
@jslee02
Merge remote-tracking branch 'origin/master' into collision_group
0c931dd
@jslee02
Suppress unused variable warnings in bullet collision detector
7adf6b8
@jslee02
More implementation of new collision checking API and applying to the…
10397b0 
… existing code base
@jslee02
Implement DARTEngine
889ccf8
@jslee02
Fix bug of DARTEngine in postprocessing
da625ec
@jslee02
Merge CollisionDetect and Engine, and implementing BulletCollisionDet…
c0b4dfe 
…ector
@jslee02
Merge remote-tracking branch 'origin/master' into collision_group
321e136 
Conflicts:
	dart/constraint/ConstraintSolver.cpp
	dart/constraint/ConstraintSolver.h
	dart/utils/SkelParser.cpp
@jslee02
Share shape data of 3rd party collision detector across collision obj…
634192f 
…ects that sharing dart::Shape
@jslee02
Merge 'fcl_mesh' directory into 'fcl'
22fb8f8
@jslee02
Implementing filtering for collision detection
d094bd7
@jslee02
Improve comparaing method for two collision objects
e330676
@jslee02
Enforcing CollisionDetector to create unique collision object for the…
e22f4ce 
… same associated object -- not completed yet
@jslee02
Merge remote-tracking branch 'origin/shapenode' into collision_group_…
522b2a9 
…shapenode

Conflicts:
	apps/rigidShapes/Main.cpp
	dart/collision/bullet/BulletCollisionDetector.cpp
	dart/collision/bullet/BulletCollisionNode.cpp
	dart/collision/bullet/BulletCollisionObjectData.h
	dart/collision/dart/DARTCollisionDetector.cpp
	dart/collision/fcl/FCLCollisionDetector.cpp
	dart/collision/fcl/FCLCollisionNode.cpp
	dart/collision/fcl/FCLCollisionObjectData.h
	dart/collision/fcl_mesh/FCLMeshCollisionNode.cpp
	dart/utils/SkelParser.cpp
	dart/utils/sdf/SoftSdfParser.cpp
	tutorials/tutorialBiped-Finished.cpp
	tutorials/tutorialBiped.cpp
	unittests/testConstraint.cpp
@jslee02
Change ShapeFrameCollisionObject to ShapeNodeCollisionObject
6004a1b
@jslee02
Use internal ResourceRetriever when nullptr is passed to parsers
87e17d9
@jslee02
Fix bugs in post processing of each collision detectors
ba69ba7
@jslee02
Merge remote-tracking branch 'origin/shapenode' into collision_group
60bd53b
@jslee02
Hiding CollisionObject from public API
d85b74b
@jslee02
Merge remote-tracking branch 'origin/master' into collision_group
e93f921 
Conflicts:
	CMakeLists.txt
	apps/rigidShapes/Main.cpp
	dart/constraint/ConstraintSolver.cpp
	dart/constraint/ConstraintSolver.h
	tutorials/tutorialBiped-Finished.cpp
	tutorials/tutorialBiped.cpp
	unittests/testConstraint.cpp
@jslee02
Merge FCLMeshCollisionDetector into FCLCollisionDetector
0de9993
@jslee02
Fix ContactConstraint -- failing only testWorld test in release mode
f3a89c7
@jslee02
Merge remote-tracking branch 'origin/master' into collision_group
5039629
@jslee02
Bump version to 6.0.0 as API has changed
25cac6b
@jslee02
Keep special behavior of setting command depending on joint actuator …
5d80325 
…type until we have actuator semantics
jslee02 added 22 commits March 28, 2016 10:47
@jslee02
Pass shared_ptr by const reference instead of value
555d6ff
@jslee02
Merge remote-tracking branch 'origin/master' into collision_group
65c4d96 
Conflicts:
	dart/utils/SkelParser.cpp
@jslee02
Remove dart/dynamics/detail/CollisionDetector.h
aac9ac9
@jslee02
Fix unresolved conflict in SkelParser.cpp
54a2316
@jslee02
Improve API of creating CollisionGroups and registering ShapeFrames t…
5b89458 
…o CollisionGroups
@jslee02
Improve Result class
4993f06
@jslee02
Add ShpeFrame accessors to CollisionGroup
c322382
@jslee02
Polish BulletCollisionDetector class
123e87d
@jslee02
Add more collision test
e673951
@jslee02
Fix a mistake in CollisionGroup::getShapeFrame()
40d9a38
@jslee02
Move files under osgDart to dart/gui/osg
063e552
@jslee02
Rename namespace osgDart to dart::gui::osg
df3c1a7
@jslee02
Execute assimp symbol tests quietly without messages in cmake time
26497a0
@jslee02
Remove dart-core library and split dart library into multiple compone…
b259145 
…nt libraries depending on dependency 3rd party library requirements
@jslee02
Merge remote-tracking branch 'origin/master' into collision_group
f528335
@jslee02
Merge remote-tracking branch 'origin/collision_group' into packaging/…
67d74ad 
…osgdart

Conflicts:
	CMakeLists.txt
	osgDart/CMakeLists.txt
@jslee02
Apply osgDart renaming to header guards
f56dd2e
@jslee02
Merge branch 'packaging/osgdart' into packaging/components
63a697c 
Conflicts:
	CMakeLists.txt
	appveyor.yml
	ci/script_linux.sh
	ci/script_osx.sh
	dart/gui/osg/examples/CMakeLists.txt
	tutorials/CMakeLists.txt
@jslee02
Include DART component files to coverage test
30ca7fe
@jslee02
Rename header extensions from .h to .hpp (except for ode files)
0bd36fe
@jslee02
Update header guards for file extension changes
62f52d2
@jslee02
Rollback header file extension change for lodepng.h
9559d1f
@jslee02 jslee02 added this to the DART 6.0.0 milestone Mar 29, 2016
@mxgrey
Copy link
Member

mxgrey commented Mar 29, 2016

In a day or two I'll have a pull request coming in related to #643 where we end up with some new files and remove some old ones. That'll be guaranteed to have merge conflicts with this.

I suggest we hold off on renaming files and renaming "DART" instances until we've 100% finalized DART 6.0. Otherwise we'll probably end up with ugly merge conflicts and needing to duplicate efforts.

Also, I'm not sure if we should rename the file extensions in DART 6.0. I was thinking we might just want to rename the extensions for KIDO to simplify the API incompatibility between DART 5 and DART 6.

@jslee02
Copy link
Member Author

jslee02 commented Mar 29, 2016

I suggest we hold off on renaming files and renaming "DART" instances until we've 100% finalized DART 6.0. Otherwise we'll probably end up with ugly merge conflicts and needing to duplicate efforts.

Right, I'll try to resolve the merge conflict once your PR for #643 is merged (or created) since I already put some efforts already. 😓

Another concern I have is the conflicts between #631 and grey/aspects. Do you see #631 can be merged to your branch without ugly merge conflicts?

Also, I'm not sure if we should rename the file extensions in DART 6.0. I was thinking we might just want to rename the extensions for KIDO to simplify the API incompatibility between DART 5 and DART 6.

I thought we intend to minimizing the difference in transitioning from DART 6.0 to KIDO 7.0 (just name change). I'm a bit inclined to making this change in DART 6.0 because the incompatibility of file extension can be straightforwardly resolved by including dart.hpp and a few additional component headers like dart/utils/utils.hpp.

@mxgrey
Copy link
Member

mxgrey commented Mar 29, 2016

I'm a bit inclined to making this change in DART 6.0 because the incompatibility of file extension can be straightforwardly resolved by including dart.hpp and a few additional component headers like dart/utils/utils.hpp.

That's a fair point. An alternative might be to "deprecate" the .h extension by having .h files that simply #include the .hpp files, but that might make the source tree too polluted.

I suppose I'm okay with it either way. No matter what, it'll be like ripping off band-aid; it's painful but needs to be done sooner or later.

Another concern I have is the confliction between #631 and grey/aspects. Do you see #631 can be merged to your branch without ugly merge conflicts?

It won't be a trivial merge, but I don't believe it will be very painful either. Any merge conflicts with that will be the renaming of *Addon* to *Aspect*, which is pretty easy to resolve with a search-and-replace.

@jslee02 jslee02 removed this from the DART 6.0.0 milestone Apr 16, 2016
@jslee02
Copy link
Member Author

jslee02 commented Apr 16, 2016

Will recreate another clean PR once the current open pull request are all merged. Closing.

@jslee02 jslee02 closed this Apr 16, 2016
@jslee02 jslee02 deleted the packaging/h_to_hpp branch May 3, 2016 12:36
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
No milestone
Development

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