From f24bfabd3a4720a5fb5b87b7d384db7e885c808b Mon Sep 17 00:00:00 2001 From: Jeongseok Lee Date: Wed, 28 Mar 2018 10:22:13 -0700 Subject: [PATCH 1/7] Bump version to 6.5.0 --- CMakeLists.txt | 2 +- examples/addDeleteSkels/CMakeLists.txt | 2 +- examples/atlasSimbicon/CMakeLists.txt | 2 +- examples/bipedStand/CMakeLists.txt | 2 +- examples/hardcodedDesign/CMakeLists.txt | 2 +- examples/hybridDynamics/CMakeLists.txt | 2 +- examples/jointConstraints/CMakeLists.txt | 2 +- examples/mixedChain/CMakeLists.txt | 2 +- examples/operationalSpaceControl/CMakeLists.txt | 2 +- examples/osgExamples/osgAtlasPuppet/CMakeLists.txt | 2 +- examples/osgExamples/osgAtlasSimbicon/CMakeLists.txt | 2 +- examples/osgExamples/osgDragAndDrop/CMakeLists.txt | 2 +- examples/osgExamples/osgEmpty/CMakeLists.txt | 2 +- examples/osgExamples/osgHuboPuppet/CMakeLists.txt | 2 +- examples/osgExamples/osgImGui/CMakeLists.txt | 2 +- examples/osgExamples/osgOperationalSpaceControl/CMakeLists.txt | 2 +- examples/osgExamples/osgSoftBodies/CMakeLists.txt | 2 +- examples/osgExamples/osgTinkertoy/CMakeLists.txt | 2 +- examples/rigidChain/CMakeLists.txt | 2 +- examples/rigidLoop/CMakeLists.txt | 2 +- examples/rigidShapes/CMakeLists.txt | 2 +- examples/simpleFrames/CMakeLists.txt | 2 +- examples/softBodies/CMakeLists.txt | 2 +- examples/speedTest/CMakeLists.txt | 2 +- examples/vehicle/CMakeLists.txt | 2 +- package.xml | 2 +- tutorials/tutorialBiped-Finished/CMakeLists.txt | 2 +- tutorials/tutorialBiped/CMakeLists.txt | 2 +- tutorials/tutorialCollisions-Finished/CMakeLists.txt | 2 +- tutorials/tutorialCollisions/CMakeLists.txt | 2 +- tutorials/tutorialDominoes-Finished/CMakeLists.txt | 2 +- tutorials/tutorialDominoes/CMakeLists.txt | 2 +- tutorials/tutorialMultiPendulum-Finished/CMakeLists.txt | 2 +- tutorials/tutorialMultiPendulum/CMakeLists.txt | 2 +- 34 files changed, 34 insertions(+), 34 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e49ff4f1e001a..63a5ffd847c6d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -55,7 +55,7 @@ endif() # If you change the version, please update the tag in package.xml. set(DART_MAJOR_VERSION "6") -set(DART_MINOR_VERSION "4") +set(DART_MINOR_VERSION "5") set(DART_PATCH_VERSION "0") set(DART_VERSION "${DART_MAJOR_VERSION}.${DART_MINOR_VERSION}.${DART_PATCH_VERSION}") set(DART_PKG_DESC "Dynamic Animation and Robotics Toolkit.") diff --git a/examples/addDeleteSkels/CMakeLists.txt b/examples/addDeleteSkels/CMakeLists.txt index d9bdf535a984b..b6a4bbfdbb4f1 100644 --- a/examples/addDeleteSkels/CMakeLists.txt +++ b/examples/addDeleteSkels/CMakeLists.txt @@ -7,7 +7,7 @@ endif() project(addDeleteSkels) -find_package(DART 6.4.0 REQUIRED COMPONENTS utils-urdf gui CONFIG) +find_package(DART 6.5.0 REQUIRED COMPONENTS utils-urdf gui CONFIG) add_compile_options(-std=c++11) diff --git a/examples/atlasSimbicon/CMakeLists.txt b/examples/atlasSimbicon/CMakeLists.txt index 8c88e438936b0..5d8fda9842c02 100644 --- a/examples/atlasSimbicon/CMakeLists.txt +++ b/examples/atlasSimbicon/CMakeLists.txt @@ -7,7 +7,7 @@ endif() project(atlasSimbicon) -find_package(DART 6.4.0 REQUIRED COMPONENTS utils-urdf gui CONFIG) +find_package(DART 6.5.0 REQUIRED COMPONENTS utils-urdf gui CONFIG) add_compile_options(-std=c++11) diff --git a/examples/bipedStand/CMakeLists.txt b/examples/bipedStand/CMakeLists.txt index b84d4f07c31c4..a9c4281520647 100644 --- a/examples/bipedStand/CMakeLists.txt +++ b/examples/bipedStand/CMakeLists.txt @@ -7,7 +7,7 @@ endif() project(bipedStand) -find_package(DART 6.4.0 REQUIRED COMPONENTS utils-urdf gui CONFIG) +find_package(DART 6.5.0 REQUIRED COMPONENTS utils-urdf gui CONFIG) add_compile_options(-std=c++11) diff --git a/examples/hardcodedDesign/CMakeLists.txt b/examples/hardcodedDesign/CMakeLists.txt index 240b6bcb6d3f5..811d5994836ce 100644 --- a/examples/hardcodedDesign/CMakeLists.txt +++ b/examples/hardcodedDesign/CMakeLists.txt @@ -7,7 +7,7 @@ endif() project(hardcodedDesign) -find_package(DART 6.4.0 REQUIRED COMPONENTS utils-urdf gui CONFIG) +find_package(DART 6.5.0 REQUIRED COMPONENTS utils-urdf gui CONFIG) add_compile_options(-std=c++11) diff --git a/examples/hybridDynamics/CMakeLists.txt b/examples/hybridDynamics/CMakeLists.txt index aa32aee58586a..0932d0ee2e3f2 100644 --- a/examples/hybridDynamics/CMakeLists.txt +++ b/examples/hybridDynamics/CMakeLists.txt @@ -7,7 +7,7 @@ endif() project(hybridDynamics) -find_package(DART 6.4.0 REQUIRED COMPONENTS utils-urdf gui CONFIG) +find_package(DART 6.5.0 REQUIRED COMPONENTS utils-urdf gui CONFIG) add_compile_options(-std=c++11) diff --git a/examples/jointConstraints/CMakeLists.txt b/examples/jointConstraints/CMakeLists.txt index 4a1e6b92dbbcd..35beef812dff4 100644 --- a/examples/jointConstraints/CMakeLists.txt +++ b/examples/jointConstraints/CMakeLists.txt @@ -7,7 +7,7 @@ endif() project(jointConstraints) -find_package(DART 6.4.0 REQUIRED COMPONENTS utils-urdf gui CONFIG) +find_package(DART 6.5.0 REQUIRED COMPONENTS utils-urdf gui CONFIG) add_compile_options(-std=c++11) diff --git a/examples/mixedChain/CMakeLists.txt b/examples/mixedChain/CMakeLists.txt index 98b47f5fbf482..3fd7c754c575b 100644 --- a/examples/mixedChain/CMakeLists.txt +++ b/examples/mixedChain/CMakeLists.txt @@ -7,7 +7,7 @@ endif() project(mixedChain) -find_package(DART 6.4.0 REQUIRED COMPONENTS utils-urdf gui CONFIG) +find_package(DART 6.5.0 REQUIRED COMPONENTS utils-urdf gui CONFIG) add_compile_options(-std=c++11) diff --git a/examples/operationalSpaceControl/CMakeLists.txt b/examples/operationalSpaceControl/CMakeLists.txt index 2705b25616cd6..fbc6cf7821a7d 100644 --- a/examples/operationalSpaceControl/CMakeLists.txt +++ b/examples/operationalSpaceControl/CMakeLists.txt @@ -7,7 +7,7 @@ endif() project(operationalSpaceControl) -find_package(DART 6.4.0 REQUIRED COMPONENTS utils-urdf gui CONFIG) +find_package(DART 6.5.0 REQUIRED COMPONENTS utils-urdf gui CONFIG) add_compile_options(-std=c++11) diff --git a/examples/osgExamples/osgAtlasPuppet/CMakeLists.txt b/examples/osgExamples/osgAtlasPuppet/CMakeLists.txt index c5e6d10ffc5e1..d1f6c68185908 100644 --- a/examples/osgExamples/osgAtlasPuppet/CMakeLists.txt +++ b/examples/osgExamples/osgAtlasPuppet/CMakeLists.txt @@ -7,7 +7,7 @@ endif() project(osgAtlasPuppet) -find_package(DART 6.4.0 REQUIRED COMPONENTS utils-urdf gui-osg CONFIG) +find_package(DART 6.5.0 REQUIRED COMPONENTS utils-urdf gui-osg CONFIG) add_compile_options(-std=c++11) diff --git a/examples/osgExamples/osgAtlasSimbicon/CMakeLists.txt b/examples/osgExamples/osgAtlasSimbicon/CMakeLists.txt index 19ec4b9be26a5..b3280285ae09c 100644 --- a/examples/osgExamples/osgAtlasSimbicon/CMakeLists.txt +++ b/examples/osgExamples/osgAtlasSimbicon/CMakeLists.txt @@ -7,7 +7,7 @@ endif() project(osgAtlasSimbicon) -find_package(DART 6.4.0 REQUIRED COMPONENTS utils-urdf gui-osg CONFIG) +find_package(DART 6.5.0 REQUIRED COMPONENTS utils-urdf gui-osg CONFIG) add_compile_options(-std=c++11) diff --git a/examples/osgExamples/osgDragAndDrop/CMakeLists.txt b/examples/osgExamples/osgDragAndDrop/CMakeLists.txt index 22ffc5fed3a9a..fc0d7756d8ea1 100644 --- a/examples/osgExamples/osgDragAndDrop/CMakeLists.txt +++ b/examples/osgExamples/osgDragAndDrop/CMakeLists.txt @@ -7,7 +7,7 @@ endif() project(osgDragAndDrop) -find_package(DART 6.4.0 REQUIRED COMPONENTS utils-urdf gui-osg CONFIG) +find_package(DART 6.5.0 REQUIRED COMPONENTS utils-urdf gui-osg CONFIG) add_compile_options(-std=c++11) diff --git a/examples/osgExamples/osgEmpty/CMakeLists.txt b/examples/osgExamples/osgEmpty/CMakeLists.txt index bbe7fa73df6a9..08481b0327463 100644 --- a/examples/osgExamples/osgEmpty/CMakeLists.txt +++ b/examples/osgExamples/osgEmpty/CMakeLists.txt @@ -7,7 +7,7 @@ endif() project(osgEmpty) -find_package(DART 6.4.0 REQUIRED COMPONENTS utils-urdf gui-osg CONFIG) +find_package(DART 6.5.0 REQUIRED COMPONENTS utils-urdf gui-osg CONFIG) add_compile_options(-std=c++11) diff --git a/examples/osgExamples/osgHuboPuppet/CMakeLists.txt b/examples/osgExamples/osgHuboPuppet/CMakeLists.txt index 23d2eaf8eec2d..ebe4e91c3c513 100644 --- a/examples/osgExamples/osgHuboPuppet/CMakeLists.txt +++ b/examples/osgExamples/osgHuboPuppet/CMakeLists.txt @@ -7,7 +7,7 @@ endif() project(osgHubuPuppet) -find_package(DART 6.4.0 REQUIRED COMPONENTS utils-urdf gui-osg CONFIG) +find_package(DART 6.5.0 REQUIRED COMPONENTS utils-urdf gui-osg CONFIG) add_compile_options(-std=c++11) diff --git a/examples/osgExamples/osgImGui/CMakeLists.txt b/examples/osgExamples/osgImGui/CMakeLists.txt index 38c86b59c18bf..8b4ad59a8b8d2 100644 --- a/examples/osgExamples/osgImGui/CMakeLists.txt +++ b/examples/osgExamples/osgImGui/CMakeLists.txt @@ -7,7 +7,7 @@ endif() project(osgImGui) -find_package(DART 6.4.0 REQUIRED COMPONENTS utils-urdf gui-osg CONFIG) +find_package(DART 6.5.0 REQUIRED COMPONENTS utils-urdf gui-osg CONFIG) add_compile_options(-std=c++11) diff --git a/examples/osgExamples/osgOperationalSpaceControl/CMakeLists.txt b/examples/osgExamples/osgOperationalSpaceControl/CMakeLists.txt index 93c1845688f7f..c17d66c2b04a6 100644 --- a/examples/osgExamples/osgOperationalSpaceControl/CMakeLists.txt +++ b/examples/osgExamples/osgOperationalSpaceControl/CMakeLists.txt @@ -7,7 +7,7 @@ endif() project(osgOperationalSpaceControl) -find_package(DART 6.4.0 REQUIRED COMPONENTS utils-urdf gui-osg CONFIG) +find_package(DART 6.5.0 REQUIRED COMPONENTS utils-urdf gui-osg CONFIG) add_compile_options(-std=c++11) diff --git a/examples/osgExamples/osgSoftBodies/CMakeLists.txt b/examples/osgExamples/osgSoftBodies/CMakeLists.txt index 04e705e9ce54f..5ed2b365d05fc 100644 --- a/examples/osgExamples/osgSoftBodies/CMakeLists.txt +++ b/examples/osgExamples/osgSoftBodies/CMakeLists.txt @@ -7,7 +7,7 @@ endif() project(osgSoftBodies) -find_package(DART 6.4.0 REQUIRED COMPONENTS utils-urdf gui-osg CONFIG) +find_package(DART 6.5.0 REQUIRED COMPONENTS utils-urdf gui-osg CONFIG) add_compile_options(-std=c++11) diff --git a/examples/osgExamples/osgTinkertoy/CMakeLists.txt b/examples/osgExamples/osgTinkertoy/CMakeLists.txt index e6ea0b4ff3eef..bf2e73628cf8a 100644 --- a/examples/osgExamples/osgTinkertoy/CMakeLists.txt +++ b/examples/osgExamples/osgTinkertoy/CMakeLists.txt @@ -7,7 +7,7 @@ endif() project(osgTinkertoy) -find_package(DART 6.4.0 REQUIRED COMPONENTS utils-urdf gui-osg CONFIG) +find_package(DART 6.5.0 REQUIRED COMPONENTS utils-urdf gui-osg CONFIG) add_compile_options(-std=c++11) diff --git a/examples/rigidChain/CMakeLists.txt b/examples/rigidChain/CMakeLists.txt index a7e5ee006d19d..f92646be29606 100644 --- a/examples/rigidChain/CMakeLists.txt +++ b/examples/rigidChain/CMakeLists.txt @@ -7,7 +7,7 @@ endif() project(rigidChain) -find_package(DART 6.4.0 REQUIRED COMPONENTS utils-urdf gui CONFIG) +find_package(DART 6.5.0 REQUIRED COMPONENTS utils-urdf gui CONFIG) add_compile_options(-std=c++11) diff --git a/examples/rigidLoop/CMakeLists.txt b/examples/rigidLoop/CMakeLists.txt index 86157ddf19b9e..089eed54d984f 100644 --- a/examples/rigidLoop/CMakeLists.txt +++ b/examples/rigidLoop/CMakeLists.txt @@ -7,7 +7,7 @@ endif() project(rigidLoop) -find_package(DART 6.4.0 REQUIRED COMPONENTS utils-urdf gui CONFIG) +find_package(DART 6.5.0 REQUIRED COMPONENTS utils-urdf gui CONFIG) add_compile_options(-std=c++11) diff --git a/examples/rigidShapes/CMakeLists.txt b/examples/rigidShapes/CMakeLists.txt index 0965ae98c0a2c..f43d465fc242b 100644 --- a/examples/rigidShapes/CMakeLists.txt +++ b/examples/rigidShapes/CMakeLists.txt @@ -7,7 +7,7 @@ endif() project(rigidShapes) -find_package(DART 6.4.0 REQUIRED COMPONENTS utils-urdf gui CONFIG) +find_package(DART 6.5.0 REQUIRED COMPONENTS utils-urdf gui CONFIG) add_compile_options(-std=c++11) diff --git a/examples/simpleFrames/CMakeLists.txt b/examples/simpleFrames/CMakeLists.txt index fee946276f5e1..595e78045d904 100644 --- a/examples/simpleFrames/CMakeLists.txt +++ b/examples/simpleFrames/CMakeLists.txt @@ -7,7 +7,7 @@ endif() project(simpleFrames) -find_package(DART 6.4.0 REQUIRED COMPONENTS utils-urdf gui CONFIG) +find_package(DART 6.5.0 REQUIRED COMPONENTS utils-urdf gui CONFIG) add_compile_options(-std=c++11) diff --git a/examples/softBodies/CMakeLists.txt b/examples/softBodies/CMakeLists.txt index a3eb475b7034f..710bb44e6b110 100644 --- a/examples/softBodies/CMakeLists.txt +++ b/examples/softBodies/CMakeLists.txt @@ -7,7 +7,7 @@ endif() project(softBodies) -find_package(DART 6.4.0 REQUIRED COMPONENTS utils-urdf gui CONFIG) +find_package(DART 6.5.0 REQUIRED COMPONENTS utils-urdf gui CONFIG) add_compile_options(-std=c++11) diff --git a/examples/speedTest/CMakeLists.txt b/examples/speedTest/CMakeLists.txt index 3f269240e217f..3801e88367a34 100644 --- a/examples/speedTest/CMakeLists.txt +++ b/examples/speedTest/CMakeLists.txt @@ -7,7 +7,7 @@ endif() project(speedTest) -find_package(DART 6.4.0 REQUIRED COMPONENTS utils-urdf gui CONFIG) +find_package(DART 6.5.0 REQUIRED COMPONENTS utils-urdf gui CONFIG) add_compile_options(-std=c++11) diff --git a/examples/vehicle/CMakeLists.txt b/examples/vehicle/CMakeLists.txt index 1264ae9a89596..99e4938cbeb1e 100644 --- a/examples/vehicle/CMakeLists.txt +++ b/examples/vehicle/CMakeLists.txt @@ -7,7 +7,7 @@ endif() project(vehicle) -find_package(DART 6.4.0 REQUIRED COMPONENTS utils-urdf gui CONFIG) +find_package(DART 6.5.0 REQUIRED COMPONENTS utils-urdf gui CONFIG) add_compile_options(-std=c++11) diff --git a/package.xml b/package.xml index 776e064d0be98..a3a2e083fbfdf 100644 --- a/package.xml +++ b/package.xml @@ -4,7 +4,7 @@ a Catkin workspace. Catkin is not required to build DART. For more information, see: http://ros.org/reps/rep-0136.html --> dartsim - 6.4.0 + 6.5.0 DART (Dynamic Animation and Robotics Toolkit) is a collaborative, cross-platform, open source library created by the Georgia Tech Graphics diff --git a/tutorials/tutorialBiped-Finished/CMakeLists.txt b/tutorials/tutorialBiped-Finished/CMakeLists.txt index 3824868f60237..6d97de66ca239 100644 --- a/tutorials/tutorialBiped-Finished/CMakeLists.txt +++ b/tutorials/tutorialBiped-Finished/CMakeLists.txt @@ -7,7 +7,7 @@ endif() project(tutorialBiped-Finished) -find_package(DART 6.4.0 REQUIRED COMPONENTS utils-urdf gui CONFIG) +find_package(DART 6.5.0 REQUIRED COMPONENTS utils-urdf gui CONFIG) add_compile_options(-std=c++11) diff --git a/tutorials/tutorialBiped/CMakeLists.txt b/tutorials/tutorialBiped/CMakeLists.txt index 94987c15e36e5..ffb5be3fea493 100644 --- a/tutorials/tutorialBiped/CMakeLists.txt +++ b/tutorials/tutorialBiped/CMakeLists.txt @@ -7,7 +7,7 @@ endif() project(tutorialBiped) -find_package(DART 6.4.0 REQUIRED COMPONENTS utils-urdf gui CONFIG) +find_package(DART 6.5.0 REQUIRED COMPONENTS utils-urdf gui CONFIG) add_compile_options(-std=c++11) diff --git a/tutorials/tutorialCollisions-Finished/CMakeLists.txt b/tutorials/tutorialCollisions-Finished/CMakeLists.txt index 4432022c3cfe8..c4ac2319c086e 100644 --- a/tutorials/tutorialCollisions-Finished/CMakeLists.txt +++ b/tutorials/tutorialCollisions-Finished/CMakeLists.txt @@ -7,7 +7,7 @@ endif() project(tutorialCollisions-Finished) -find_package(DART 6.4.0 REQUIRED COMPONENTS utils-urdf gui CONFIG) +find_package(DART 6.5.0 REQUIRED COMPONENTS utils-urdf gui CONFIG) add_compile_options(-std=c++11) diff --git a/tutorials/tutorialCollisions/CMakeLists.txt b/tutorials/tutorialCollisions/CMakeLists.txt index 73f4427d9f49e..d32f100414687 100644 --- a/tutorials/tutorialCollisions/CMakeLists.txt +++ b/tutorials/tutorialCollisions/CMakeLists.txt @@ -7,7 +7,7 @@ endif() project(tutorialCollisions) -find_package(DART 6.4.0 REQUIRED COMPONENTS utils-urdf gui CONFIG) +find_package(DART 6.5.0 REQUIRED COMPONENTS utils-urdf gui CONFIG) add_compile_options(-std=c++11) diff --git a/tutorials/tutorialDominoes-Finished/CMakeLists.txt b/tutorials/tutorialDominoes-Finished/CMakeLists.txt index 84eeb6d817ac8..ad55dd97ba60f 100644 --- a/tutorials/tutorialDominoes-Finished/CMakeLists.txt +++ b/tutorials/tutorialDominoes-Finished/CMakeLists.txt @@ -7,7 +7,7 @@ endif() project(tutorialDominoes-Finished) -find_package(DART 6.4.0 REQUIRED COMPONENTS utils-urdf gui CONFIG) +find_package(DART 6.5.0 REQUIRED COMPONENTS utils-urdf gui CONFIG) add_compile_options(-std=c++11) diff --git a/tutorials/tutorialDominoes/CMakeLists.txt b/tutorials/tutorialDominoes/CMakeLists.txt index 2c289bf5bc67c..24bb04456d895 100644 --- a/tutorials/tutorialDominoes/CMakeLists.txt +++ b/tutorials/tutorialDominoes/CMakeLists.txt @@ -7,7 +7,7 @@ endif() project(tutorialDominoes) -find_package(DART 6.4.0 REQUIRED COMPONENTS utils-urdf gui CONFIG) +find_package(DART 6.5.0 REQUIRED COMPONENTS utils-urdf gui CONFIG) add_compile_options(-std=c++11) diff --git a/tutorials/tutorialMultiPendulum-Finished/CMakeLists.txt b/tutorials/tutorialMultiPendulum-Finished/CMakeLists.txt index 174d6b198a26a..e02125ff8e45b 100644 --- a/tutorials/tutorialMultiPendulum-Finished/CMakeLists.txt +++ b/tutorials/tutorialMultiPendulum-Finished/CMakeLists.txt @@ -7,7 +7,7 @@ endif() project(tutorialMultiPendulum-Finished) -find_package(DART 6.4.0 REQUIRED COMPONENTS utils-urdf gui CONFIG) +find_package(DART 6.5.0 REQUIRED COMPONENTS utils-urdf gui CONFIG) add_compile_options(-std=c++11) diff --git a/tutorials/tutorialMultiPendulum/CMakeLists.txt b/tutorials/tutorialMultiPendulum/CMakeLists.txt index a396ac0af4ed7..e796781ff2b22 100644 --- a/tutorials/tutorialMultiPendulum/CMakeLists.txt +++ b/tutorials/tutorialMultiPendulum/CMakeLists.txt @@ -7,7 +7,7 @@ endif() project(tutorialMultiPendulum) -find_package(DART 6.4.0 REQUIRED COMPONENTS utils-urdf gui CONFIG) +find_package(DART 6.5.0 REQUIRED COMPONENTS utils-urdf gui CONFIG) add_compile_options(-std=c++11) From 9d468919a26105383bbd40084f469e4c7e8d1ebb Mon Sep 17 00:00:00 2001 From: Jeongseok Lee Date: Fri, 30 Mar 2018 15:30:21 -0700 Subject: [PATCH 2/7] Exclude examples and tutorials from all target (#1046) --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 63a5ffd847c6d..b57f3d4403edd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -275,7 +275,7 @@ if(TARGET dart) add_subdirectory(unittests EXCLUDE_FROM_ALL) # Add example subdirectories and an "examples" target. - add_subdirectory(examples) + add_subdirectory(examples EXCLUDE_FROM_ALL) get_property(examples GLOBAL PROPERTY DART_EXAMPLES) add_custom_target(examples DEPENDS ${examples}) @@ -291,7 +291,7 @@ if(TARGET dart) endif(DART_VERBOSE) # Add a "tutorials" target to build tutorials. - add_subdirectory(tutorials) + add_subdirectory(tutorials EXCLUDE_FROM_ALL) get_property(tutorials GLOBAL PROPERTY DART_TUTORIALS) add_custom_target(tutorials DEPENDS ${tutorials}) From 6d7b4535c2eb5bf306f63a6d2471b34a860b9472 Mon Sep 17 00:00:00 2001 From: Jeongseok Lee Date: Tue, 3 Apr 2018 06:26:32 -0700 Subject: [PATCH 3/7] Add FOV API to OSG viewer (#1048) --- CHANGELOG.md | 6 ++++ dart/gui/osg/Viewer.cpp | 62 +++++++++++++++++++++++++++++++++++++++++ dart/gui/osg/Viewer.hpp | 9 ++++++ 3 files changed, 77 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a9af434e33438..4e5e13a52d29e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ ## DART 6 +### DART 6.5.0 (201X-XX-XX) + +* GUI + + * Added FOV AI to OSG viewer: [#1048](https://github.com/dartsim/dart/pull/1048) + ### [DART 6.4.0 (2018-03-26)](https://github.com/dartsim/dart/milestone/39?closed=1) * Common diff --git a/dart/gui/osg/Viewer.cpp b/dart/gui/osg/Viewer.cpp index aa4c2abcc014c..3696c6370fc28 100644 --- a/dart/gui/osg/Viewer.cpp +++ b/dart/gui/osg/Viewer.cpp @@ -843,6 +843,68 @@ const ::osg::ref_ptr<::osg::Group>& Viewer::getRootGroup() const return mRootGroup; } +//============================================================================== +void Viewer::setVerticalFieldOfView(const double fov) +{ + double fovy; + double aspectRatio; + double zNear; + double zFar; + + auto* camera = getCamera(); + + if (!camera) + { + dtwarn << "[Viewer::setMasterCameraFieldOfView] This viewer doesn't have " + << "any cameras. Ignoring this request.\n"; + return; + } + + const bool result = camera->getProjectionMatrixAsPerspective( + fovy, aspectRatio, zNear, zFar); + + if (!result) + { + dtwarn << "[Viewer::setMasterCameraFieldOfView] Attemping to set vertical " + << "field of view while the camera isn't perspective view. " + << "Ignoring this request.\n"; + return; + } + + camera->setProjectionMatrixAsPerspective(fov, aspectRatio, zNear, zFar); +} + +//============================================================================== +double Viewer::getVerticalFieldOfView() const +{ + double fovy; + double aspectRatio; + double zNear; + double zFar; + + const auto* camera = getCamera(); + + if (!camera) + { + dtwarn << "[Viewer::getMasterCameraFieldOfView] This viewer doesn't have " + << "any cameras. Returning 0.0.\n"; + return 0.0; + } + + const bool result = camera->getProjectionMatrixAsPerspective( + fovy, aspectRatio, zNear, zFar); + + if (!result) + { + dtwarn << "[Viewer::getMasterCameraFieldOfView] Vertical field of view is " + << "requested while the camera isn't perspective view. " + << "Returning 0.0.\n"; + return 0.0; + } + + return fovy; +} + } // namespace osg } // namespace gui } // namespace dart diff --git a/dart/gui/osg/Viewer.hpp b/dart/gui/osg/Viewer.hpp index 817d15272bfd6..47109d99d6c41 100644 --- a/dart/gui/osg/Viewer.hpp +++ b/dart/gui/osg/Viewer.hpp @@ -293,6 +293,15 @@ class Viewer : public osgViewer::Viewer, public dart::common::Subject /// Get the root ::osg::Group of this Viewer const ::osg::ref_ptr<::osg::Group>& getRootGroup() const; + /// Sets the vertical field of view of the master camera of the view. + /// \param[in] fov Vertical field of view in degrees. + void setVerticalFieldOfView(double fov); + + /// Returns the vertical field of view of the master camera of the view. + /// \return Vertical field of view in degrees if the camera is perspective + /// view, 0.0 otherwise. + double getVerticalFieldOfView() const; + protected: friend class SaveScreen; From e9c4c1b118b7e98ad3491f8ed5b832c01bbcaeaa Mon Sep 17 00:00:00 2001 From: Jeongseok Lee Date: Tue, 3 Apr 2018 06:27:25 -0700 Subject: [PATCH 4/7] Fix typo in changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4e5e13a52d29e..53773ee61f86b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ * GUI - * Added FOV AI to OSG viewer: [#1048](https://github.com/dartsim/dart/pull/1048) + * Added FOV API to OSG viewer: [#1048](https://github.com/dartsim/dart/pull/1048) ### [DART 6.4.0 (2018-03-26)](https://github.com/dartsim/dart/milestone/39?closed=1) From a93d7e0e6bf50fd5496b2427d2dfd227e506b833 Mon Sep 17 00:00:00 2001 From: Jeongseok Lee Date: Fri, 6 Apr 2018 09:54:03 -0700 Subject: [PATCH 5/7] Add World::hasSkeleton() (#1050) --- CHANGELOG.md | 4 ++++ dart/simulation/World.cpp | 7 +++++++ dart/simulation/World.hpp | 3 +++ unittests/comprehensive/test_World.cpp | 9 +++++++++ 4 files changed, 23 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 53773ee61f86b..0938061aa2c1f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,10 @@ * Added FOV API to OSG viewer: [#1048](https://github.com/dartsim/dart/pull/1048) +* Simulation + + * Added World::hasSkeleton(): [#1050](https://github.com/dartsim/dart/pull/1050) + ### [DART 6.4.0 (2018-03-26)](https://github.com/dartsim/dart/milestone/39?closed=1) * Common diff --git a/dart/simulation/World.cpp b/dart/simulation/World.cpp index db31e47066f30..51ff870a224ce 100644 --- a/dart/simulation/World.cpp +++ b/dart/simulation/World.cpp @@ -391,6 +391,13 @@ std::set World::removeAllSkeletons() return ptrs; } +//============================================================================== +bool World::hasSkeleton(const dynamics::ConstSkeletonPtr& skeleton) const +{ + return std::find(mSkeletons.begin(), mSkeletons.end(), skeleton) + != mSkeletons.end(); +} + //============================================================================== int World::getIndex(int _index) const { diff --git a/dart/simulation/World.hpp b/dart/simulation/World.hpp index 90e840bede515..026743f3949fe 100644 --- a/dart/simulation/World.hpp +++ b/dart/simulation/World.hpp @@ -149,6 +149,9 @@ class World : public virtual common::Subject /// pointers to them, in case you want to recycle them std::set removeAllSkeletons(); + /// Returns wether this World contains a Skeleton. + bool hasSkeleton(const dynamics::ConstSkeletonPtr& skeleton) const; + /// Get the dof index for the indexed skeleton int getIndex(int _index) const; diff --git a/unittests/comprehensive/test_World.cpp b/unittests/comprehensive/test_World.cpp index 63e4c37357380..c45855de92310 100644 --- a/unittests/comprehensive/test_World.cpp +++ b/unittests/comprehensive/test_World.cpp @@ -95,9 +95,16 @@ TEST(World, AddingAndRemovingSkeletons) for (int i = 0; i < nSteps; ++i) world->step(); + EXPECT_FALSE(world->hasSkeleton(skeleton1)); + EXPECT_FALSE(world->hasSkeleton(skeleton2)); + EXPECT_FALSE(world->hasSkeleton(skeleton3)); + EXPECT_FALSE(world->hasSkeleton(skeleton4)); + // Add skeleton1, skeleton2 world->addSkeleton(skeleton1); + EXPECT_TRUE(world->hasSkeleton(skeleton1)); world->addSkeleton(skeleton2); + EXPECT_TRUE(world->hasSkeleton(skeleton2)); EXPECT_TRUE(world->getNumSkeletons() == 2); for (int i = 0; i < nSteps; ++i) world->step(); @@ -119,7 +126,9 @@ TEST(World, AddingAndRemovingSkeletons) // Add skeleton3, skeleton4 world->addSkeleton(skeleton3); + EXPECT_TRUE(world->hasSkeleton(skeleton3)); world->addSkeleton(skeleton4); + EXPECT_TRUE(world->hasSkeleton(skeleton4)); EXPECT_TRUE(world->getNumSkeletons() == 3); for (int i = 0; i < nSteps; ++i) world->step(); From efeaf98970144759336bafb2c0fb86a5f7ab471f Mon Sep 17 00:00:00 2001 From: Jeongseok Lee Date: Thu, 19 Apr 2018 21:13:01 -0700 Subject: [PATCH 6/7] Install only required boost components (#1054) --- .ci/docker/ubuntu-artful | 4 +++- .ci/docker/ubuntu-bionic | 4 +++- .ci/docker/ubuntu-xenial | 4 +++- .ci/install_linux.sh | 4 +++- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/.ci/docker/ubuntu-artful b/.ci/docker/ubuntu-artful index 5e0a6bde8e623..6b185dfad2252 100644 --- a/.ci/docker/ubuntu-artful +++ b/.ci/docker/ubuntu-artful @@ -7,7 +7,9 @@ RUN apt-get install -y \ cmake \ pkg-config \ libassimp-dev \ - libboost-all-dev \ + libboost-filesystem-dev \ + libboost-regex-dev \ + libboost-system-dev \ libccd-dev \ libeigen3-dev \ libfcl-dev \ diff --git a/.ci/docker/ubuntu-bionic b/.ci/docker/ubuntu-bionic index e563db667e674..d692a21a6a922 100644 --- a/.ci/docker/ubuntu-bionic +++ b/.ci/docker/ubuntu-bionic @@ -7,7 +7,9 @@ RUN apt-get install -y \ cmake \ pkg-config \ libassimp-dev \ - libboost-all-dev \ + libboost-filesystem-dev \ + libboost-regex-dev \ + libboost-system-dev \ libccd-dev \ libeigen3-dev \ libfcl-dev \ diff --git a/.ci/docker/ubuntu-xenial b/.ci/docker/ubuntu-xenial index ee3a43597ff38..d63ea15f508f9 100644 --- a/.ci/docker/ubuntu-xenial +++ b/.ci/docker/ubuntu-xenial @@ -7,7 +7,9 @@ RUN apt-get install -y \ cmake \ pkg-config \ libassimp-dev \ - libboost-all-dev \ + libboost-filesystem-dev \ + libboost-regex-dev \ + libboost-system-dev \ libccd-dev \ libeigen3-dev \ libfcl-dev \ diff --git a/.ci/install_linux.sh b/.ci/install_linux.sh index 5750a50bc31aa..9ed61822c32ce 100755 --- a/.ci/install_linux.sh +++ b/.ci/install_linux.sh @@ -9,7 +9,9 @@ sudo apt-get -qq update APT=' cmake libassimp-dev -libboost-all-dev +libboost-filesystem-dev +libboost-regex-dev +libboost-system-dev libccd-dev libeigen3-dev libfcl-dev From 373434a24c85e39f9ccce176bfc868240299add6 Mon Sep 17 00:00:00 2001 From: Jeongseok Lee Date: Sat, 28 Apr 2018 20:47:34 -0700 Subject: [PATCH 7/7] Remove CI tests on Artful (#1059) --- .ci/docker/ubuntu-artful | 29 ----------------------------- .ci/docker/ubuntu-bionic | 2 +- .ci/script.sh | 2 +- .travis.yml | 3 --- 4 files changed, 2 insertions(+), 34 deletions(-) delete mode 100644 .ci/docker/ubuntu-artful diff --git a/.ci/docker/ubuntu-artful b/.ci/docker/ubuntu-artful deleted file mode 100644 index 6b185dfad2252..0000000000000 --- a/.ci/docker/ubuntu-artful +++ /dev/null @@ -1,29 +0,0 @@ -FROM ubuntu:artful - -RUN apt-get update -qq -RUN apt-get install -y \ - sudo \ - build-essential \ - cmake \ - pkg-config \ - libassimp-dev \ - libboost-filesystem-dev \ - libboost-regex-dev \ - libboost-system-dev \ - libccd-dev \ - libeigen3-dev \ - libfcl-dev \ - freeglut3-dev \ - libxi-dev \ - libxmu-dev \ - libbullet-dev \ - libode-dev \ - libflann-dev \ - libnlopt-dev \ - coinor-libipopt-dev \ - libtinyxml2-dev \ - liburdfdom-dev \ - liburdfdom-headers-dev \ - libopenscenegraph-dev \ - clang-format-3.8 \ - lcov diff --git a/.ci/docker/ubuntu-bionic b/.ci/docker/ubuntu-bionic index d692a21a6a922..b174e92ff3bd2 100644 --- a/.ci/docker/ubuntu-bionic +++ b/.ci/docker/ubuntu-bionic @@ -25,5 +25,5 @@ RUN apt-get install -y \ liburdfdom-dev \ liburdfdom-headers-dev \ libopenscenegraph-dev \ - clang-format-3.8 \ + # clang-format-3.8 \ # Disable until higher version is supported lcov diff --git a/.ci/script.sh b/.ci/script.sh index 813050375daa7..cc8cf8a6c3036 100755 --- a/.ci/script.sh +++ b/.ci/script.sh @@ -6,7 +6,7 @@ if [ "$TRAVIS_PULL_REQUEST" = "false" ] && [ "$TRAVIS_OS_NAME" = "linux" ] && [ mkdir build && cd build cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DDART_VERBOSE=ON -DDART_TREAT_WARNINGS_AS_ERRORS=ON -DDART_CODECOV=$CODECOV .. if [ "$TRAVIS_OS_NAME" = "linux" ]; then make -j4 tutorials examples tests; else make -j4 tests; fi -if [ "$TRAVIS_OS_NAME" = "linux" ]; then make check-format; fi +if [ "$TRAVIS_OS_NAME" = "linux" ] && [ $(lsb_release -sc) = "trusty" ]; then make check-format; fi if [ $CODECOV = ON ]; then make -j4 codecov; else ctest --output-on-failure -j4; fi # Make sure we can install with no issues diff --git a/.travis.yml b/.travis.yml index ee3ac6abf0ca0..189b25bd418e7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,9 +24,6 @@ matrix: - os: linux env: DOCKER_FILE="ubuntu-xenial" BUILD_TYPE=Release CODECOV=OFF COMPILER=GCC services: docker - - os: linux - env: DOCKER_FILE="ubuntu-artful" BUILD_TYPE=Release CODECOV=OFF COMPILER=GCC - services: docker - os: linux env: DOCKER_FILE="ubuntu-bionic" BUILD_TYPE=Release CODECOV=OFF COMPILER=GCC services: docker