Merge remote-tracking branch 'origin/master' into grey/markers

Conflicts: dart/dynamics/BodyNode.cpp dart/dynamics/BodyNode.h dart/dynamics/Skeleton.cpp dart/dynamics/Skeleton.h
dartsim · Apr 24, 2016 · a3d24ac · a3d24ac
2 parents bc7fe49 + cda180e
commit a3d24ac
Show file tree

Hide file tree

Showing 506 changed files with 4,318 additions and 3,903 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -13,8 +13,8 @@ compiler:
   - clang
 
 env:
-  - BUILD_TYPE=Debug   COVERALLS=ON
-  - BUILD_TYPE=Release COVERALLS=OFF
+  - BUILD_TYPE=Debug   TREAT_WARNINGS_AS_ERRORS=ON COVERALLS=ON
+  - BUILD_TYPE=Release TREAT_WARNINGS_AS_ERRORS=ON COVERALLS=OFF
 
 matrix:
   exclude:
@@ -27,7 +27,7 @@ install:
 
 script:
   - mkdir build && cd build
-  - cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DDART_COVERALLS=$COVERALLS ..
+  - cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DDART_TREAT_WARNINGS_AS_ERRORS=$TREAT_WARNINGS_AS_ERRORS -DDART_COVERALLS=$COVERALLS ..
   - make -j4 all tutorials examples tests test
   - if [ $COVERALLS = ON ] && [ "$TRAVIS_OS_NAME" = "linux" ]; then make -j4 coveralls; fi
 

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -72,6 +72,7 @@ endif()
 option(DART_BUILD_GUI_OSG "Build osgDart library" ON)
 option(DART_COVERALLS "Turn on coveralls support" OFF)
 option(DART_COVERALLS_UPLOAD "Upload the generated coveralls json" ON)
+option(DART_TREAT_WARNINGS_AS_ERRORS "Treat warnings as errors" OFF)
 
 if(DART_COVERALLS)
   include(Coveralls)
@@ -141,13 +142,19 @@ if(MSVC)
   if(MSVC_VERSION VERSION_LESS 1900)
     message(FATAL_ERROR "${PROJECT_NAME} requires VS 2015 or greater.")
   endif()
+  if(DART_TREAT_WARNINGS_AS_ERRORS)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /WX")
+  endif()
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP4")
   set(CMAKE_EXE_LINKER_FLAGS_RELEASE "/LTCG /INCREMENTAL:NO")
   if(NOT DART_MSVC_DEFAULT_OPTIONS)
     set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${DART_RUNTIME_LIBRARY}d /Zi /Gy /W1 /EHsc")
     set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} ${DART_RUNTIME_LIBRARY} /Zi /GL /Gy /W1 /EHsc /arch:SSE2")
   endif(NOT DART_MSVC_DEFAULT_OPTIONS)
 elseif(CMAKE_COMPILER_IS_GNUCXX)
+  if(DART_TREAT_WARNINGS_AS_ERRORS)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
+  endif()
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -msse2 -fPIC")
   execute_process(
     COMMAND ${CMAKE_CXX_COMPILER} -dumpversion OUTPUT_VARIABLE GCC_VERSION)
@@ -162,6 +169,11 @@ elseif(CMAKE_COMPILER_IS_GNUCXX)
   set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELEASE} ${CMAKE_CXX_FLAGS_DEBUG}")
   set(CMAKE_CXX_FLAGS_PROFILE "${CMAKE_CXX_FLAGS_DEBUG} -pg")
 elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+  if(DART_TREAT_WARNINGS_AS_ERRORS)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -Wno-error=deprecated-declarations")
+    # Turn warning "deprecated-declarations" into an warning even if -Werror is
+    # specified until we abandon glut.
+  endif()
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse2 -fPIC")
   execute_process(
     COMMAND ${CMAKE_CXX_COMPILER} -dumpversion OUTPUT_VARIABLE CLANG_VERSION)
@@ -267,7 +279,7 @@ endfunction(dart_add_unittest)
 #===============================================================================
 
 add_subdirectory(dart)
-add_subdirectory(apps EXCLUDE_FROM_ALL)
+add_subdirectory(examples EXCLUDE_FROM_ALL)
 add_subdirectory(tutorials EXCLUDE_FROM_ALL)
 
 # Add a "tutorials" target to build tutorials.

diff --git a/LICENSE b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2011-2015, Georgia Tech Research Corporation
+Copyright (c) 2011-2016, Georgia Tech Research Corporation
 All rights reserved.
 
 Georgia Tech Graphics Lab and Humanoid Robotics Lab
@@ -28,4 +28,4 @@ This file is provided under the following "BSD-style" License:
   AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
   LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
   ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-  POSSIBILITY OF SUCH DAMAGE.
+  POSSIBILITY OF SUCH DAMAGE.
diff --git a/apps/addDeleteSkels/CMakeLists.txt b/apps/addDeleteSkels/CMakeLists.txt
diff --git a/apps/atlasSimbicon/CMakeLists.txt b/apps/atlasSimbicon/CMakeLists.txt
diff --git a/apps/bipedStand/CMakeLists.txt b/apps/bipedStand/CMakeLists.txt
diff --git a/apps/hardcodedDesign/CMakeLists.txt b/apps/hardcodedDesign/CMakeLists.txt
diff --git a/apps/hybridDynamics/CMakeLists.txt b/apps/hybridDynamics/CMakeLists.txt
diff --git a/apps/jointConstraints/CMakeLists.txt b/apps/jointConstraints/CMakeLists.txt
diff --git a/apps/mixedChain/CMakeLists.txt b/apps/mixedChain/CMakeLists.txt
diff --git a/apps/operationalSpaceControl/CMakeLists.txt b/apps/operationalSpaceControl/CMakeLists.txt
diff --git a/apps/rigidChain/CMakeLists.txt b/apps/rigidChain/CMakeLists.txt
diff --git a/apps/rigidCubes/CMakeLists.txt b/apps/rigidCubes/CMakeLists.txt
diff --git a/apps/rigidLoop/CMakeLists.txt b/apps/rigidLoop/CMakeLists.txt
diff --git a/apps/rigidShapes/CMakeLists.txt b/apps/rigidShapes/CMakeLists.txt
diff --git a/apps/simpleFrames/CMakeLists.txt b/apps/simpleFrames/CMakeLists.txt
diff --git a/apps/softBodies/CMakeLists.txt b/apps/softBodies/CMakeLists.txt
diff --git a/apps/speedTest/CMakeLists.txt b/apps/speedTest/CMakeLists.txt
diff --git a/apps/vehicle/CMakeLists.txt b/apps/vehicle/CMakeLists.txt
diff --git a/cmake/FindASSIMP.cmake b/cmake/FindASSIMP.cmake
@@ -1,4 +1,4 @@
-# Copyright (c) 2015, Georgia Tech Graphics Lab and Humanoid Robotics Lab
+# Copyright (c) 2015-2016, Georgia Tech Graphics Lab and Humanoid Robotics Lab
 # This file is provided under the "BSD-style" License
 
 # Find ASSIMP

diff --git a/cmake/FindCCD.cmake b/cmake/FindCCD.cmake
@@ -1,4 +1,4 @@
-# Copyright (c) 2015, Georgia Tech Graphics Lab and Humanoid Robotics Lab
+# Copyright (c) 2015-2016, Georgia Tech Graphics Lab and Humanoid Robotics Lab
 # This file is provided under the "BSD-style" License
 
 # Find CCD

diff --git a/cmake/FindEIGEN3.cmake b/cmake/FindEIGEN3.cmake
@@ -1,4 +1,4 @@
-# Copyright (c) 2015, Georgia Tech Graphics Lab and Humanoid Robotics Lab
+# Copyright (c) 2015-2016, Georgia Tech Graphics Lab and Humanoid Robotics Lab
 # This file is provided under the "BSD-style" License
 
 # Find Eigen

diff --git a/cmake/FindFCL.cmake b/cmake/FindFCL.cmake
@@ -1,4 +1,4 @@
-# Copyright (c) 2015, Georgia Tech Graphics Lab and Humanoid Robotics Lab
+# Copyright (c) 2015-2016, Georgia Tech Graphics Lab and Humanoid Robotics Lab
 # This file is provided under the "BSD-style" License
 
 # Find FCL

diff --git a/cmake/FindFLANN.cmake b/cmake/FindFLANN.cmake
@@ -1,4 +1,4 @@
-# Copyright (c) 2015, Georgia Tech Graphics Lab and Humanoid Robotics Lab
+# Copyright (c) 2015-2016, Georgia Tech Graphics Lab and Humanoid Robotics Lab
 # This file is provided under the "BSD-style" License
 
 # Find FLANN

diff --git a/cmake/FindIPOPT.cmake b/cmake/FindIPOPT.cmake
@@ -1,4 +1,4 @@
-# Copyright (c) 2015, Georgia Tech Graphics Lab and Humanoid Robotics Lab
+# Copyright (c) 2015-2016, Georgia Tech Graphics Lab and Humanoid Robotics Lab
 # This file is provided under the "BSD-style" License
 
 # Find IPOPT

diff --git a/cmake/FindNLOPT.cmake b/cmake/FindNLOPT.cmake
@@ -1,4 +1,4 @@
-# Copyright (c) 2015, Georgia Tech Graphics Lab and Humanoid Robotics Lab
+# Copyright (c) 2015-2016, Georgia Tech Graphics Lab and Humanoid Robotics Lab
 # This file is provided under the "BSD-style" License
 
 # Find NLOPT

diff --git a/cmake/FindSHARK.cmake b/cmake/FindSHARK.cmake
@@ -1,4 +1,4 @@
-# Copyright (c) 2015, Georgia Tech Graphics Lab and Humanoid Robotics Lab
+# Copyright (c) 2015-2016, Georgia Tech Graphics Lab and Humanoid Robotics Lab
 # This file is provided under the "BSD-style" License
 
 # Find SHARK

diff --git a/cmake/FindTINYXML.cmake b/cmake/FindTINYXML.cmake
@@ -1,4 +1,4 @@
-# Copyright (c) 2015, Georgia Tech Graphics Lab and Humanoid Robotics Lab
+# Copyright (c) 2015-2016, Georgia Tech Graphics Lab and Humanoid Robotics Lab
 # This file is provided under the "BSD-style" License
 
 # Find TINYXML

diff --git a/cmake/FindTINYXML2.cmake b/cmake/FindTINYXML2.cmake
@@ -1,4 +1,4 @@
-# Copyright (c) 2015, Georgia Tech Graphics Lab and Humanoid Robotics Lab
+# Copyright (c) 2015-2016, Georgia Tech Graphics Lab and Humanoid Robotics Lab
 # This file is provided under the "BSD-style" License
 
 # Find TINYXML2

diff --git a/dart/CMakeLists.txt b/dart/CMakeLists.txt
@@ -1,6 +1,6 @@
 # Enable multi-threaded compilation.
-# We do this here and not in the root folder since the example apps
-# do not have enough source files to benefit from this.
+# We do this here and not in the root folder since the examples and the
+# tutorials do not have enough source files to benefit from this.
 if(MSVC)
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP")
 endif()

diff --git a/dart/collision/CollisionDetector.cpp b/dart/collision/CollisionDetector.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2015, Georgia Tech Research Corporation
+ * Copyright (c) 2013-2016, Georgia Tech Research Corporation
  * All rights reserved.
  *
  * Author(s): Jeongseok Lee <[email protected]>,

diff --git a/dart/collision/CollisionDetector.h b/dart/collision/CollisionDetector.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2015, Georgia Tech Research Corporation
+ * Copyright (c) 2013-2016, Georgia Tech Research Corporation
  * All rights reserved.
  *
  * Author(s): Jeongseok Lee <[email protected]>,

diff --git a/dart/collision/CollisionGroup.cpp b/dart/collision/CollisionGroup.cpp
@@ -149,7 +149,7 @@ bool CollisionGroup::hasShapeFrame(
 }
 
 //==============================================================================
-size_t CollisionGroup::getNumShapeFrames() const
+std::size_t CollisionGroup::getNumShapeFrames() const
 {
   return mShapeFrameMap.size();
 }

diff --git a/dart/collision/CollisionGroup.h b/dart/collision/CollisionGroup.h
@@ -166,7 +166,7 @@ class CollisionGroup
   bool hasShapeFrame(const dynamics::ShapeFrame* shapeFrame) const;
 
   /// Return number of ShapeFrames added to this CollisionGroup
-  size_t getNumShapeFrames() const;
+  std::size_t getNumShapeFrames() const;
 
   /// Perform collision detection within this CollisionGroup.
   bool collide(const CollisionOption& option, CollisionResult& result);

diff --git a/dart/collision/Option.cpp b/dart/collision/Option.cpp
@@ -43,7 +43,7 @@ namespace collision {
 CollisionOption::CollisionOption(
     bool enableContact,
     bool binaryCheck,
-    size_t maxNumContacts,
+    std::size_t maxNumContacts,
     const std::shared_ptr<CollisionFilter>& collisionFilter)
   : enableContact(enableContact),
     binaryCheck(binaryCheck),

diff --git a/dart/collision/Option.h b/dart/collision/Option.h
@@ -57,15 +57,15 @@ struct CollisionOption
   bool binaryCheck;
 
   /// Maximum number of contacts to detect
-  size_t maxNumContacts;
+  std::size_t maxNumContacts;
 
   /// CollisionFilter
   std::shared_ptr<CollisionFilter> collisionFilter;
 
   /// Constructor
   CollisionOption(bool enableContact = true,
          bool binaryCheck = false,
-         size_t maxNumContacts = 100,
+         std::size_t maxNumContacts = 100,
          const std::shared_ptr<CollisionFilter>& collisionFilter = nullptr);
 };
 

diff --git a/dart/collision/Result.cpp b/dart/collision/Result.cpp
@@ -53,21 +53,21 @@ void CollisionResult::addContact(const Contact& contact)
 }
 
 //==============================================================================
-size_t CollisionResult::getNumContacts() const
+std::size_t CollisionResult::getNumContacts() const
 {
   return mContacts.size();
 }
 
 //==============================================================================
-Contact& CollisionResult::getContact(size_t index)
+Contact& CollisionResult::getContact(std::size_t index)
 {
   assert(index < mContacts.size());
 
   return mContacts[index];
 }
 
 //==============================================================================
-const Contact& CollisionResult::getContact(size_t index) const
+const Contact& CollisionResult::getContact(std::size_t index) const
 {
   assert(index < mContacts.size());
 

diff --git a/dart/collision/Result.h b/dart/collision/Result.h
@@ -60,13 +60,13 @@ class CollisionResult
   void addContact(const Contact& contact);
 
   /// Return number of contacts
-  size_t getNumContacts() const;
+  std::size_t getNumContacts() const;
 
   /// Return the index-th contact
-  Contact& getContact(size_t index);
+  Contact& getContact(std::size_t index);
 
   /// Return (const) the index-th contact
-  const Contact& getContact(size_t index) const;
+  const Contact& getContact(std::size_t index) const;
 
   /// Return contacts
   const std::vector<Contact>& getContacts() const;

diff --git a/dart/collision/bullet/BulletCollisionDetector.cpp b/dart/collision/bullet/BulletCollisionDetector.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2015, Georgia Tech Research Corporation
+ * Copyright (c) 2014-2016, Georgia Tech Research Corporation
  * All rights reserved.
  *
  * Author(s): Jeongseok Lee <[email protected]>