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

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
66 commits
Select commit Hold shift + click to select a range
37d59b8
Decoupling collision detection engine and collision objects from Coll…
jslee02 Feb 15, 2016
0b2da84
Add group-group collision detection functionality
jslee02 Feb 15, 2016
a0b1305
Add object-group collision detection functionality
jslee02 Feb 15, 2016
054fc14
Change owership management of collision objects -- still need more work
jslee02 Feb 16, 2016
1d437c6
Implement FCLMeshEngine
jslee02 Feb 16, 2016
88d56ab
Improve memory management for objects of new collision detection API
jslee02 Feb 16, 2016
0c931dd
Merge remote-tracking branch 'origin/master' into collision_group
jslee02 Feb 18, 2016
7adf6b8
Suppress unused variable warnings in bullet collision detector
jslee02 Feb 18, 2016
10397b0
More implementation of new collision checking API and applying to the…
jslee02 Feb 26, 2016
889ccf8
Implement DARTEngine
jslee02 Feb 26, 2016
da625ec
Fix bug of DARTEngine in postprocessing
jslee02 Feb 26, 2016
c0b4dfe
Merge CollisionDetect and Engine, and implementing BulletCollisionDet…
jslee02 Feb 29, 2016
321e136
Merge remote-tracking branch 'origin/master' into collision_group
jslee02 Feb 29, 2016
634192f
Share shape data of 3rd party collision detector across collision obj…
jslee02 Mar 2, 2016
22fb8f8
Merge 'fcl_mesh' directory into 'fcl'
jslee02 Mar 2, 2016
d094bd7
Implementing filtering for collision detection
jslee02 Mar 2, 2016
e330676
Improve comparaing method for two collision objects
jslee02 Mar 4, 2016
e22f4ce
Enforcing CollisionDetector to create unique collision object for the…
jslee02 Mar 11, 2016
522b2a9
Merge remote-tracking branch 'origin/shapenode' into collision_group_…
jslee02 Mar 11, 2016
6004a1b
Change ShapeFrameCollisionObject to ShapeNodeCollisionObject
jslee02 Mar 11, 2016
87e17d9
Use internal ResourceRetriever when nullptr is passed to parsers
jslee02 Mar 11, 2016
ba69ba7
Fix bugs in post processing of each collision detectors
jslee02 Mar 15, 2016
60bd53b
Merge remote-tracking branch 'origin/shapenode' into collision_group
jslee02 Mar 15, 2016
d85b74b
Hiding CollisionObject from public API
jslee02 Mar 23, 2016
e93f921
Merge remote-tracking branch 'origin/master' into collision_group
jslee02 Mar 23, 2016
0de9993
Merge FCLMeshCollisionDetector into FCLCollisionDetector
jslee02 Mar 24, 2016
f3a89c7
Fix ContactConstraint -- failing only testWorld test in release mode
jslee02 Mar 24, 2016
5039629
Merge remote-tracking branch 'origin/master' into collision_group
jslee02 Mar 24, 2016
25cac6b
Bump version to 6.0.0 as API has changed
jslee02 Mar 25, 2016
5d80325
Keep special behavior of setting command depending on joint actuator …
jslee02 Mar 25, 2016
161a396
Bump DART version of catkin package
jslee02 Mar 25, 2016
a6653d6
Don't use fcl::Ellipsoid for FCL 0.3.0 or less
jslee02 Mar 25, 2016
f91a190
Test bullet collision detector only when it's installed
jslee02 Mar 25, 2016
4bf1ec7
Remove mistake
jslee02 Mar 25, 2016
b935da1
Polish CollisionGroup and CollisionObject
jslee02 Mar 25, 2016
0be239c
BulletCollisionDetector works for group-group
jslee02 Mar 26, 2016
c0d8326
Add warning message for using FCL primitive shapes and FCL contact po…
jslee02 Mar 26, 2016
12743da
Use fcl 0.3.2 for homebrew build test
jslee02 Mar 26, 2016
19fdc4b
Disable appveyor build test unless Visual Studio 2015 is capable to b…
jslee02 Mar 26, 2016
a18f4dd
Disable automatic build/tests specifically in appveyor.yml
jslee02 Mar 26, 2016
efc9699
Use mesh version of fcl collision detector by default in ConstraintSo…
jslee02 Mar 26, 2016
0a265e6
Polish FCL/Bullet/DARTCollisionDetector classes
jslee02 Mar 27, 2016
0888b9c
Implement collision options: binary check, maximum number of contacts
jslee02 Mar 27, 2016
ce6f558
Remove dynamics/CollisionDetector.[h/cpp]
jslee02 Mar 28, 2016
555d6ff
Pass shared_ptr by const reference instead of value
jslee02 Mar 28, 2016
65c4d96
Merge remote-tracking branch 'origin/master' into collision_group
jslee02 Mar 28, 2016
aac9ac9
Remove dart/dynamics/detail/CollisionDetector.h
jslee02 Mar 28, 2016
54a2316
Fix unresolved conflict in SkelParser.cpp
jslee02 Mar 28, 2016
5b89458
Improve API of creating CollisionGroups and registering ShapeFrames t…
jslee02 Mar 28, 2016
4993f06
Improve Result class
jslee02 Mar 28, 2016
c322382
Add ShpeFrame accessors to CollisionGroup
jslee02 Mar 28, 2016
123e87d
Polish BulletCollisionDetector class
jslee02 Mar 28, 2016
e673951
Add more collision test
jslee02 Mar 28, 2016
40d9a38
Fix a mistake in CollisionGroup::getShapeFrame()
jslee02 Mar 29, 2016
063e552
Move files under osgDart to dart/gui/osg
jslee02 Mar 29, 2016
df3c1a7
Rename namespace osgDart to dart::gui::osg
jslee02 Mar 29, 2016
26497a0
Execute assimp symbol tests quietly without messages in cmake time
jslee02 Mar 29, 2016
b259145
Remove dart-core library and split dart library into multiple compone…
jslee02 Mar 29, 2016
f528335
Merge remote-tracking branch 'origin/master' into collision_group
jslee02 Mar 29, 2016
67d74ad
Merge remote-tracking branch 'origin/collision_group' into packaging/…
jslee02 Mar 29, 2016
f56dd2e
Apply osgDart renaming to header guards
jslee02 Mar 29, 2016
63a697c
Merge branch 'packaging/osgdart' into packaging/components
jslee02 Mar 29, 2016
30ca7fe
Include DART component files to coverage test
jslee02 Mar 29, 2016
0bd36fe
Rename header extensions from .h to .hpp (except for ode files)
jslee02 Mar 29, 2016
62f52d2
Update header guards for file extension changes
jslee02 Mar 29, 2016
9559d1f
Rollback header file extension change for lodepng.h
jslee02 Mar 29, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
10 changes: 4 additions & 6 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,13 @@ compiler:
- gcc
- clang
env:
- BUILD_CORE_ONLY=OFF BUILD_TYPE=Debug COVERALLS=OFF
- BUILD_CORE_ONLY=OFF BUILD_TYPE=Release COVERALLS=OFF
- BUILD_CORE_ONLY=ON BUILD_TYPE=Debug COVERALLS=OFF
- BUILD_CORE_ONLY=ON BUILD_TYPE=Release COVERALLS=OFF
- BUILD_TYPE=Debug COVERALLS=OFF
- BUILD_TYPE=Release COVERALLS=OFF
matrix:
include:
- os: linux
compiler: gcc
env: BUILD_CORE_ONLY=OFF BUILD_TYPE=Debug COVERALLS=ON COVERALLS_REPO_TOKEN=FKh1HgwfV5uzNrYxIT6ZWjcFqybYZSUym
env: BUILD_TYPE=Debug COVERALLS=ON COVERALLS_REPO_TOKEN=FKh1HgwfV5uzNrYxIT6ZWjcFqybYZSUym
exclude:
- os: osx
compiler: gcc
Expand All @@ -26,7 +24,7 @@ before_install:
install:
- mkdir build
- cd build
- cmake -DBUILD_CORE_ONLY=$BUILD_CORE_ONLY -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DDART_COVERALLS=$COVERALLS ..
- cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DDART_COVERALLS=$COVERALLS ..
script:
- if [ "$TRAVIS_OS_NAME" = "linux" ]; then '../ci/script_linux.sh' ; fi
- if [ "$TRAVIS_OS_NAME" = "osx" ]; then '../ci/script_osx.sh' ; fi
Expand Down
Loading