diff --git a/dart/collision/CollisionDetector.cpp b/dart/collision/CollisionDetector.cpp index e5677850f8706..12881ca0c537f 100644 --- a/dart/collision/CollisionDetector.cpp +++ b/dart/collision/CollisionDetector.cpp @@ -32,14 +32,14 @@ #include "dart/collision/CollisionDetector.hpp" -#include - #include "dart/collision/CollisionGroup.hpp" #include "dart/collision/CollisionObject.hpp" #include "dart/common/Console.hpp" #include "dart/dynamics/BodyNode.hpp" #include "dart/dynamics/Skeleton.hpp" +#include + namespace dart { namespace collision { diff --git a/dart/collision/CollisionDetector.hpp b/dart/collision/CollisionDetector.hpp index 4cb6ab35c6c5f..cd6a9c9596fc4 100644 --- a/dart/collision/CollisionDetector.hpp +++ b/dart/collision/CollisionDetector.hpp @@ -33,11 +33,6 @@ #ifndef DART_COLLISION_COLLISIONDETECTOR_HPP_ #define DART_COLLISION_COLLISIONDETECTOR_HPP_ -#include -#include - -#include - #include "dart/collision/CollisionOption.hpp" #include "dart/collision/CollisionResult.hpp" #include "dart/collision/Contact.hpp" @@ -49,6 +44,11 @@ #include "dart/common/Factory.hpp" #include "dart/dynamics/SmartPointer.hpp" +#include + +#include +#include + namespace dart { namespace collision { diff --git a/dart/collision/CollisionGroup.cpp b/dart/collision/CollisionGroup.cpp index ccc829ccf3706..63f50606c0d9f 100644 --- a/dart/collision/CollisionGroup.cpp +++ b/dart/collision/CollisionGroup.cpp @@ -32,13 +32,13 @@ #include "dart/collision/CollisionGroup.hpp" -#include - #include "dart/collision/CollisionDetector.hpp" #include "dart/collision/CollisionObject.hpp" #include "dart/dynamics/BodyNode.hpp" #include "dart/dynamics/Skeleton.hpp" +#include + namespace dart { namespace collision { diff --git a/dart/collision/CollisionGroup.hpp b/dart/collision/CollisionGroup.hpp index 5a3df9d51d3e7..edf3939aa2ab8 100644 --- a/dart/collision/CollisionGroup.hpp +++ b/dart/collision/CollisionGroup.hpp @@ -33,10 +33,6 @@ #ifndef DART_COLLISION_COLLISIONGROUP_HPP_ #define DART_COLLISION_COLLISIONGROUP_HPP_ -#include -#include -#include - #include "dart/collision/CollisionOption.hpp" #include "dart/collision/CollisionResult.hpp" #include "dart/collision/DistanceOption.hpp" @@ -47,6 +43,10 @@ #include "dart/common/Observer.hpp" #include "dart/dynamics/SmartPointer.hpp" +#include +#include +#include + namespace dart { namespace collision { diff --git a/dart/collision/CollisionObject.hpp b/dart/collision/CollisionObject.hpp index 8c658c1ca4d90..e5eb9cfcf2e02 100644 --- a/dart/collision/CollisionObject.hpp +++ b/dart/collision/CollisionObject.hpp @@ -33,11 +33,11 @@ #ifndef DART_COLLISION_COLLISIONOBJECT_HPP_ #define DART_COLLISION_COLLISIONOBJECT_HPP_ -#include - #include "dart/collision/SmartPointer.hpp" #include "dart/dynamics/SmartPointer.hpp" +#include + namespace dart { namespace collision { diff --git a/dart/collision/CollisionOption.hpp b/dart/collision/CollisionOption.hpp index e13274f70bd33..176b195db645b 100644 --- a/dart/collision/CollisionOption.hpp +++ b/dart/collision/CollisionOption.hpp @@ -33,9 +33,10 @@ #ifndef DART_COLLISION_COLLISIONOPTION_HPP_ #define DART_COLLISION_COLLISIONOPTION_HPP_ -#include #include +#include + namespace dart { namespace collision { diff --git a/dart/collision/CollisionResult.hpp b/dart/collision/CollisionResult.hpp index 1fa1ce7804d3a..aa631fe5d6c6e 100644 --- a/dart/collision/CollisionResult.hpp +++ b/dart/collision/CollisionResult.hpp @@ -33,11 +33,11 @@ #ifndef DART_COLLISION_COLLISIONRESULT_HPP_ #define DART_COLLISION_COLLISIONRESULT_HPP_ +#include "dart/collision/Contact.hpp" + #include #include -#include "dart/collision/Contact.hpp" - namespace dart { namespace dynamics { diff --git a/dart/collision/Contact.hpp b/dart/collision/Contact.hpp index 3306fb6515f41..27de99ffde452 100644 --- a/dart/collision/Contact.hpp +++ b/dart/collision/Contact.hpp @@ -33,11 +33,11 @@ #ifndef DART_COLLISION_CONTACT_HPP_ #define DART_COLLISION_CONTACT_HPP_ -#include - #include "dart/collision/SmartPointer.hpp" #include "dart/dynamics/SmartPointer.hpp" +#include + namespace dart { namespace collision { diff --git a/dart/collision/DistanceOption.hpp b/dart/collision/DistanceOption.hpp index 91608fadfb9a1..508a619126494 100644 --- a/dart/collision/DistanceOption.hpp +++ b/dart/collision/DistanceOption.hpp @@ -33,9 +33,10 @@ #ifndef DART_COLLISION_DISTANCE_OPTION_HPP_ #define DART_COLLISION_DISTANCE_OPTION_HPP_ -#include #include +#include + namespace dart { namespace collision { diff --git a/dart/collision/RaycastOption.hpp b/dart/collision/RaycastOption.hpp index 7257525969041..838eca4495c21 100644 --- a/dart/collision/RaycastOption.hpp +++ b/dart/collision/RaycastOption.hpp @@ -33,9 +33,10 @@ #ifndef DART_COLLISION_RAYCASTOPTION_HPP_ #define DART_COLLISION_RAYCASTOPTION_HPP_ -#include #include +#include + namespace dart { namespace collision { diff --git a/dart/collision/RaycastResult.hpp b/dart/collision/RaycastResult.hpp index 7c564600e97f6..3e29712646f13 100644 --- a/dart/collision/RaycastResult.hpp +++ b/dart/collision/RaycastResult.hpp @@ -33,10 +33,10 @@ #ifndef DART_COLLISION_RAYCASTRESULT_HPP_ #define DART_COLLISION_RAYCASTRESULT_HPP_ -#include - #include +#include + namespace dart { namespace collision { diff --git a/dart/collision/bullet/BulletCollisionDetector.cpp b/dart/collision/bullet/BulletCollisionDetector.cpp index 6391d1e05b625..eceababd781a5 100644 --- a/dart/collision/bullet/BulletCollisionDetector.cpp +++ b/dart/collision/bullet/BulletCollisionDetector.cpp @@ -32,8 +32,6 @@ #include "dart/collision/bullet/BulletCollisionDetector.hpp" -#include - #include "dart/collision/CollisionFilter.hpp" #include "dart/collision/CollisionObject.hpp" #include "dart/collision/bullet/BulletCollisionGroup.hpp" @@ -57,6 +55,8 @@ #include "dart/dynamics/SoftMeshShape.hpp" #include "dart/dynamics/SphereShape.hpp" +#include + namespace dart { namespace collision { diff --git a/dart/collision/bullet/BulletCollisionDetector.hpp b/dart/collision/bullet/BulletCollisionDetector.hpp index 6440b595c1b14..adc463245ec63 100644 --- a/dart/collision/bullet/BulletCollisionDetector.hpp +++ b/dart/collision/bullet/BulletCollisionDetector.hpp @@ -33,15 +33,15 @@ #ifndef DART_COLLISION_BULLET_BULLETCOLLISIONDETECTOR_HPP_ #define DART_COLLISION_BULLET_BULLETCOLLISIONDETECTOR_HPP_ -#include - -#include - #include "dart/collision/CollisionDetector.hpp" #include "dart/collision/bullet/BulletCollisionGroup.hpp" #include "dart/collision/bullet/BulletCollisionShape.hpp" #include "dart/collision/bullet/BulletInclude.hpp" +#include + +#include + namespace dart { namespace collision { diff --git a/dart/collision/bullet/BulletCollisionShape.hpp b/dart/collision/bullet/BulletCollisionShape.hpp index 5c30e5f44f43a..4dbf555bb6a9e 100644 --- a/dart/collision/bullet/BulletCollisionShape.hpp +++ b/dart/collision/bullet/BulletCollisionShape.hpp @@ -33,10 +33,10 @@ #ifndef DART_COLLISION_BULLET_BULLETCOLLISIONSHAPE_HPP_ #define DART_COLLISION_BULLET_BULLETCOLLISIONSHAPE_HPP_ -#include - #include "dart/collision/bullet/BulletInclude.hpp" +#include + namespace dart { namespace collision { diff --git a/dart/collision/dart/DARTCollide.cpp b/dart/collision/dart/DARTCollide.cpp index 182275fd40e7d..3d81d13c24b3d 100644 --- a/dart/collision/dart/DARTCollide.cpp +++ b/dart/collision/dart/DARTCollide.cpp @@ -32,8 +32,6 @@ #include "dart/collision/dart/DARTCollide.hpp" -#include - #include "dart/collision/CollisionObject.hpp" #include "dart/dynamics/BodyNode.hpp" #include "dart/dynamics/BoxShape.hpp" @@ -42,6 +40,8 @@ #include "dart/dynamics/SphereShape.hpp" #include "dart/math/Helpers.hpp" +#include + namespace dart { namespace collision { diff --git a/dart/collision/dart/DARTCollide.hpp b/dart/collision/dart/DARTCollide.hpp index 7dab465782196..3895bbc514297 100644 --- a/dart/collision/dart/DARTCollide.hpp +++ b/dart/collision/dart/DARTCollide.hpp @@ -33,11 +33,11 @@ #ifndef DART_COLLISION_DART_DARTCOLLIDE_HPP_ #define DART_COLLISION_DART_DARTCOLLIDE_HPP_ -#include +#include "dart/collision/CollisionDetector.hpp" #include -#include "dart/collision/CollisionDetector.hpp" +#include namespace dart { namespace collision { diff --git a/dart/collision/dart/DARTCollisionDetector.hpp b/dart/collision/dart/DARTCollisionDetector.hpp index c3dc42508bf61..6934e60bffb2d 100644 --- a/dart/collision/dart/DARTCollisionDetector.hpp +++ b/dart/collision/dart/DARTCollisionDetector.hpp @@ -33,10 +33,10 @@ #ifndef DART_COLLISION_DART_DARTCOLLISIONDETECTOR_HPP_ #define DART_COLLISION_DART_DARTCOLLISIONDETECTOR_HPP_ -#include - #include "dart/collision/CollisionDetector.hpp" +#include + namespace dart { namespace collision { diff --git a/dart/collision/dart/DARTCollisionObject.hpp b/dart/collision/dart/DARTCollisionObject.hpp index f501549fdcc83..7472877e62705 100644 --- a/dart/collision/dart/DARTCollisionObject.hpp +++ b/dart/collision/dart/DARTCollisionObject.hpp @@ -33,10 +33,10 @@ #ifndef DART_COLLISION_DART_DARTCOLLISIONOBJECT_HPP_ #define DART_COLLISION_DART_DARTCOLLISIONOBJECT_HPP_ -#include - #include "dart/collision/CollisionObject.hpp" +#include + namespace dart { namespace collision { diff --git a/dart/collision/fcl/BackwardCompatibility.hpp b/dart/collision/fcl/BackwardCompatibility.hpp index 250ea74e66b00..45cfd6c80576a 100644 --- a/dart/collision/fcl/BackwardCompatibility.hpp +++ b/dart/collision/fcl/BackwardCompatibility.hpp @@ -33,11 +33,11 @@ #ifndef DART_COLLISION_FCL_BACKWARDCOMPATIBILITY_HPP_ #define DART_COLLISION_FCL_BACKWARDCOMPATIBILITY_HPP_ -#include - #include "dart/common/Deprecated.hpp" #include "dart/config.hpp" +#include + // clang-format off #define FCL_VERSION_AT_LEAST(x,y,z) \ (FCL_MAJOR_VERSION > x || (FCL_MAJOR_VERSION >= x && \ diff --git a/dart/collision/fcl/CollisionShapes.hpp b/dart/collision/fcl/CollisionShapes.hpp index c34d4eff44cbc..68af41db3384c 100644 --- a/dart/collision/fcl/CollisionShapes.hpp +++ b/dart/collision/fcl/CollisionShapes.hpp @@ -33,12 +33,12 @@ #ifndef DART_COLLISION_FCL_MESH_COLLISIONSHAPES_HPP_ #define DART_COLLISION_FCL_MESH_COLLISIONSHAPES_HPP_ -#include +#include "dart/collision/fcl/BackwardCompatibility.hpp" +#include "dart/math/Constants.hpp" #include -#include "dart/collision/fcl/BackwardCompatibility.hpp" -#include "dart/math/Constants.hpp" +#include namespace dart { namespace collision { diff --git a/dart/collision/fcl/FCLCollisionDetector.cpp b/dart/collision/fcl/FCLCollisionDetector.cpp index ca2ab2dfee4d4..8c20f535b95fe 100644 --- a/dart/collision/fcl/FCLCollisionDetector.cpp +++ b/dart/collision/fcl/FCLCollisionDetector.cpp @@ -32,8 +32,6 @@ #include "dart/collision/fcl/FCLCollisionDetector.hpp" -#include - #include "dart/collision/CollisionFilter.hpp" #include "dart/collision/CollisionObject.hpp" #include "dart/collision/DistanceFilter.hpp" @@ -55,6 +53,8 @@ #include "dart/dynamics/SphereShape.hpp" #include "dart/dynamics/VoxelGridShape.hpp" +#include + namespace dart { namespace collision { diff --git a/dart/collision/fcl/FCLCollisionDetector.hpp b/dart/collision/fcl/FCLCollisionDetector.hpp index 0c77d91ff1850..3f10d87a6813d 100644 --- a/dart/collision/fcl/FCLCollisionDetector.hpp +++ b/dart/collision/fcl/FCLCollisionDetector.hpp @@ -33,11 +33,11 @@ #ifndef DART_COLLISION_FCL_FCLCOLLISIONDETECTOR_HPP_ #define DART_COLLISION_FCL_FCLCOLLISIONDETECTOR_HPP_ -#include - #include "dart/collision/CollisionDetector.hpp" #include "dart/collision/fcl/FCLTypes.hpp" +#include + namespace dart { namespace collision { diff --git a/dart/collision/fcl/FCLTypes.hpp b/dart/collision/fcl/FCLTypes.hpp index 27c85b111bb64..3a4fd91bf4774 100644 --- a/dart/collision/fcl/FCLTypes.hpp +++ b/dart/collision/fcl/FCLTypes.hpp @@ -33,10 +33,10 @@ #ifndef DART_COLLISION_FCL_FCLTTYPES_HPP_ #define DART_COLLISION_FCL_FCLTTYPES_HPP_ -#include - #include "dart/collision/fcl/BackwardCompatibility.hpp" +#include + namespace dart { namespace collision { diff --git a/dart/collision/ode/OdeCollisionDetector.cpp b/dart/collision/ode/OdeCollisionDetector.cpp index 8ee2a0678e3b4..3493e821751aa 100644 --- a/dart/collision/ode/OdeCollisionDetector.cpp +++ b/dart/collision/ode/OdeCollisionDetector.cpp @@ -32,8 +32,6 @@ #include "dart/collision/ode/OdeCollisionDetector.hpp" -#include - #include "dart/collision/CollisionFilter.hpp" #include "dart/collision/ode/OdeCollisionGroup.hpp" #include "dart/collision/ode/OdeCollisionObject.hpp" @@ -49,6 +47,8 @@ #include "dart/dynamics/SoftMeshShape.hpp" #include "dart/dynamics/SphereShape.hpp" +#include + namespace dart { namespace collision { diff --git a/dart/collision/ode/OdeCollisionDetector.hpp b/dart/collision/ode/OdeCollisionDetector.hpp index 8f0b2e95c8ee3..704fa052dd346 100644 --- a/dart/collision/ode/OdeCollisionDetector.hpp +++ b/dart/collision/ode/OdeCollisionDetector.hpp @@ -33,10 +33,10 @@ #ifndef DART_COLLISION_ODE_ODECOLLISIONDETECTOR_HPP_ #define DART_COLLISION_ODE_ODECOLLISIONDETECTOR_HPP_ -#include - #include "dart/collision/CollisionDetector.hpp" +#include + #define MAX_COLLIDE_RETURNS 250 namespace dart { diff --git a/dart/collision/ode/OdeCollisionGroup.hpp b/dart/collision/ode/OdeCollisionGroup.hpp index 3ad92b230d9fe..b78678598d42c 100644 --- a/dart/collision/ode/OdeCollisionGroup.hpp +++ b/dart/collision/ode/OdeCollisionGroup.hpp @@ -33,10 +33,10 @@ #ifndef DART_COLLISION_ODE_ODECOLLISIONGROUP_HPP_ #define DART_COLLISION_ODE_ODECOLLISIONGROUP_HPP_ -#include - #include "dart/collision/CollisionGroup.hpp" +#include + namespace dart { namespace collision { diff --git a/dart/collision/ode/OdeCollisionObject.cpp b/dart/collision/ode/OdeCollisionObject.cpp index 46be45688d59e..6e18b98236dc0 100644 --- a/dart/collision/ode/OdeCollisionObject.cpp +++ b/dart/collision/ode/OdeCollisionObject.cpp @@ -32,8 +32,6 @@ #include "dart/collision/ode/OdeCollisionObject.hpp" -#include - #include "dart/collision/ode/OdeTypes.hpp" #include "dart/collision/ode/detail/OdeBox.hpp" #include "dart/collision/ode/detail/OdeCapsule.hpp" @@ -54,6 +52,8 @@ #include "dart/dynamics/SoftMeshShape.hpp" #include "dart/dynamics/SphereShape.hpp" +#include + namespace dart { namespace collision { diff --git a/dart/collision/ode/OdeCollisionObject.hpp b/dart/collision/ode/OdeCollisionObject.hpp index f6e64363cd5e2..caabad0a531d9 100644 --- a/dart/collision/ode/OdeCollisionObject.hpp +++ b/dart/collision/ode/OdeCollisionObject.hpp @@ -33,11 +33,11 @@ #ifndef DART_COLLISION_ODE_ODECOLLISIONOBJECT_HPP_ #define DART_COLLISION_ODE_ODECOLLISIONOBJECT_HPP_ -#include - #include "dart/collision/CollisionObject.hpp" #include "dart/collision/ode/OdeCollisionDetector.hpp" +#include + namespace dart { namespace collision { diff --git a/dart/collision/ode/detail/OdeBox.hpp b/dart/collision/ode/detail/OdeBox.hpp index 3738cdeb7d51a..9b09a1d5fbf4a 100644 --- a/dart/collision/ode/detail/OdeBox.hpp +++ b/dart/collision/ode/detail/OdeBox.hpp @@ -33,10 +33,10 @@ #ifndef DART_COLLISION_ODE_DETAIL_ODEBOX_HPP_ #define DART_COLLISION_ODE_DETAIL_ODEBOX_HPP_ -#include - #include "dart/collision/ode/detail/OdeGeom.hpp" +#include + namespace dart { namespace collision { namespace detail { diff --git a/dart/collision/ode/detail/OdeCapsule.hpp b/dart/collision/ode/detail/OdeCapsule.hpp index 4fdaf85e7c393..5673ea7f526cd 100644 --- a/dart/collision/ode/detail/OdeCapsule.hpp +++ b/dart/collision/ode/detail/OdeCapsule.hpp @@ -33,10 +33,10 @@ #ifndef DART_COLLISION_ODE_DETAIL_ODECAPSULE_HPP_ #define DART_COLLISION_ODE_DETAIL_ODECAPSULE_HPP_ -#include - #include "dart/collision/ode/detail/OdeGeom.hpp" +#include + namespace dart { namespace collision { namespace detail { diff --git a/dart/collision/ode/detail/OdeCylinder.hpp b/dart/collision/ode/detail/OdeCylinder.hpp index 01943b67733a2..989b41a30245c 100644 --- a/dart/collision/ode/detail/OdeCylinder.hpp +++ b/dart/collision/ode/detail/OdeCylinder.hpp @@ -33,10 +33,10 @@ #ifndef DART_COLLISION_ODE_DETAIL_ODECYLINDER_HPP_ #define DART_COLLISION_ODE_DETAIL_ODECYLINDER_HPP_ -#include - #include "dart/collision/ode/detail/OdeGeom.hpp" +#include + namespace dart { namespace collision { namespace detail { diff --git a/dart/collision/ode/detail/OdeGeom.hpp b/dart/collision/ode/detail/OdeGeom.hpp index 33f0c27710846..0fa1921775349 100644 --- a/dart/collision/ode/detail/OdeGeom.hpp +++ b/dart/collision/ode/detail/OdeGeom.hpp @@ -33,11 +33,11 @@ #ifndef DART_COLLISION_ODE_DETAIL_ODEGEOM_HPP_ #define DART_COLLISION_ODE_DETAIL_ODEGEOM_HPP_ -#include - #include "dart/collision/ode/OdeCollisionDetector.hpp" #include "dart/collision/ode/OdeCollisionObject.hpp" +#include + namespace dart { namespace collision { namespace detail { diff --git a/dart/collision/ode/detail/OdeHeightmap-impl.hpp b/dart/collision/ode/detail/OdeHeightmap-impl.hpp index 591ae672366fd..4429fed15bfa2 100644 --- a/dart/collision/ode/detail/OdeHeightmap-impl.hpp +++ b/dart/collision/ode/detail/OdeHeightmap-impl.hpp @@ -30,11 +30,11 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include - #include "dart/collision/ode/detail/OdeHeightmap.hpp" #include "dart/dynamics/HeightmapShape.hpp" +#include + namespace dart { namespace collision { namespace detail { diff --git a/dart/collision/ode/detail/OdeHeightmap.hpp b/dart/collision/ode/detail/OdeHeightmap.hpp index feef7a3d359ac..b483dfd768f8f 100644 --- a/dart/collision/ode/detail/OdeHeightmap.hpp +++ b/dart/collision/ode/detail/OdeHeightmap.hpp @@ -33,11 +33,11 @@ #ifndef DART_COLLISION_ODE_DETAIL_ODEHEIGHTMAP_HPP_ #define DART_COLLISION_ODE_DETAIL_ODEHEIGHTMAP_HPP_ -#include - #include "dart/collision/ode/detail/OdeGeom.hpp" #include "dart/dynamics/HeightmapShape.hpp" +#include + namespace dart { namespace collision { namespace detail { diff --git a/dart/collision/ode/detail/OdeMesh.hpp b/dart/collision/ode/detail/OdeMesh.hpp index 4b3219bf3e940..d1ffd14bc10fe 100644 --- a/dart/collision/ode/detail/OdeMesh.hpp +++ b/dart/collision/ode/detail/OdeMesh.hpp @@ -33,11 +33,11 @@ #ifndef DART_COLLISION_ODE_DETAIL_ODEMESH_HPP_ #define DART_COLLISION_ODE_DETAIL_ODEMESH_HPP_ +#include "dart/collision/ode/detail/OdeGeom.hpp" + #include #include -#include "dart/collision/ode/detail/OdeGeom.hpp" - namespace dart { namespace collision { namespace detail { diff --git a/dart/collision/ode/detail/OdePlane.hpp b/dart/collision/ode/detail/OdePlane.hpp index ce45c174843fe..19a1bf18fec49 100644 --- a/dart/collision/ode/detail/OdePlane.hpp +++ b/dart/collision/ode/detail/OdePlane.hpp @@ -33,10 +33,10 @@ #ifndef DART_COLLISION_ODE_DETAIL_ODEPLANE_HPP_ #define DART_COLLISION_ODE_DETAIL_ODEPLANE_HPP_ -#include - #include "dart/collision/ode/detail/OdeGeom.hpp" +#include + namespace dart { namespace collision { namespace detail { diff --git a/dart/collision/ode/detail/OdeSphere.hpp b/dart/collision/ode/detail/OdeSphere.hpp index 338819190cb12..0f91f8bf77331 100644 --- a/dart/collision/ode/detail/OdeSphere.hpp +++ b/dart/collision/ode/detail/OdeSphere.hpp @@ -33,10 +33,10 @@ #ifndef DART_COLLISION_ODE_DETAIL_ODESPHERE_HPP_ #define DART_COLLISION_ODE_DETAIL_ODESPHERE_HPP_ -#include - #include "dart/collision/ode/detail/OdeGeom.hpp" +#include + namespace dart { namespace collision { namespace detail { diff --git a/dart/common/Aspect.cpp b/dart/common/Aspect.cpp index e676f25b6d74f..e3db96a957320 100644 --- a/dart/common/Aspect.cpp +++ b/dart/common/Aspect.cpp @@ -32,11 +32,12 @@ #include "dart/common/Aspect.hpp" -#include +#include "dart/common/Console.hpp" + #include #include -#include "dart/common/Console.hpp" +#include namespace dart { namespace common { diff --git a/dart/common/Aspect.hpp b/dart/common/Aspect.hpp index cc0e9a0b68247..78587a4db0fd5 100644 --- a/dart/common/Aspect.hpp +++ b/dart/common/Aspect.hpp @@ -33,12 +33,12 @@ #ifndef DART_COMMON_ASPECT_HPP_ #define DART_COMMON_ASPECT_HPP_ -#include - #include "dart/common/ClassWithVirtualBase.hpp" #include "dart/common/Cloneable.hpp" #include "dart/common/detail/NoOp.hpp" +#include + namespace dart { namespace common { diff --git a/dart/common/Cloneable.hpp b/dart/common/Cloneable.hpp index 179ec111aa29a..dceb83a9856d7 100644 --- a/dart/common/Cloneable.hpp +++ b/dart/common/Cloneable.hpp @@ -33,11 +33,11 @@ #ifndef DART_COMMON_CLONEABLE_HPP_ #define DART_COMMON_CLONEABLE_HPP_ +#include "dart/common/Memory.hpp" + #include #include -#include "dart/common/Memory.hpp" - namespace dart { namespace common { diff --git a/dart/common/Composite.cpp b/dart/common/Composite.cpp index 20c1eba9b907d..17569a2013141 100644 --- a/dart/common/Composite.cpp +++ b/dart/common/Composite.cpp @@ -32,10 +32,11 @@ #include "dart/common/Composite.hpp" -#include +#include "dart/common/Console.hpp" + #include -#include "dart/common/Console.hpp" +#include namespace dart { namespace common { diff --git a/dart/common/Factory.hpp b/dart/common/Factory.hpp index cdc78dd2ae1de..cc918da9936ad 100644 --- a/dart/common/Factory.hpp +++ b/dart/common/Factory.hpp @@ -33,14 +33,14 @@ #ifndef DART_COMMON_FACTORY_HPP_ #define DART_COMMON_FACTORY_HPP_ +#include "dart/common/Singleton.hpp" +#include "dart/common/StlHelpers.hpp" + #include #include #include #include -#include "dart/common/Singleton.hpp" -#include "dart/common/StlHelpers.hpp" - namespace dart { namespace common { diff --git a/dart/common/FreeListAllocator.hpp b/dart/common/FreeListAllocator.hpp index a8316b3f3f5ff..7ec4a34e57315 100644 --- a/dart/common/FreeListAllocator.hpp +++ b/dart/common/FreeListAllocator.hpp @@ -33,11 +33,11 @@ #ifndef DART_COMMON_FREELISTALLOCATOR_HPP_ #define DART_COMMON_FREELISTALLOCATOR_HPP_ -#include - #include "dart/common/MemoryAllocator.hpp" #include "dart/common/MemoryAllocatorDebugger.hpp" +#include + namespace dart::common { /// Most general heap memory allocator for allocating memory of various sizes. diff --git a/dart/common/LocalResource.cpp b/dart/common/LocalResource.cpp index 78d4cbc0f5ea1..f0c8779801bac 100644 --- a/dart/common/LocalResource.cpp +++ b/dart/common/LocalResource.cpp @@ -32,11 +32,12 @@ #include "LocalResource.hpp" -#include +#include "dart/common/Console.hpp" + #include #include -#include "dart/common/Console.hpp" +#include namespace dart { namespace common { diff --git a/dart/common/LocalResourceRetriever.cpp b/dart/common/LocalResourceRetriever.cpp index 8efc9b7a23106..03df7741c04eb 100644 --- a/dart/common/LocalResourceRetriever.cpp +++ b/dart/common/LocalResourceRetriever.cpp @@ -32,13 +32,13 @@ #include "dart/common/LocalResourceRetriever.hpp" -#include -#include - #include "dart/common/Console.hpp" #include "dart/common/LocalResource.hpp" #include "dart/common/Uri.hpp" +#include +#include + namespace dart { namespace common { diff --git a/dart/common/Macros.hpp b/dart/common/Macros.hpp index de33f810ac800..1aced5388bc7d 100644 --- a/dart/common/Macros.hpp +++ b/dart/common/Macros.hpp @@ -33,10 +33,10 @@ #ifndef DART_COMMON_MACROS_HPP_ #define DART_COMMON_MACROS_HPP_ -#include - #include "dart/common/Logging.hpp" +#include + // DART_NUM_ARGS( [, [, ...]]) #define DETAIL_DART_NUM_ARGS(z, a, b, c, d, e, f, cnt, ...) cnt #define DART_NUM_ARGS(...) \ diff --git a/dart/common/Memory.hpp b/dart/common/Memory.hpp index 7cb4cd02f8f3b..db77316c97c55 100644 --- a/dart/common/Memory.hpp +++ b/dart/common/Memory.hpp @@ -33,14 +33,14 @@ #ifndef DART_COMMON_MEMORY_HPP_ #define DART_COMMON_MEMORY_HPP_ -#include -#include -#include - #include "dart/common/Deprecated.hpp" #include "dart/common/detail/AlignedAllocator.hpp" #include "dart/config.hpp" +#include +#include +#include + namespace dart { namespace common { diff --git a/dart/common/MemoryAllocator.hpp b/dart/common/MemoryAllocator.hpp index 4424cdcd11307..805f3c49b7e6d 100644 --- a/dart/common/MemoryAllocator.hpp +++ b/dart/common/MemoryAllocator.hpp @@ -33,11 +33,12 @@ #ifndef DART_COMMON_MEMORYALLOCATOR_HPP_ #define DART_COMMON_MEMORYALLOCATOR_HPP_ -#include +#include "dart/common/Castable.hpp" + #include #include -#include "dart/common/Castable.hpp" +#include namespace dart::common { diff --git a/dart/common/MemoryAllocatorDebugger.hpp b/dart/common/MemoryAllocatorDebugger.hpp index 3355dae30d2a7..4b062d0794377 100644 --- a/dart/common/MemoryAllocatorDebugger.hpp +++ b/dart/common/MemoryAllocatorDebugger.hpp @@ -33,12 +33,12 @@ #ifndef DART_COMMON_MEMORYALLOCATORDEBUGGER_HPP_ #define DART_COMMON_MEMORYALLOCATORDEBUGGER_HPP_ +#include "dart/common/MemoryAllocator.hpp" + #include #include #include -#include "dart/common/MemoryAllocator.hpp" - namespace dart::common { template diff --git a/dart/common/MemoryManager.hpp b/dart/common/MemoryManager.hpp index 6e6afa74b3c94..c6ec170cca8fa 100644 --- a/dart/common/MemoryManager.hpp +++ b/dart/common/MemoryManager.hpp @@ -36,11 +36,11 @@ #ifndef NDEBUG #include #endif -#include - #include "dart/common/FreeListAllocator.hpp" #include "dart/common/PoolAllocator.hpp" +#include + namespace dart::common { /// A composite memory allocator that contains various memory allocators that diff --git a/dart/common/PoolAllocator.cpp b/dart/common/PoolAllocator.cpp index 48b53c550bab8..b1cc6a2e837cd 100644 --- a/dart/common/PoolAllocator.cpp +++ b/dart/common/PoolAllocator.cpp @@ -32,12 +32,12 @@ #include "dart/common/PoolAllocator.hpp" -#include - #include "dart/common/Console.hpp" #include "dart/common/Logging.hpp" #include "dart/common/Macros.hpp" +#include + namespace dart::common { //============================================================================== diff --git a/dart/common/PoolAllocator.hpp b/dart/common/PoolAllocator.hpp index 1bbcaaf6bc284..72b082f71acbe 100644 --- a/dart/common/PoolAllocator.hpp +++ b/dart/common/PoolAllocator.hpp @@ -33,12 +33,12 @@ #ifndef DART_COMMON_POOLALLOCATOR_HPP_ #define DART_COMMON_POOLALLOCATOR_HPP_ -#include -#include - #include "dart/common/MemoryAllocator.hpp" #include "dart/common/MemoryAllocatorDebugger.hpp" +#include +#include + namespace dart::common { /// Memory allocator optimized for allocating many objects of the same or diff --git a/dart/common/Resource.cpp b/dart/common/Resource.cpp index 82a9ba19a790d..87ef00954d004 100644 --- a/dart/common/Resource.cpp +++ b/dart/common/Resource.cpp @@ -32,11 +32,11 @@ #include "dart/common/Resource.hpp" +#include "dart/common/Console.hpp" + #include #include -#include "dart/common/Console.hpp" - namespace dart { namespace common { diff --git a/dart/common/Resource.hpp b/dart/common/Resource.hpp index 9266aed2aea4f..12014c7ed6ca5 100644 --- a/dart/common/Resource.hpp +++ b/dart/common/Resource.hpp @@ -33,10 +33,11 @@ #ifndef DART_COMMON_RESOURCE_HPP_ #define DART_COMMON_RESOURCE_HPP_ -#include #include #include +#include + namespace dart { namespace common { diff --git a/dart/common/ResourceRetriever.cpp b/dart/common/ResourceRetriever.cpp index bcd741dad586a..d9ea65314fe6e 100644 --- a/dart/common/ResourceRetriever.cpp +++ b/dart/common/ResourceRetriever.cpp @@ -32,10 +32,10 @@ #include "dart/common/ResourceRetriever.hpp" -#include - #include "dart/common/Console.hpp" +#include + namespace dart { namespace common { diff --git a/dart/common/ResourceRetriever.hpp b/dart/common/ResourceRetriever.hpp index 2cbd16009c8bb..62e4ce06b9971 100644 --- a/dart/common/ResourceRetriever.hpp +++ b/dart/common/ResourceRetriever.hpp @@ -33,12 +33,12 @@ #ifndef DART_COMMON_RESOURCERETRIEVER_HPP_ #define DART_COMMON_RESOURCERETRIEVER_HPP_ -#include -#include - #include "dart/common/Resource.hpp" #include "dart/common/Uri.hpp" +#include +#include + namespace dart { namespace common { diff --git a/dart/common/SharedLibrary.hpp b/dart/common/SharedLibrary.hpp index db2eedcfe168d..36a314d843198 100644 --- a/dart/common/SharedLibrary.hpp +++ b/dart/common/SharedLibrary.hpp @@ -33,13 +33,13 @@ #ifndef DART_COMMON_SHAREDLIBRARY_HPP_ #define DART_COMMON_SHAREDLIBRARY_HPP_ -#include -#include - #include "dart/common/Deprecated.hpp" #include "dart/common/Filesystem.hpp" #include "dart/common/Platform.hpp" +#include +#include + #if DART_OS_LINUX #define DYNLIB_HANDLE void* diff --git a/dart/common/Signal.hpp b/dart/common/Signal.hpp index b3c6f26ea171c..14f7b53c25e0a 100644 --- a/dart/common/Signal.hpp +++ b/dart/common/Signal.hpp @@ -33,13 +33,13 @@ #ifndef DART_COMMON_SIGNAL_HPP_ #define DART_COMMON_SIGNAL_HPP_ +#include "dart/common/Deprecated.hpp" +#include "dart/common/detail/ConnectionBody.hpp" + #include #include #include -#include "dart/common/Deprecated.hpp" -#include "dart/common/detail/ConnectionBody.hpp" - namespace dart { namespace common { diff --git a/dart/common/StlAllocator.hpp b/dart/common/StlAllocator.hpp index c59757647efe3..4c3ac2b5872d2 100644 --- a/dart/common/StlAllocator.hpp +++ b/dart/common/StlAllocator.hpp @@ -33,10 +33,10 @@ #ifndef DART_COMMON_STLALLOCATOR_HPP_ #define DART_COMMON_STLALLOCATOR_HPP_ -#include - #include "dart/common/MemoryAllocator.hpp" +#include + namespace dart::common { /// Wrapper class for MemoryAllocator to be compatible with std::allocator diff --git a/dart/common/StlHelpers.hpp b/dart/common/StlHelpers.hpp index 9701b058b87ab..15214ba6fd4e1 100644 --- a/dart/common/StlHelpers.hpp +++ b/dart/common/StlHelpers.hpp @@ -33,11 +33,12 @@ #ifndef DART_COMMON_STLHELPERS_HPP_ #define DART_COMMON_STLHELPERS_HPP_ -#include -#include +#include "dart/common/Memory.hpp" + #include -#include "dart/common/Memory.hpp" +#include +#include namespace dart { namespace common { diff --git a/dart/common/Timer.cpp b/dart/common/Timer.cpp index 9cf15a4fe7d09..dd088ee75802d 100644 --- a/dart/common/Timer.cpp +++ b/dart/common/Timer.cpp @@ -32,10 +32,11 @@ #include "dart/common/Timer.hpp" -#include #include #include +#include + // #if defined _WIN64 || defined _WIN32 // #define CLOCKS_PER_SEC 1000 // #endif diff --git a/dart/common/Uri.cpp b/dart/common/Uri.cpp index aad3e4e032071..ebae49cfbafa7 100644 --- a/dart/common/Uri.cpp +++ b/dart/common/Uri.cpp @@ -32,11 +32,12 @@ #include "dart/common/Uri.hpp" -#include +#include "dart/common/Console.hpp" + #include #include -#include "dart/common/Console.hpp" +#include static bool startsWith(const std::string& _target, const std::string& _prefix) { diff --git a/dart/common/VersionCounter.cpp b/dart/common/VersionCounter.cpp index 4ed0318a478a3..30a6858ba7340 100644 --- a/dart/common/VersionCounter.cpp +++ b/dart/common/VersionCounter.cpp @@ -32,10 +32,11 @@ #include "dart/common/VersionCounter.hpp" -#include +#include "dart/common/Console.hpp" + #include -#include "dart/common/Console.hpp" +#include namespace dart { namespace common { diff --git a/dart/common/detail/AlignedAllocator.hpp b/dart/common/detail/AlignedAllocator.hpp index 9a4720c4dda61..d68597df66029 100644 --- a/dart/common/detail/AlignedAllocator.hpp +++ b/dart/common/detail/AlignedAllocator.hpp @@ -33,11 +33,11 @@ #ifndef DART_COMMON_DETAIL_ALIGNEDALLOCATOR_HPP_ #define DART_COMMON_DETAIL_ALIGNEDALLOCATOR_HPP_ -#include +#include "dart/config.hpp" #include -#include "dart/config.hpp" +#include namespace dart { namespace common { diff --git a/dart/common/detail/Aspect.hpp b/dart/common/detail/Aspect.hpp index 6aff88acc5eb5..da447d304491b 100644 --- a/dart/common/detail/Aspect.hpp +++ b/dart/common/detail/Aspect.hpp @@ -33,12 +33,12 @@ #ifndef DART_COMMON_DETAIL_ASPECT_HPP_ #define DART_COMMON_DETAIL_ASPECT_HPP_ -#include - #include "dart/common/Aspect.hpp" #include "dart/common/Console.hpp" #include "dart/common/Macros.hpp" +#include + namespace dart { namespace common { diff --git a/dart/common/detail/CompositeData.hpp b/dart/common/detail/CompositeData.hpp index cc976ac060181..c1e8faa25cf7e 100644 --- a/dart/common/detail/CompositeData.hpp +++ b/dart/common/detail/CompositeData.hpp @@ -33,15 +33,15 @@ #ifndef DART_COMMON_DETAIL_COMPOSITEDATA_HPP_ #define DART_COMMON_DETAIL_COMPOSITEDATA_HPP_ +#include "dart/common/Aspect.hpp" + +#include + #include #include #include #include -#include - -#include "dart/common/Aspect.hpp" - namespace dart { namespace common { namespace detail { diff --git a/dart/common/detail/Memory-impl.hpp b/dart/common/detail/Memory-impl.hpp index b1fe0d42cb7f3..c588f5f5bf060 100644 --- a/dart/common/detail/Memory-impl.hpp +++ b/dart/common/detail/Memory-impl.hpp @@ -33,11 +33,11 @@ #ifndef DART_COMMON_DETAIL_MEMORY_IMPL_HPP_ #define DART_COMMON_DETAIL_MEMORY_IMPL_HPP_ -#include +#include "dart/config.hpp" #include -#include "dart/config.hpp" +#include #if EIGEN_VERSION_AT_LEAST(3, 2, 1) && EIGEN_VERSION_AT_MOST(3, 2, 8) #include "dart/common/detail/AlignedAllocator.hpp" diff --git a/dart/common/detail/Metaprogramming-impl.hpp b/dart/common/detail/Metaprogramming-impl.hpp index 397b9fc590411..88ba1d1581bd5 100644 --- a/dart/common/detail/Metaprogramming-impl.hpp +++ b/dart/common/detail/Metaprogramming-impl.hpp @@ -33,10 +33,10 @@ #ifndef DART_COMMON_DETAIL_METAPROGRAMMING_HPP_ #define DART_COMMON_DETAIL_METAPROGRAMMING_HPP_ -#include - #include "dart/common/Metaprogramming.hpp" +#include + namespace dart::common::detail { // Inspired by https://stackoverflow.com/a/6324863/3122234 diff --git a/dart/common/detail/NameManager.hpp b/dart/common/detail/NameManager.hpp index 5c8e423c6b9f3..d86f0bbb5f369 100644 --- a/dart/common/detail/NameManager.hpp +++ b/dart/common/detail/NameManager.hpp @@ -33,12 +33,13 @@ #ifndef DART_COMMON_DETAIL_NAMEMANAGER_HPP_ #define DART_COMMON_DETAIL_NAMEMANAGER_HPP_ -#include -#include - #include "dart/common/Console.hpp" #include "dart/common/NameManager.hpp" +#include + +#include + namespace dart { namespace common { diff --git a/dart/common/detail/SharedLibraryManager.cpp b/dart/common/detail/SharedLibraryManager.cpp index 519e385e81c69..f16fe6549f5ad 100644 --- a/dart/common/detail/SharedLibraryManager.cpp +++ b/dart/common/detail/SharedLibraryManager.cpp @@ -32,11 +32,11 @@ #include "dart/common/detail/SharedLibraryManager.hpp" -#include - #include "dart/common/Console.hpp" #include "dart/common/SharedLibrary.hpp" +#include + namespace dart { namespace common { namespace detail { diff --git a/dart/common/detail/SharedLibraryManager.hpp b/dart/common/detail/SharedLibraryManager.hpp index 99226c138cadc..1071845bfd842 100644 --- a/dart/common/detail/SharedLibraryManager.hpp +++ b/dart/common/detail/SharedLibraryManager.hpp @@ -33,14 +33,14 @@ #ifndef DART_COMMON_DETAIL_SHAREDLIBRARYMANAGER_HPP_ #define DART_COMMON_DETAIL_SHAREDLIBRARYMANAGER_HPP_ -#include -#include -#include - #include "dart/common/Deprecated.hpp" #include "dart/common/Filesystem.hpp" #include "dart/common/Singleton.hpp" +#include +#include +#include + namespace dart { namespace common { diff --git a/dart/common/detail/Singleton-impl.hpp b/dart/common/detail/Singleton-impl.hpp index c137384a5a29c..db617ffcef88d 100644 --- a/dart/common/detail/Singleton-impl.hpp +++ b/dart/common/detail/Singleton-impl.hpp @@ -33,10 +33,10 @@ #ifndef DART_COMMON_DETAIL_SINGLETON_HPP_ #define DART_COMMON_DETAIL_SINGLETON_HPP_ -#include - #include "dart/common/Singleton.hpp" +#include + namespace dart { namespace common { diff --git a/dart/constraint/BallJointConstraint.cpp b/dart/constraint/BallJointConstraint.cpp index 3eaba21f62eef..0d2936d336421 100644 --- a/dart/constraint/BallJointConstraint.cpp +++ b/dart/constraint/BallJointConstraint.cpp @@ -31,12 +31,12 @@ */ #include "dart/constraint/BallJointConstraint.hpp" -#include - #include "dart/dynamics/BodyNode.hpp" #include "dart/dynamics/Skeleton.hpp" #include "dart/external/odelcpsolver/lcp.h" +#include + namespace dart { namespace constraint { diff --git a/dart/constraint/BallJointConstraint.hpp b/dart/constraint/BallJointConstraint.hpp index ed7afe9cbe9ba..6fdc17c5db7bc 100644 --- a/dart/constraint/BallJointConstraint.hpp +++ b/dart/constraint/BallJointConstraint.hpp @@ -33,11 +33,11 @@ #ifndef DART_CONSTRAINT_BALLJOINTCONSTRAINT_HPP_ #define DART_CONSTRAINT_BALLJOINTCONSTRAINT_HPP_ -#include - #include "dart/constraint/DynamicJointConstraint.hpp" #include "dart/math/MathTypes.hpp" +#include + namespace dart { namespace constraint { diff --git a/dart/constraint/BoxedLcpSolver.hpp b/dart/constraint/BoxedLcpSolver.hpp index 74a907bb4c3f0..fabb9ce13eb17 100644 --- a/dart/constraint/BoxedLcpSolver.hpp +++ b/dart/constraint/BoxedLcpSolver.hpp @@ -33,11 +33,11 @@ #ifndef DART_CONSTRAINT_BOXEDLCPSOLVER_HPP_ #define DART_CONSTRAINT_BOXEDLCPSOLVER_HPP_ -#include +#include "dart/common/Castable.hpp" #include -#include "dart/common/Castable.hpp" +#include namespace dart { namespace constraint { diff --git a/dart/constraint/ConstrainedGroup.cpp b/dart/constraint/ConstrainedGroup.cpp index 09e0d6519d99e..aeaa1965caa9d 100644 --- a/dart/constraint/ConstrainedGroup.cpp +++ b/dart/constraint/ConstrainedGroup.cpp @@ -32,14 +32,14 @@ #include "dart/constraint/ConstrainedGroup.hpp" -#include -#include -#include - #include "dart/common/Console.hpp" #include "dart/constraint/ConstraintBase.hpp" #include "dart/constraint/ConstraintSolver.hpp" +#include +#include +#include + namespace dart { namespace constraint { diff --git a/dart/constraint/ConstrainedGroup.hpp b/dart/constraint/ConstrainedGroup.hpp index bee7dfe0aceaf..4e863a66d6e82 100644 --- a/dart/constraint/ConstrainedGroup.hpp +++ b/dart/constraint/ConstrainedGroup.hpp @@ -33,12 +33,12 @@ #ifndef DART_CONSTRAINT_CONSTRAINEDGROUP_HPP_ #define DART_CONSTRAINT_CONSTRAINEDGROUP_HPP_ -#include -#include +#include "dart/constraint/SmartPointer.hpp" #include -#include "dart/constraint/SmartPointer.hpp" +#include +#include namespace dart { diff --git a/dart/constraint/ConstraintBase.hpp b/dart/constraint/ConstraintBase.hpp index f89c352ae140a..7c1182e9fbec2 100644 --- a/dart/constraint/ConstraintBase.hpp +++ b/dart/constraint/ConstraintBase.hpp @@ -33,10 +33,10 @@ #ifndef DART_CONSTRAINT_CONSTRAINTBASE_HPP_ #define DART_CONSTRAINT_CONSTRAINTBASE_HPP_ -#include - #include "dart/dynamics/SmartPointer.hpp" +#include + namespace dart { namespace dynamics { diff --git a/dart/constraint/ConstraintSolver.cpp b/dart/constraint/ConstraintSolver.cpp index ff0808b877e61..b9a757abbc3ab 100644 --- a/dart/constraint/ConstraintSolver.cpp +++ b/dart/constraint/ConstraintSolver.cpp @@ -32,8 +32,6 @@ #include "dart/constraint/ConstraintSolver.hpp" -#include - #include "dart/collision/CollisionFilter.hpp" #include "dart/collision/CollisionGroup.hpp" #include "dart/collision/CollisionObject.hpp" @@ -55,6 +53,8 @@ #include "dart/dynamics/Skeleton.hpp" #include "dart/dynamics/SoftBodyNode.hpp" +#include + namespace dart { namespace constraint { diff --git a/dart/constraint/ConstraintSolver.hpp b/dart/constraint/ConstraintSolver.hpp index f0c41f4635ecf..c2a99fad103e8 100644 --- a/dart/constraint/ConstraintSolver.hpp +++ b/dart/constraint/ConstraintSolver.hpp @@ -33,16 +33,16 @@ #ifndef DART_CONSTRAINT_CONSTRAINTSOVER_HPP_ #define DART_CONSTRAINT_CONSTRAINTSOVER_HPP_ -#include - -#include - #include "dart/collision/CollisionDetector.hpp" #include "dart/common/Deprecated.hpp" #include "dart/constraint/ConstrainedGroup.hpp" #include "dart/constraint/ConstraintBase.hpp" #include "dart/constraint/SmartPointer.hpp" +#include + +#include + namespace dart { namespace dynamics { diff --git a/dart/constraint/ContactConstraint.cpp b/dart/constraint/ContactConstraint.cpp index 38da6ce0b0130..d91d1c8ba9f34 100644 --- a/dart/constraint/ContactConstraint.cpp +++ b/dart/constraint/ContactConstraint.cpp @@ -32,8 +32,6 @@ #include "dart/constraint/ContactConstraint.hpp" -#include - #include "dart/collision/CollisionObject.hpp" #include "dart/common/Console.hpp" #include "dart/dynamics/BodyNode.hpp" @@ -41,6 +39,8 @@ #include "dart/external/odelcpsolver/lcp.h" #include "dart/math/Helpers.hpp" +#include + #define DART_EPSILON 1e-6 #define DART_ERROR_ALLOWANCE 0.0 #define DART_ERP 0.01 diff --git a/dart/constraint/ContactSurface.cpp b/dart/constraint/ContactSurface.cpp index 3906f501f951b..1382e1afc0de9 100644 --- a/dart/constraint/ContactSurface.cpp +++ b/dart/constraint/ContactSurface.cpp @@ -32,13 +32,13 @@ #include "dart/constraint/ContactSurface.hpp" -#include - #include "dart/collision/CollisionObject.hpp" #include "dart/collision/Contact.hpp" #include "dart/constraint/ContactConstraint.hpp" #include "dart/constraint/ContactSurface.hpp" +#include + namespace dart { namespace constraint { diff --git a/dart/constraint/ContactSurface.hpp b/dart/constraint/ContactSurface.hpp index 5511664e7bdd3..8ce8d82f5f97b 100644 --- a/dart/constraint/ContactSurface.hpp +++ b/dart/constraint/ContactSurface.hpp @@ -33,12 +33,12 @@ #ifndef DART_CONSTRAINT_CONTACTSURFACE_HPP_ #define DART_CONSTRAINT_CONTACTSURFACE_HPP_ -#include - #include "dart/collision/Contact.hpp" #include "dart/constraint/SmartPointer.hpp" #include "dart/dynamics/ShapeNode.hpp" +#include + #define DART_RESTITUTION_COEFF_THRESHOLD 1e-3 #define DART_FRICTION_COEFF_THRESHOLD 1e-3 #define DART_BOUNCING_VELOCITY_THRESHOLD 1e-1 diff --git a/dart/constraint/DantzigLCPSolver.hpp b/dart/constraint/DantzigLCPSolver.hpp index 3ed84eb7b0538..9bc86dd8c5479 100644 --- a/dart/constraint/DantzigLCPSolver.hpp +++ b/dart/constraint/DantzigLCPSolver.hpp @@ -33,11 +33,11 @@ #ifndef DART_CONSTRAINT_DANTZIGLCPSOLVER_HPP_ #define DART_CONSTRAINT_DANTZIGLCPSOLVER_HPP_ -#include - #include "dart/config.hpp" #include "dart/constraint/LCPSolver.hpp" +#include + namespace dart { namespace constraint { diff --git a/dart/constraint/DynamicJointConstraint.cpp b/dart/constraint/DynamicJointConstraint.cpp index 94827b3930afa..1310b3ede70d3 100644 --- a/dart/constraint/DynamicJointConstraint.cpp +++ b/dart/constraint/DynamicJointConstraint.cpp @@ -32,10 +32,10 @@ #include "dart/constraint/DynamicJointConstraint.hpp" -#include - #include "dart/common/Console.hpp" +#include + #define DART_ERROR_ALLOWANCE 0.0 #define DART_ERP 0.01 #define DART_MAX_ERV 1e+1 diff --git a/dart/constraint/JointConstraint.cpp b/dart/constraint/JointConstraint.cpp index 405ac0dfa3ac9..7505968749a62 100644 --- a/dart/constraint/JointConstraint.cpp +++ b/dart/constraint/JointConstraint.cpp @@ -32,14 +32,14 @@ #include "dart/constraint/JointConstraint.hpp" -#include - #include "dart/common/Console.hpp" #include "dart/dynamics/BodyNode.hpp" #include "dart/dynamics/Joint.hpp" #include "dart/dynamics/Skeleton.hpp" #include "dart/external/odelcpsolver/lcp.h" +#include + #define DART_ERROR_ALLOWANCE 0.0 #define DART_ERP 0.01 #define DART_MAX_ERV 1e+1 diff --git a/dart/constraint/JointConstraint.hpp b/dart/constraint/JointConstraint.hpp index 1b6eca88a7ee4..35c4c5ccd3693 100644 --- a/dart/constraint/JointConstraint.hpp +++ b/dart/constraint/JointConstraint.hpp @@ -33,10 +33,10 @@ #ifndef DART_CONSTRAINT_JOINTCONSTRAINT_HPP_ #define DART_CONSTRAINT_JOINTCONSTRAINT_HPP_ -#include - #include "dart/constraint/ConstraintBase.hpp" +#include + namespace dart { namespace dynamics { diff --git a/dart/constraint/JointCoulombFrictionConstraint.cpp b/dart/constraint/JointCoulombFrictionConstraint.cpp index 358d80235e650..68a77b2371a3c 100644 --- a/dart/constraint/JointCoulombFrictionConstraint.cpp +++ b/dart/constraint/JointCoulombFrictionConstraint.cpp @@ -32,13 +32,13 @@ #include "dart/constraint/JointCoulombFrictionConstraint.hpp" -#include - #include "dart/common/Console.hpp" #include "dart/dynamics/BodyNode.hpp" #include "dart/dynamics/Joint.hpp" #include "dart/dynamics/Skeleton.hpp" +#include + #define DART_CFM 1e-9 namespace dart { diff --git a/dart/constraint/JointLimitConstraint.cpp b/dart/constraint/JointLimitConstraint.cpp index e0f78299c4492..da482c76e860f 100644 --- a/dart/constraint/JointLimitConstraint.cpp +++ b/dart/constraint/JointLimitConstraint.cpp @@ -32,14 +32,14 @@ #include "dart/constraint/JointLimitConstraint.hpp" -#include - #include "dart/common/Console.hpp" #include "dart/dynamics/BodyNode.hpp" #include "dart/dynamics/Joint.hpp" #include "dart/dynamics/Skeleton.hpp" #include "dart/external/odelcpsolver/lcp.h" +#include + #define DART_ERROR_ALLOWANCE 0.0 #define DART_ERP 0.01 #define DART_MAX_ERV 1e+1 diff --git a/dart/constraint/JointLimitConstraint.hpp b/dart/constraint/JointLimitConstraint.hpp index 37acc89632451..25b78c0408899 100644 --- a/dart/constraint/JointLimitConstraint.hpp +++ b/dart/constraint/JointLimitConstraint.hpp @@ -33,10 +33,10 @@ #ifndef DART_CONSTRAINT_JOINTLIMITCONSTRAINT_HPP_ #define DART_CONSTRAINT_JOINTLIMITCONSTRAINT_HPP_ -#include - #include "dart/constraint/ConstraintBase.hpp" +#include + namespace dart { namespace dynamics { diff --git a/dart/constraint/MimicMotorConstraint.cpp b/dart/constraint/MimicMotorConstraint.cpp index ba5871d6cf19f..a0c4128b81fc6 100644 --- a/dart/constraint/MimicMotorConstraint.cpp +++ b/dart/constraint/MimicMotorConstraint.cpp @@ -32,14 +32,14 @@ #include "dart/constraint/MimicMotorConstraint.hpp" -#include - #include "dart/common/Console.hpp" #include "dart/dynamics/BodyNode.hpp" #include "dart/dynamics/Joint.hpp" #include "dart/dynamics/Skeleton.hpp" #include "dart/external/odelcpsolver/lcp.h" +#include + #define DART_CFM 1e-9 namespace dart { diff --git a/dart/constraint/MimicMotorConstraint.hpp b/dart/constraint/MimicMotorConstraint.hpp index 280fd511cbb5a..3235331320f61 100644 --- a/dart/constraint/MimicMotorConstraint.hpp +++ b/dart/constraint/MimicMotorConstraint.hpp @@ -33,11 +33,11 @@ #ifndef DART_CONSTRAINT_MIMICMOTORCONSTRAINT_HPP_ #define DART_CONSTRAINT_MIMICMOTORCONSTRAINT_HPP_ -#include - #include "dart/constraint/ConstraintBase.hpp" #include "dart/dynamics/MimicDofProperties.hpp" +#include + namespace dart { namespace dynamics { diff --git a/dart/constraint/PGSLCPSolver.hpp b/dart/constraint/PGSLCPSolver.hpp index 1893ab4203130..c4cc04f4265d0 100644 --- a/dart/constraint/PGSLCPSolver.hpp +++ b/dart/constraint/PGSLCPSolver.hpp @@ -33,11 +33,11 @@ #ifndef DART_CONSTRAINT_PGSLCPSOLVER_HPP_ #define DART_CONSTRAINT_PGSLCPSOLVER_HPP_ -#include - #include "dart/config.hpp" #include "dart/constraint/LCPSolver.hpp" +#include + namespace dart { namespace constraint { diff --git a/dart/constraint/PgsBoxedLcpSolver.cpp b/dart/constraint/PgsBoxedLcpSolver.cpp index 8b33a76edbe8b..dd256d9c8b8da 100644 --- a/dart/constraint/PgsBoxedLcpSolver.cpp +++ b/dart/constraint/PgsBoxedLcpSolver.cpp @@ -32,15 +32,15 @@ #include "dart/constraint/PgsBoxedLcpSolver.hpp" -#include -#include - -#include - #include "dart/external/odelcpsolver/matrix.h" #include "dart/external/odelcpsolver/misc.h" #include "dart/math/Constants.hpp" +#include + +#include +#include + #define PGS_EPSILON 10e-9 namespace dart { diff --git a/dart/constraint/PgsBoxedLcpSolver.hpp b/dart/constraint/PgsBoxedLcpSolver.hpp index e0fe48132bcb0..ca2d06ed8741a 100644 --- a/dart/constraint/PgsBoxedLcpSolver.hpp +++ b/dart/constraint/PgsBoxedLcpSolver.hpp @@ -33,10 +33,10 @@ #ifndef DART_CONSTRAINT_PGSBOXEDLCPSOLVER_HPP_ #define DART_CONSTRAINT_PGSBOXEDLCPSOLVER_HPP_ -#include - #include "dart/constraint/BoxedLcpSolver.hpp" +#include + namespace dart { namespace constraint { diff --git a/dart/constraint/ServoMotorConstraint.cpp b/dart/constraint/ServoMotorConstraint.cpp index f071f4915ef1d..dfb9c807beff7 100644 --- a/dart/constraint/ServoMotorConstraint.cpp +++ b/dart/constraint/ServoMotorConstraint.cpp @@ -32,14 +32,14 @@ #include "dart/constraint/ServoMotorConstraint.hpp" -#include - #include "dart/common/Console.hpp" #include "dart/dynamics/BodyNode.hpp" #include "dart/dynamics/Joint.hpp" #include "dart/dynamics/Skeleton.hpp" #include "dart/external/odelcpsolver/lcp.h" +#include + #define DART_CFM 1e-9 namespace dart { diff --git a/dart/constraint/SoftContactConstraint.cpp b/dart/constraint/SoftContactConstraint.cpp index de040a8ab780c..a533856ba63fe 100644 --- a/dart/constraint/SoftContactConstraint.cpp +++ b/dart/constraint/SoftContactConstraint.cpp @@ -32,8 +32,6 @@ #include "dart/constraint/SoftContactConstraint.hpp" -#include - #include "dart/collision/CollisionObject.hpp" #include "dart/common/Console.hpp" #include "dart/dynamics/BodyNode.hpp" @@ -44,6 +42,8 @@ #include "dart/dynamics/SoftMeshShape.hpp" #include "dart/external/odelcpsolver/lcp.h" +#include + #define DART_EPSILON 1e-6 #define DART_ERROR_ALLOWANCE 0.0 #define DART_ERP 0.01 diff --git a/dart/constraint/WeldJointConstraint.hpp b/dart/constraint/WeldJointConstraint.hpp index f70aedd4873de..0048079564afd 100644 --- a/dart/constraint/WeldJointConstraint.hpp +++ b/dart/constraint/WeldJointConstraint.hpp @@ -33,11 +33,11 @@ #ifndef DART_CONSTRAINT_WELDJOINTCONSTRAINT_HPP_ #define DART_CONSTRAINT_WELDJOINTCONSTRAINT_HPP_ -#include - #include "dart/constraint/DynamicJointConstraint.hpp" #include "dart/math/MathTypes.hpp" +#include + namespace dart { namespace constraint { diff --git a/dart/dynamics/AssimpInputResourceAdaptor.cpp b/dart/dynamics/AssimpInputResourceAdaptor.cpp index d390c0c37c1d3..5928510ff9a88 100644 --- a/dart/dynamics/AssimpInputResourceAdaptor.cpp +++ b/dart/dynamics/AssimpInputResourceAdaptor.cpp @@ -32,12 +32,13 @@ #include "dart/dynamics/AssimpInputResourceAdaptor.hpp" -#include -#include +#include "dart/common/Console.hpp" #include -#include "dart/common/Console.hpp" +#include + +#include namespace dart { namespace dynamics { diff --git a/dart/dynamics/AssimpInputResourceAdaptor.hpp b/dart/dynamics/AssimpInputResourceAdaptor.hpp index d80f827327ae3..215f5b0d66396 100644 --- a/dart/dynamics/AssimpInputResourceAdaptor.hpp +++ b/dart/dynamics/AssimpInputResourceAdaptor.hpp @@ -33,13 +33,13 @@ #ifndef DART_DYNAMICS_ASSIMPINPUTRESOURCEADAPTOR_HPP_ #define DART_DYNAMICS_ASSIMPINPUTRESOURCEADAPTOR_HPP_ +#include "dart/common/Resource.hpp" +#include "dart/common/ResourceRetriever.hpp" + #include #include #include -#include "dart/common/Resource.hpp" -#include "dart/common/ResourceRetriever.hpp" - namespace dart { namespace dynamics { diff --git a/dart/dynamics/BallJoint.cpp b/dart/dynamics/BallJoint.cpp index 40f79b92f34fb..c707a786be609 100644 --- a/dart/dynamics/BallJoint.cpp +++ b/dart/dynamics/BallJoint.cpp @@ -32,12 +32,12 @@ #include "dart/dynamics/BallJoint.hpp" -#include - #include "dart/dynamics/DegreeOfFreedom.hpp" #include "dart/math/Geometry.hpp" #include "dart/math/Helpers.hpp" +#include + namespace dart { namespace dynamics { diff --git a/dart/dynamics/BallJoint.hpp b/dart/dynamics/BallJoint.hpp index 478353991d873..37b6da7ae77db 100644 --- a/dart/dynamics/BallJoint.hpp +++ b/dart/dynamics/BallJoint.hpp @@ -33,10 +33,10 @@ #ifndef DART_DYNAMICS_BALLJOINT_HPP_ #define DART_DYNAMICS_BALLJOINT_HPP_ -#include - #include "dart/dynamics/GenericJoint.hpp" +#include + namespace dart { namespace dynamics { diff --git a/dart/dynamics/BodyNode.cpp b/dart/dynamics/BodyNode.cpp index 8f3e8b05afa7b..472f76a541d19 100644 --- a/dart/dynamics/BodyNode.cpp +++ b/dart/dynamics/BodyNode.cpp @@ -32,10 +32,6 @@ #include "dart/dynamics/BodyNode.hpp" -#include -#include -#include - #include "dart/common/Console.hpp" #include "dart/common/StlHelpers.hpp" #include "dart/dynamics/Chain.hpp" @@ -47,6 +43,10 @@ #include "dart/dynamics/SoftBodyNode.hpp" #include "dart/math/Helpers.hpp" +#include +#include +#include + namespace dart { namespace dynamics { diff --git a/dart/dynamics/BodyNode.hpp b/dart/dynamics/BodyNode.hpp index ea83ff93e5ee9..8963b001569c3 100644 --- a/dart/dynamics/BodyNode.hpp +++ b/dart/dynamics/BodyNode.hpp @@ -33,12 +33,6 @@ #ifndef DART_DYNAMICS_BODYNODE_HPP_ #define DART_DYNAMICS_BODYNODE_HPP_ -#include -#include - -#include -#include - #include "dart/common/Deprecated.hpp" #include "dart/common/EmbeddedAspect.hpp" #include "dart/common/Signal.hpp" @@ -53,6 +47,12 @@ #include "dart/dynamics/detail/BodyNodeAspect.hpp" #include "dart/math/Geometry.hpp" +#include +#include + +#include +#include + namespace dart { namespace dynamics { diff --git a/dart/dynamics/CapsuleShape.cpp b/dart/dynamics/CapsuleShape.cpp index 3d9d6bcabb176..94f3dfd095fd7 100644 --- a/dart/dynamics/CapsuleShape.cpp +++ b/dart/dynamics/CapsuleShape.cpp @@ -32,12 +32,12 @@ #include "dart/dynamics/CapsuleShape.hpp" -#include - #include "dart/dynamics/CylinderShape.hpp" #include "dart/dynamics/SphereShape.hpp" #include "dart/math/Helpers.hpp" +#include + namespace dart { namespace dynamics { diff --git a/dart/dynamics/ConeShape.cpp b/dart/dynamics/ConeShape.cpp index d57c55d26af9a..de558032237e1 100644 --- a/dart/dynamics/ConeShape.cpp +++ b/dart/dynamics/ConeShape.cpp @@ -32,12 +32,12 @@ #include "dart/dynamics/ConeShape.hpp" -#include - #include "dart/dynamics/CylinderShape.hpp" #include "dart/dynamics/SphereShape.hpp" #include "dart/math/Helpers.hpp" +#include + namespace dart { namespace dynamics { diff --git a/dart/dynamics/CylinderShape.cpp b/dart/dynamics/CylinderShape.cpp index af1c52231771c..b2281e7b748cb 100644 --- a/dart/dynamics/CylinderShape.cpp +++ b/dart/dynamics/CylinderShape.cpp @@ -32,10 +32,10 @@ #include "dart/dynamics/CylinderShape.hpp" -#include - #include "dart/math/Helpers.hpp" +#include + namespace dart { namespace dynamics { diff --git a/dart/dynamics/DegreeOfFreedom.hpp b/dart/dynamics/DegreeOfFreedom.hpp index 275b718c17a1d..6f06193788054 100644 --- a/dart/dynamics/DegreeOfFreedom.hpp +++ b/dart/dynamics/DegreeOfFreedom.hpp @@ -33,15 +33,15 @@ #ifndef DART_DYNAMICS_DEGREEOFFREEDOM_HPP_ #define DART_DYNAMICS_DEGREEOFFREEDOM_HPP_ -#include -#include - -#include - #include "dart/common/ClassWithVirtualBase.hpp" #include "dart/common/Subject.hpp" #include "dart/dynamics/SmartPointer.hpp" +#include + +#include +#include + namespace dart { namespace dynamics { diff --git a/dart/dynamics/Entity.hpp b/dart/dynamics/Entity.hpp index e876f41fd67b9..ee0074efe1b92 100644 --- a/dart/dynamics/Entity.hpp +++ b/dart/dynamics/Entity.hpp @@ -33,17 +33,17 @@ #ifndef DART_DYNAMICS_ENTITY_HPP_ #define DART_DYNAMICS_ENTITY_HPP_ -#include -#include - -#include - #include "dart/common/Composite.hpp" #include "dart/common/Signal.hpp" #include "dart/common/Subject.hpp" #include "dart/dynamics/Shape.hpp" #include "dart/dynamics/SmartPointer.hpp" +#include + +#include +#include + namespace dart { namespace dynamics { diff --git a/dart/dynamics/EulerJoint.cpp b/dart/dynamics/EulerJoint.cpp index 84db3d8452a9c..c83676fb55ce4 100644 --- a/dart/dynamics/EulerJoint.cpp +++ b/dart/dynamics/EulerJoint.cpp @@ -32,12 +32,12 @@ #include "dart/dynamics/EulerJoint.hpp" -#include - #include "dart/common/Console.hpp" #include "dart/dynamics/DegreeOfFreedom.hpp" #include "dart/math/Geometry.hpp" +#include + namespace dart { namespace dynamics { diff --git a/dart/dynamics/Frame.hpp b/dart/dynamics/Frame.hpp index cc3f9bdede996..e144013ec101a 100644 --- a/dart/dynamics/Frame.hpp +++ b/dart/dynamics/Frame.hpp @@ -33,12 +33,12 @@ #ifndef DART_DYNAMICS_FRAME_HPP_ #define DART_DYNAMICS_FRAME_HPP_ -#include +#include "dart/dynamics/Entity.hpp" +#include "dart/math/MathTypes.hpp" #include -#include "dart/dynamics/Entity.hpp" -#include "dart/math/MathTypes.hpp" +#include namespace dart { namespace dynamics { diff --git a/dart/dynamics/FreeJoint.cpp b/dart/dynamics/FreeJoint.cpp index c384d9d588b95..d722accc0c608 100644 --- a/dart/dynamics/FreeJoint.cpp +++ b/dart/dynamics/FreeJoint.cpp @@ -32,12 +32,12 @@ #include "dart/dynamics/FreeJoint.hpp" -#include - #include "dart/dynamics/DegreeOfFreedom.hpp" #include "dart/math/Geometry.hpp" #include "dart/math/Helpers.hpp" +#include + namespace dart { namespace dynamics { diff --git a/dart/dynamics/FreeJoint.hpp b/dart/dynamics/FreeJoint.hpp index 12b43fadf8f4f..60b423f840497 100644 --- a/dart/dynamics/FreeJoint.hpp +++ b/dart/dynamics/FreeJoint.hpp @@ -33,12 +33,12 @@ #ifndef DART_DYNAMICS_FREEJOINT_HPP_ #define DART_DYNAMICS_FREEJOINT_HPP_ -#include +#include "dart/common/Deprecated.hpp" +#include "dart/dynamics/GenericJoint.hpp" #include -#include "dart/common/Deprecated.hpp" -#include "dart/dynamics/GenericJoint.hpp" +#include namespace dart { namespace dynamics { diff --git a/dart/dynamics/GenericJoint.hpp b/dart/dynamics/GenericJoint.hpp index 015a6785c593c..810333236aa99 100644 --- a/dart/dynamics/GenericJoint.hpp +++ b/dart/dynamics/GenericJoint.hpp @@ -33,11 +33,11 @@ #ifndef DART_DYNAMICS_GENERICJOINT_HPP_ #define DART_DYNAMICS_GENERICJOINT_HPP_ +#include "dart/dynamics/detail/GenericJointAspect.hpp" + #include #include -#include "dart/dynamics/detail/GenericJointAspect.hpp" - namespace dart { namespace dynamics { diff --git a/dart/dynamics/HierarchicalIK.hpp b/dart/dynamics/HierarchicalIK.hpp index 239ff5c76b304..284a75ee55daf 100644 --- a/dart/dynamics/HierarchicalIK.hpp +++ b/dart/dynamics/HierarchicalIK.hpp @@ -33,10 +33,10 @@ #ifndef DART_DYNAMICS_HIERARCHICALIK_HPP_ #define DART_DYNAMICS_HIERARCHICALIK_HPP_ -#include - #include "dart/dynamics/InverseKinematics.hpp" +#include + namespace dart { namespace dynamics { diff --git a/dart/dynamics/Inertia.hpp b/dart/dynamics/Inertia.hpp index 1ecad03c99701..57c72d53588c5 100644 --- a/dart/dynamics/Inertia.hpp +++ b/dart/dynamics/Inertia.hpp @@ -33,10 +33,10 @@ #ifndef DART_DYNAMICS_INERTIA_HPP_ #define DART_DYNAMICS_INERTIA_HPP_ -#include - #include "dart/math/MathTypes.hpp" +#include + namespace dart { namespace dynamics { diff --git a/dart/dynamics/InverseKinematics.hpp b/dart/dynamics/InverseKinematics.hpp index 0ac16f516cd1b..a300a95566e6a 100644 --- a/dart/dynamics/InverseKinematics.hpp +++ b/dart/dynamics/InverseKinematics.hpp @@ -33,11 +33,6 @@ #ifndef DART_DYNAMICS_INVERSEKINEMATICS_HPP_ #define DART_DYNAMICS_INVERSEKINEMATICS_HPP_ -#include -#include - -#include - #include "dart/common/Signal.hpp" #include "dart/common/Subject.hpp" #include "dart/common/sub_ptr.hpp" @@ -48,6 +43,11 @@ #include "dart/optimizer/Problem.hpp" #include "dart/optimizer/Solver.hpp" +#include + +#include +#include + namespace dart { namespace dynamics { diff --git a/dart/dynamics/JacobianNode.hpp b/dart/dynamics/JacobianNode.hpp index 07b6bc12c1f45..63a4d9a2304d3 100644 --- a/dart/dynamics/JacobianNode.hpp +++ b/dart/dynamics/JacobianNode.hpp @@ -33,13 +33,13 @@ #ifndef DART_DYNAMICS_JACOBIANNODE_HPP_ #define DART_DYNAMICS_JACOBIANNODE_HPP_ -#include -#include - #include "dart/dynamics/Frame.hpp" #include "dart/dynamics/Node.hpp" #include "dart/dynamics/SmartPointer.hpp" +#include +#include + namespace dart { namespace dynamics { diff --git a/dart/dynamics/Joint.cpp b/dart/dynamics/Joint.cpp index dd66c137af52b..422dd9269cf23 100644 --- a/dart/dynamics/Joint.cpp +++ b/dart/dynamics/Joint.cpp @@ -32,14 +32,14 @@ #include "dart/dynamics/Joint.hpp" -#include - #include "dart/common/Console.hpp" #include "dart/dynamics/BodyNode.hpp" #include "dart/dynamics/DegreeOfFreedom.hpp" #include "dart/dynamics/Skeleton.hpp" #include "dart/math/Helpers.hpp" +#include + namespace dart { namespace dynamics { diff --git a/dart/dynamics/Joint.hpp b/dart/dynamics/Joint.hpp index 2ee4f2cb595cb..a7f340ab17e66 100644 --- a/dart/dynamics/Joint.hpp +++ b/dart/dynamics/Joint.hpp @@ -33,10 +33,6 @@ #ifndef DART_DYNAMICS_JOINT_HPP_ #define DART_DYNAMICS_JOINT_HPP_ -#include -#include -#include - #include "dart/common/Deprecated.hpp" #include "dart/common/EmbeddedAspect.hpp" #include "dart/common/Subject.hpp" @@ -47,6 +43,10 @@ #include "dart/dynamics/detail/JointAspect.hpp" #include "dart/math/MathTypes.hpp" +#include +#include +#include + namespace dart { namespace dynamics { diff --git a/dart/dynamics/Linkage.cpp b/dart/dynamics/Linkage.cpp index f5f978603bbba..86597790869df 100644 --- a/dart/dynamics/Linkage.cpp +++ b/dart/dynamics/Linkage.cpp @@ -32,11 +32,11 @@ #include "dart/dynamics/Linkage.hpp" +#include "dart/dynamics/FreeJoint.hpp" + #include #include -#include "dart/dynamics/FreeJoint.hpp" - namespace dart { namespace dynamics { diff --git a/dart/dynamics/Linkage.hpp b/dart/dynamics/Linkage.hpp index aef11be2fc528..a4372b9456f1f 100644 --- a/dart/dynamics/Linkage.hpp +++ b/dart/dynamics/Linkage.hpp @@ -33,10 +33,10 @@ #ifndef DART_DYNAMICS_LINKAGE_HPP_ #define DART_DYNAMICS_LINKAGE_HPP_ -#include - #include "dart/dynamics/ReferentialSkeleton.hpp" +#include + namespace dart { namespace dynamics { diff --git a/dart/dynamics/Marker.hpp b/dart/dynamics/Marker.hpp index 437f81c9d59f9..85e938db53daa 100644 --- a/dart/dynamics/Marker.hpp +++ b/dart/dynamics/Marker.hpp @@ -33,12 +33,12 @@ #ifndef DART_DYNAMICS_MARKER_HPP_ #define DART_DYNAMICS_MARKER_HPP_ -#include - #include "dart/common/Deprecated.hpp" #include "dart/dynamics/FixedJacobianNode.hpp" #include "dart/dynamics/detail/MarkerAspect.hpp" +#include + namespace dart { namespace dynamics { diff --git a/dart/dynamics/MeshShape.cpp b/dart/dynamics/MeshShape.cpp index 643890de53567..686a7ae468a38 100644 --- a/dart/dynamics/MeshShape.cpp +++ b/dart/dynamics/MeshShape.cpp @@ -32,13 +32,6 @@ #include "dart/dynamics/MeshShape.hpp" -#include -#include - -#include -#include -#include - #include "dart/common/Console.hpp" #include "dart/common/LocalResourceRetriever.hpp" #include "dart/common/Uri.hpp" @@ -46,6 +39,13 @@ #include "dart/dynamics/AssimpInputResourceAdaptor.hpp" #include "dart/dynamics/BoxShape.hpp" +#include +#include +#include + +#include +#include + #if !(ASSIMP_AISCENE_CTOR_DTOR_DEFINED) // We define our own constructor and destructor for aiScene, because it seems to // be missing from the standard assimp library (see #451) diff --git a/dart/dynamics/MeshShape.hpp b/dart/dynamics/MeshShape.hpp index c53b8bff274ad..7ad47dec32e6d 100644 --- a/dart/dynamics/MeshShape.hpp +++ b/dart/dynamics/MeshShape.hpp @@ -33,12 +33,12 @@ #ifndef DART_DYNAMICS_MESHSHAPE_HPP_ #define DART_DYNAMICS_MESHSHAPE_HPP_ -#include +#include "dart/common/ResourceRetriever.hpp" +#include "dart/dynamics/Shape.hpp" #include -#include "dart/common/ResourceRetriever.hpp" -#include "dart/dynamics/Shape.hpp" +#include namespace dart { namespace dynamics { diff --git a/dart/dynamics/MetaSkeleton.cpp b/dart/dynamics/MetaSkeleton.cpp index 9dc791cb3a1cb..187855887218d 100644 --- a/dart/dynamics/MetaSkeleton.cpp +++ b/dart/dynamics/MetaSkeleton.cpp @@ -32,13 +32,13 @@ #include "dart/dynamics/MetaSkeleton.hpp" -#include - #include "dart/common/Console.hpp" #include "dart/dynamics/BodyNode.hpp" #include "dart/dynamics/DegreeOfFreedom.hpp" #include "dart/dynamics/JacobianNode.hpp" +#include + namespace dart { namespace dynamics { diff --git a/dart/dynamics/MetaSkeleton.hpp b/dart/dynamics/MetaSkeleton.hpp index f262e4e3b4267..d22e8a27b6715 100644 --- a/dart/dynamics/MetaSkeleton.hpp +++ b/dart/dynamics/MetaSkeleton.hpp @@ -33,11 +33,6 @@ #ifndef DART_DYNAMICS_METASKELETON_HPP_ #define DART_DYNAMICS_METASKELETON_HPP_ -#include -#include - -#include - #include "dart/common/LockableReference.hpp" #include "dart/common/Signal.hpp" #include "dart/common/Subject.hpp" @@ -45,6 +40,11 @@ #include "dart/dynamics/InvalidIndex.hpp" #include "dart/math/Geometry.hpp" +#include + +#include +#include + namespace dart { namespace dynamics { diff --git a/dart/dynamics/MultiSphereConvexHullShape.hpp b/dart/dynamics/MultiSphereConvexHullShape.hpp index 90da70f5e2f10..4b71cc1a94007 100644 --- a/dart/dynamics/MultiSphereConvexHullShape.hpp +++ b/dart/dynamics/MultiSphereConvexHullShape.hpp @@ -33,10 +33,10 @@ #ifndef DART_DYNAMICS_MULTISPHERECONVEXHULLSHAPE_HPP_ #define DART_DYNAMICS_MULTISPHERECONVEXHULLSHAPE_HPP_ -#include - #include "dart/dynamics/Shape.hpp" +#include + namespace dart { namespace dynamics { diff --git a/dart/dynamics/Node.hpp b/dart/dynamics/Node.hpp index 0c11d88a07999..f0ea2e82f7f34 100644 --- a/dart/dynamics/Node.hpp +++ b/dart/dynamics/Node.hpp @@ -33,14 +33,14 @@ #ifndef DART_DYNAMICS_NODE_HPP_ #define DART_DYNAMICS_NODE_HPP_ -#include - #include "dart/common/Cloneable.hpp" #include "dart/common/EmbeddedAspect.hpp" #include "dart/common/Subject.hpp" #include "dart/common/VersionCounter.hpp" #include "dart/dynamics/SmartPointer.hpp" +#include + namespace dart { namespace dynamics { diff --git a/dart/dynamics/NodeManagerJoiner.hpp b/dart/dynamics/NodeManagerJoiner.hpp index 2e381e377d840..e0fbd21dc16e1 100644 --- a/dart/dynamics/NodeManagerJoiner.hpp +++ b/dart/dynamics/NodeManagerJoiner.hpp @@ -33,10 +33,10 @@ #ifndef DART_DYNAMICS_NODEMANAGERJOINER_HPP_ #define DART_DYNAMICS_NODEMANAGERJOINER_HPP_ -#include - #include "dart/common/Empty.hpp" +#include + namespace dart { namespace dynamics { diff --git a/dart/dynamics/PlanarJoint.cpp b/dart/dynamics/PlanarJoint.cpp index 606a2f825117e..238e62cb238c2 100644 --- a/dart/dynamics/PlanarJoint.cpp +++ b/dart/dynamics/PlanarJoint.cpp @@ -32,13 +32,13 @@ #include "dart/dynamics/PlanarJoint.hpp" -#include - #include "dart/common/Console.hpp" #include "dart/dynamics/DegreeOfFreedom.hpp" #include "dart/math/Geometry.hpp" #include "dart/math/Helpers.hpp" +#include + namespace dart { namespace dynamics { diff --git a/dart/dynamics/PointMass.hpp b/dart/dynamics/PointMass.hpp index 0830e3c4c220f..0f85c3490333e 100644 --- a/dart/dynamics/PointMass.hpp +++ b/dart/dynamics/PointMass.hpp @@ -33,12 +33,12 @@ #ifndef DART_DYNAMICS_POINTMASS_HPP_ #define DART_DYNAMICS_POINTMASS_HPP_ -#include +#include "dart/dynamics/Entity.hpp" +#include "dart/math/Helpers.hpp" #include -#include "dart/dynamics/Entity.hpp" -#include "dart/math/Helpers.hpp" +#include namespace dart { namespace dynamics { diff --git a/dart/dynamics/PrismaticJoint.cpp b/dart/dynamics/PrismaticJoint.cpp index 081b72ec1c6f6..4dc2788a9e1d0 100644 --- a/dart/dynamics/PrismaticJoint.cpp +++ b/dart/dynamics/PrismaticJoint.cpp @@ -32,12 +32,12 @@ #include "dart/dynamics/PrismaticJoint.hpp" -#include - #include "dart/dynamics/BodyNode.hpp" #include "dart/math/Geometry.hpp" #include "dart/math/Helpers.hpp" +#include + namespace dart { namespace dynamics { diff --git a/dart/dynamics/PyramidShape.cpp b/dart/dynamics/PyramidShape.cpp index e814dd14b762c..a6c6ff38bc55d 100644 --- a/dart/dynamics/PyramidShape.cpp +++ b/dart/dynamics/PyramidShape.cpp @@ -32,13 +32,13 @@ #include "dart/dynamics/PyramidShape.hpp" -#include - #include "dart/common/Console.hpp" #include "dart/dynamics/CylinderShape.hpp" #include "dart/dynamics/SphereShape.hpp" #include "dart/math/Helpers.hpp" +#include + namespace dart { namespace dynamics { diff --git a/dart/dynamics/ReferentialSkeleton.hpp b/dart/dynamics/ReferentialSkeleton.hpp index f69be5b2d5f5b..7640c4cf27a1c 100644 --- a/dart/dynamics/ReferentialSkeleton.hpp +++ b/dart/dynamics/ReferentialSkeleton.hpp @@ -33,12 +33,12 @@ #ifndef DART_DYNAMICS_REFERENTIALSKELETON_HPP_ #define DART_DYNAMICS_REFERENTIALSKELETON_HPP_ -#include -#include - #include "dart/dynamics/MetaSkeleton.hpp" #include "dart/dynamics/SmartPointer.hpp" +#include +#include + namespace dart { namespace dynamics { diff --git a/dart/dynamics/RevoluteJoint.cpp b/dart/dynamics/RevoluteJoint.cpp index 1549202189338..513046f29ee06 100644 --- a/dart/dynamics/RevoluteJoint.cpp +++ b/dart/dynamics/RevoluteJoint.cpp @@ -32,13 +32,13 @@ #include "dart/dynamics/RevoluteJoint.hpp" -#include - #include "dart/common/Console.hpp" #include "dart/dynamics/BodyNode.hpp" #include "dart/math/Geometry.hpp" #include "dart/math/Helpers.hpp" +#include + namespace dart { namespace dynamics { diff --git a/dart/dynamics/ScrewJoint.cpp b/dart/dynamics/ScrewJoint.cpp index 62fd8fd8d5741..2e1ce412bddad 100644 --- a/dart/dynamics/ScrewJoint.cpp +++ b/dart/dynamics/ScrewJoint.cpp @@ -32,12 +32,12 @@ #include "dart/dynamics/ScrewJoint.hpp" -#include - #include "dart/dynamics/BodyNode.hpp" #include "dart/math/Geometry.hpp" #include "dart/math/Helpers.hpp" +#include + namespace dart { namespace dynamics { diff --git a/dart/dynamics/Shape.hpp b/dart/dynamics/Shape.hpp index 17580fb5599c5..f5a4177b797af 100644 --- a/dart/dynamics/Shape.hpp +++ b/dart/dynamics/Shape.hpp @@ -33,10 +33,6 @@ #ifndef DART_DYNAMICS_SHAPE_HPP_ #define DART_DYNAMICS_SHAPE_HPP_ -#include - -#include - #include "dart/common/Castable.hpp" #include "dart/common/ClassWithVirtualBase.hpp" #include "dart/common/Deprecated.hpp" @@ -46,6 +42,10 @@ #include "dart/dynamics/SmartPointer.hpp" #include "dart/math/Geometry.hpp" +#include + +#include + namespace dart { namespace dynamics { diff --git a/dart/dynamics/ShapeFrame.hpp b/dart/dynamics/ShapeFrame.hpp index 2a11f13001077..a4e9442ff23b9 100644 --- a/dart/dynamics/ShapeFrame.hpp +++ b/dart/dynamics/ShapeFrame.hpp @@ -33,8 +33,6 @@ #ifndef DART_DYNAMICS_SHAPEFRAME_HPP_ #define DART_DYNAMICS_SHAPEFRAME_HPP_ -#include - #include "dart/common/AspectWithVersion.hpp" #include "dart/common/Signal.hpp" #include "dart/common/SpecializedForAspect.hpp" @@ -43,6 +41,8 @@ #include "dart/dynamics/TemplatedJacobianNode.hpp" #include "dart/dynamics/detail/ShapeFrameAspect.hpp" +#include + namespace dart { namespace dynamics { diff --git a/dart/dynamics/ShapeNode.hpp b/dart/dynamics/ShapeNode.hpp index 810a24104c38f..a7e62d8b71dbf 100644 --- a/dart/dynamics/ShapeNode.hpp +++ b/dart/dynamics/ShapeNode.hpp @@ -33,11 +33,11 @@ #ifndef DART_DYNAMICS_SHAPENODE_HPP_ #define DART_DYNAMICS_SHAPENODE_HPP_ -#include - #include "dart/common/Signal.hpp" #include "dart/dynamics/detail/ShapeNode.hpp" +#include + namespace dart { namespace dynamics { diff --git a/dart/dynamics/SharedLibraryIkFast.cpp b/dart/dynamics/SharedLibraryIkFast.cpp index 4fec7a46051fd..b52d69728289b 100644 --- a/dart/dynamics/SharedLibraryIkFast.cpp +++ b/dart/dynamics/SharedLibraryIkFast.cpp @@ -32,13 +32,14 @@ #include "dart/dynamics/SharedLibraryIkFast.hpp" -#include -#include - #include "dart/common/Console.hpp" #include "dart/common/SharedLibrary.hpp" #include "dart/dynamics/Skeleton.hpp" +#include + +#include + namespace dart { namespace dynamics { diff --git a/dart/dynamics/Skeleton.cpp b/dart/dynamics/Skeleton.cpp index 8d4aa19d6e551..dc3c58dcee606 100644 --- a/dart/dynamics/Skeleton.cpp +++ b/dart/dynamics/Skeleton.cpp @@ -32,11 +32,6 @@ #include "dart/dynamics/Skeleton.hpp" -#include -#include -#include -#include - #include "dart/common/Console.hpp" #include "dart/common/Deprecated.hpp" #include "dart/common/StlHelpers.hpp" @@ -52,6 +47,11 @@ #include "dart/math/Geometry.hpp" #include "dart/math/Helpers.hpp" +#include +#include +#include +#include + #define SET_ALL_FLAGS(X) \ for (auto& cache : mTreeCache) \ cache.mDirty.X = true; \ diff --git a/dart/dynamics/Skeleton.hpp b/dart/dynamics/Skeleton.hpp index a4c5b16203129..ec01a8bebc080 100644 --- a/dart/dynamics/Skeleton.hpp +++ b/dart/dynamics/Skeleton.hpp @@ -33,8 +33,6 @@ #ifndef DART_DYNAMICS_SKELETON_HPP_ #define DART_DYNAMICS_SKELETON_HPP_ -#include - #include "dart/common/NameManager.hpp" #include "dart/common/VersionCounter.hpp" #include "dart/dynamics/EndEffector.hpp" @@ -48,6 +46,8 @@ #include "dart/dynamics/detail/BodyNodeAspect.hpp" #include "dart/dynamics/detail/SkeletonAspect.hpp" +#include + namespace dart { namespace dynamics { diff --git a/dart/dynamics/SoftBodyNode.cpp b/dart/dynamics/SoftBodyNode.cpp index 9e1bbcbd28bf4..652904b697000 100644 --- a/dart/dynamics/SoftBodyNode.cpp +++ b/dart/dynamics/SoftBodyNode.cpp @@ -32,10 +32,6 @@ #include "dart/dynamics/SoftBodyNode.hpp" -#include -#include -#include - #include "dart/common/Console.hpp" #include "dart/dynamics/Joint.hpp" #include "dart/dynamics/PointMass.hpp" @@ -44,6 +40,10 @@ #include "dart/dynamics/SoftMeshShape.hpp" #include "dart/math/Helpers.hpp" +#include +#include +#include + namespace dart { namespace dynamics { diff --git a/dart/dynamics/SoftMeshShape.hpp b/dart/dynamics/SoftMeshShape.hpp index a8ac7febeafb9..094e5df47fdb4 100644 --- a/dart/dynamics/SoftMeshShape.hpp +++ b/dart/dynamics/SoftMeshShape.hpp @@ -33,11 +33,11 @@ #ifndef DART_DYNAMICS_SOFTMESHSHAPE_HPP_ #define DART_DYNAMICS_SOFTMESHSHAPE_HPP_ +#include "dart/dynamics/Shape.hpp" + #include #include -#include "dart/dynamics/Shape.hpp" - namespace dart { namespace dynamics { diff --git a/dart/dynamics/TranslationalJoint.cpp b/dart/dynamics/TranslationalJoint.cpp index e349c34fb9a88..f98ad61a0715a 100644 --- a/dart/dynamics/TranslationalJoint.cpp +++ b/dart/dynamics/TranslationalJoint.cpp @@ -32,11 +32,11 @@ #include "dart/dynamics/TranslationalJoint.hpp" -#include - #include "dart/math/Geometry.hpp" #include "dart/math/Helpers.hpp" +#include + namespace dart { namespace dynamics { diff --git a/dart/dynamics/TranslationalJoint.hpp b/dart/dynamics/TranslationalJoint.hpp index 35dcfb4bf26c6..76496b830db89 100644 --- a/dart/dynamics/TranslationalJoint.hpp +++ b/dart/dynamics/TranslationalJoint.hpp @@ -33,10 +33,10 @@ #ifndef DART_DYNAMICS_TRANSLATIONALJOINT_HPP_ #define DART_DYNAMICS_TRANSLATIONALJOINT_HPP_ -#include - #include "dart/dynamics/GenericJoint.hpp" +#include + namespace dart { namespace dynamics { diff --git a/dart/dynamics/TranslationalJoint2D.cpp b/dart/dynamics/TranslationalJoint2D.cpp index 6af9a81164fae..590f6de039d43 100644 --- a/dart/dynamics/TranslationalJoint2D.cpp +++ b/dart/dynamics/TranslationalJoint2D.cpp @@ -32,13 +32,13 @@ #include "dart/dynamics/TranslationalJoint2D.hpp" -#include - #include "dart/common/Console.hpp" #include "dart/dynamics/DegreeOfFreedom.hpp" #include "dart/math/Geometry.hpp" #include "dart/math/Helpers.hpp" +#include + namespace dart { namespace dynamics { diff --git a/dart/dynamics/UniversalJoint.cpp b/dart/dynamics/UniversalJoint.cpp index 80172da215444..5463ba276a1b5 100644 --- a/dart/dynamics/UniversalJoint.cpp +++ b/dart/dynamics/UniversalJoint.cpp @@ -32,11 +32,11 @@ #include "dart/dynamics/UniversalJoint.hpp" -#include - #include "dart/math/Geometry.hpp" #include "dart/math/Helpers.hpp" +#include + namespace dart { namespace dynamics { diff --git a/dart/dynamics/VoxelGridShape.hpp b/dart/dynamics/VoxelGridShape.hpp index db223fa8b2ba7..fdb5e7e38f3cf 100644 --- a/dart/dynamics/VoxelGridShape.hpp +++ b/dart/dynamics/VoxelGridShape.hpp @@ -37,12 +37,12 @@ #if HAVE_OCTOMAP - #include - #include "dart/collision/fcl/BackwardCompatibility.hpp" #include "dart/dynamics/Frame.hpp" #include "dart/dynamics/Shape.hpp" + #include + namespace dart { namespace dynamics { diff --git a/dart/dynamics/WeldJoint.cpp b/dart/dynamics/WeldJoint.cpp index d639e3de0636a..a4b0f99a86d9c 100644 --- a/dart/dynamics/WeldJoint.cpp +++ b/dart/dynamics/WeldJoint.cpp @@ -32,11 +32,11 @@ #include "dart/dynamics/WeldJoint.hpp" -#include - #include "dart/math/Geometry.hpp" #include "dart/math/Helpers.hpp" +#include + namespace dart { namespace dynamics { diff --git a/dart/dynamics/WeldJoint.hpp b/dart/dynamics/WeldJoint.hpp index c6b8b6acb059b..794479e274f8e 100644 --- a/dart/dynamics/WeldJoint.hpp +++ b/dart/dynamics/WeldJoint.hpp @@ -33,11 +33,11 @@ #ifndef DART_DYNAMICS_WELDJOINT_HPP_ #define DART_DYNAMICS_WELDJOINT_HPP_ -#include +#include "dart/dynamics/ZeroDofJoint.hpp" #include -#include "dart/dynamics/ZeroDofJoint.hpp" +#include namespace dart { namespace dynamics { diff --git a/dart/dynamics/ZeroDofJoint.hpp b/dart/dynamics/ZeroDofJoint.hpp index 02fe41f479f19..f260ea3e1a7a0 100644 --- a/dart/dynamics/ZeroDofJoint.hpp +++ b/dart/dynamics/ZeroDofJoint.hpp @@ -33,10 +33,10 @@ #ifndef DART_DYNAMICS_ZERODOFJOINT_HPP_ #define DART_DYNAMICS_ZERODOFJOINT_HPP_ -#include - #include "dart/dynamics/Joint.hpp" +#include + namespace dart { namespace dynamics { diff --git a/dart/dynamics/detail/BasicNodeManager.hpp b/dart/dynamics/detail/BasicNodeManager.hpp index 039df869d3ed1..ed08192adae9a 100644 --- a/dart/dynamics/detail/BasicNodeManager.hpp +++ b/dart/dynamics/detail/BasicNodeManager.hpp @@ -33,15 +33,15 @@ #ifndef DART_DYNAMICS_DETAIL_BASICNODEMANAGER_HPP_ #define DART_DYNAMICS_DETAIL_BASICNODEMANAGER_HPP_ -#include -#include -#include - #include "dart/common/ClassWithVirtualBase.hpp" #include "dart/common/Empty.hpp" #include "dart/common/NameManager.hpp" #include "dart/dynamics/Node.hpp" +#include +#include +#include + namespace dart { namespace dynamics { namespace detail { diff --git a/dart/dynamics/detail/BodyNode.hpp b/dart/dynamics/detail/BodyNode.hpp index afb60eca3aa15..1149df35d8d64 100644 --- a/dart/dynamics/detail/BodyNode.hpp +++ b/dart/dynamics/detail/BodyNode.hpp @@ -33,11 +33,11 @@ #ifndef DART_DYNAMICS_DETAIL_BODYNODE_HPP_ #define DART_DYNAMICS_DETAIL_BODYNODE_HPP_ -#include - #include "dart/dynamics/BodyNode.hpp" #include "dart/dynamics/Skeleton.hpp" +#include + namespace dart { namespace dynamics { diff --git a/dart/dynamics/detail/EndEffectorAspect.hpp b/dart/dynamics/detail/EndEffectorAspect.hpp index ec78198726117..80d95be0463ea 100644 --- a/dart/dynamics/detail/EndEffectorAspect.hpp +++ b/dart/dynamics/detail/EndEffectorAspect.hpp @@ -33,11 +33,11 @@ #ifndef DART_DYNAMICS_DETAIL_ENDEFFECTORASPECT_HPP_ #define DART_DYNAMICS_DETAIL_ENDEFFECTORASPECT_HPP_ -#include - #include "dart/common/SpecializedForAspect.hpp" #include "dart/dynamics/CompositeNode.hpp" +#include + namespace dart { namespace dynamics { diff --git a/dart/dynamics/detail/EulerJointAspect.hpp b/dart/dynamics/detail/EulerJointAspect.hpp index 1a850c8227cd1..04cffef4d8443 100644 --- a/dart/dynamics/detail/EulerJointAspect.hpp +++ b/dart/dynamics/detail/EulerJointAspect.hpp @@ -33,10 +33,10 @@ #ifndef DART_DYNAMICS_DETAIL_EULERJOINTASPECT_HPP_ #define DART_DYNAMICS_DETAIL_EULERJOINTASPECT_HPP_ -#include - #include "dart/dynamics/GenericJoint.hpp" +#include + namespace dart { namespace dynamics { diff --git a/dart/dynamics/detail/HeightmapShape-impl.hpp b/dart/dynamics/detail/HeightmapShape-impl.hpp index 690a2726c2dcd..2c680cdd42eee 100644 --- a/dart/dynamics/detail/HeightmapShape-impl.hpp +++ b/dart/dynamics/detail/HeightmapShape-impl.hpp @@ -30,14 +30,15 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include -#include -#include - #include "dart/common/Console.hpp" #include "dart/dynamics/BoxShape.hpp" #include "dart/dynamics/HeightmapShape.hpp" +#include +#include + +#include + namespace dart { namespace dynamics { diff --git a/dart/dynamics/detail/InverseKinematics.hpp b/dart/dynamics/detail/InverseKinematics.hpp index 1c121ebf81c3b..8ae517036f17b 100644 --- a/dart/dynamics/detail/InverseKinematics.hpp +++ b/dart/dynamics/detail/InverseKinematics.hpp @@ -33,10 +33,10 @@ #ifndef DART_DYNAMICS_DETAIL_INVERSEKINEMATICS_HPP_ #define DART_DYNAMICS_DETAIL_INVERSEKINEMATICS_HPP_ -#include - #include "dart/dynamics/InverseKinematics.hpp" +#include + namespace dart { namespace dynamics { diff --git a/dart/dynamics/detail/InverseKinematicsPtr.hpp b/dart/dynamics/detail/InverseKinematicsPtr.hpp index 4754053127edd..8752aedfeaa33 100644 --- a/dart/dynamics/detail/InverseKinematicsPtr.hpp +++ b/dart/dynamics/detail/InverseKinematicsPtr.hpp @@ -33,10 +33,10 @@ #ifndef DART_DYNAMICS_DETAIL_INVERSEKINEMATICSPTR_HPP_ #define DART_DYNAMICS_DETAIL_INVERSEKINEMATICSPTR_HPP_ -#include - #include "dart/dynamics/detail/NodePtr.hpp" +#include + namespace dart { namespace dynamics { diff --git a/dart/dynamics/detail/JointAspect.hpp b/dart/dynamics/detail/JointAspect.hpp index d418a053a8364..e50baeceba834 100644 --- a/dart/dynamics/detail/JointAspect.hpp +++ b/dart/dynamics/detail/JointAspect.hpp @@ -33,12 +33,12 @@ #ifndef DART_DYNAMICS_DETAIL_JOINTASPECT_HPP_ #define DART_DYNAMICS_DETAIL_JOINTASPECT_HPP_ -#include +#include "dart/dynamics/MimicDofProperties.hpp" #include #include -#include "dart/dynamics/MimicDofProperties.hpp" +#include namespace dart { namespace dynamics { diff --git a/dart/dynamics/detail/MarkerAspect.hpp b/dart/dynamics/detail/MarkerAspect.hpp index 6e9ac16b71e9d..b9e2eeaca7558 100644 --- a/dart/dynamics/detail/MarkerAspect.hpp +++ b/dart/dynamics/detail/MarkerAspect.hpp @@ -33,10 +33,10 @@ #ifndef DART_DYNAMICS_DETAIL_MARKERASPECT_HPP_ #define DART_DYNAMICS_DETAIL_MARKERASPECT_HPP_ -#include - #include "dart/math/Helpers.hpp" +#include + namespace dart { namespace dynamics { namespace detail { diff --git a/dart/dynamics/detail/Node.hpp b/dart/dynamics/detail/Node.hpp index 342c45ecadea4..473650acf2bfa 100644 --- a/dart/dynamics/detail/Node.hpp +++ b/dart/dynamics/detail/Node.hpp @@ -33,11 +33,11 @@ #ifndef DART_DYNAMICS_DETAIL_NODE_HPP_ #define DART_DYNAMICS_DETAIL_NODE_HPP_ -#include - #include "dart/common/StlHelpers.hpp" #include "dart/dynamics/Node.hpp" +#include + namespace dart { namespace dynamics { diff --git a/dart/dynamics/detail/PlanarJointAspect.hpp b/dart/dynamics/detail/PlanarJointAspect.hpp index 1a8ea103d660b..1eab15cb81712 100644 --- a/dart/dynamics/detail/PlanarJointAspect.hpp +++ b/dart/dynamics/detail/PlanarJointAspect.hpp @@ -33,10 +33,10 @@ #ifndef DART_DYNAMICS_DETAIL_PLANARJOINTASPECT_HPP_ #define DART_DYNAMICS_DETAIL_PLANARJOINTASPECT_HPP_ -#include - #include "dart/dynamics/GenericJoint.hpp" +#include + namespace dart { namespace dynamics { diff --git a/dart/dynamics/detail/PrismaticJointAspect.hpp b/dart/dynamics/detail/PrismaticJointAspect.hpp index d70204e1e74a1..d94ac3e5ac994 100644 --- a/dart/dynamics/detail/PrismaticJointAspect.hpp +++ b/dart/dynamics/detail/PrismaticJointAspect.hpp @@ -33,11 +33,11 @@ #ifndef DART_DYNAMICS_DETAIL_PRISMATICJOINTASPECT_HPP_ #define DART_DYNAMICS_DETAIL_PRISMATICJOINTASPECT_HPP_ -#include +#include "dart/dynamics/GenericJoint.hpp" #include -#include "dart/dynamics/GenericJoint.hpp" +#include namespace dart { namespace dynamics { diff --git a/dart/dynamics/detail/RevoluteJointAspect.hpp b/dart/dynamics/detail/RevoluteJointAspect.hpp index 2ba4a94967a3c..2e82bf5af5d3a 100644 --- a/dart/dynamics/detail/RevoluteJointAspect.hpp +++ b/dart/dynamics/detail/RevoluteJointAspect.hpp @@ -33,11 +33,11 @@ #ifndef DART_DYNAMICS_DETAIL_REVOLUTEJOINTASPECT_HPP_ #define DART_DYNAMICS_DETAIL_REVOLUTEJOINTASPECT_HPP_ -#include +#include "dart/dynamics/GenericJoint.hpp" #include -#include "dart/dynamics/GenericJoint.hpp" +#include namespace dart { namespace dynamics { diff --git a/dart/dynamics/detail/ScrewJointAspect.hpp b/dart/dynamics/detail/ScrewJointAspect.hpp index 3d146f6f18072..a489365594449 100644 --- a/dart/dynamics/detail/ScrewJointAspect.hpp +++ b/dart/dynamics/detail/ScrewJointAspect.hpp @@ -33,11 +33,11 @@ #ifndef DART_DYNAMICS_DETAIL_SCREWJOINTASPECT_HPP_ #define DART_DYNAMICS_DETAIL_SCREWJOINTASPECT_HPP_ -#include +#include "dart/dynamics/GenericJoint.hpp" #include -#include "dart/dynamics/GenericJoint.hpp" +#include namespace dart { namespace dynamics { diff --git a/dart/dynamics/detail/ShapeFrameAspect.hpp b/dart/dynamics/detail/ShapeFrameAspect.hpp index 4fedad89eb1de..e38d7f614bb8b 100644 --- a/dart/dynamics/detail/ShapeFrameAspect.hpp +++ b/dart/dynamics/detail/ShapeFrameAspect.hpp @@ -33,11 +33,11 @@ #ifndef DART_DYNAMICS_DETAIL_SHAPEFRAMEASPECT_HPP_ #define DART_DYNAMICS_DETAIL_SHAPEFRAMEASPECT_HPP_ -#include - #include "dart/common/EmbeddedAspect.hpp" #include "dart/dynamics/SmartPointer.hpp" +#include + namespace dart { namespace dynamics { diff --git a/dart/dynamics/detail/SkeletonAspect.hpp b/dart/dynamics/detail/SkeletonAspect.hpp index fddb1cea45ad4..f80a0dca31e99 100644 --- a/dart/dynamics/detail/SkeletonAspect.hpp +++ b/dart/dynamics/detail/SkeletonAspect.hpp @@ -33,13 +33,13 @@ #ifndef DART_DYNAMICS_DETAIL_SKELETONASPECT_HPP_ #define DART_DYNAMICS_DETAIL_SKELETONASPECT_HPP_ -#include - #include "dart/common/Composite.hpp" #include "dart/common/EmbeddedAspect.hpp" #include "dart/common/ProxyAspect.hpp" #include "dart/common/RequiresAspect.hpp" +#include + namespace dart { namespace dynamics { diff --git a/dart/dynamics/detail/TranslationalJoint2DAspect.hpp b/dart/dynamics/detail/TranslationalJoint2DAspect.hpp index 75f4d1b904dda..b0c559e62b6f3 100644 --- a/dart/dynamics/detail/TranslationalJoint2DAspect.hpp +++ b/dart/dynamics/detail/TranslationalJoint2DAspect.hpp @@ -33,12 +33,12 @@ #ifndef DART_DYNAMICS_DETAIL_TRANSLATIONALJOINT2DASPECT_HPP_ #define DART_DYNAMICS_DETAIL_TRANSLATIONALJOINT2DASPECT_HPP_ -#include +#include "dart/dynamics/GenericJoint.hpp" +#include "dart/dynamics/detail/PlanarJointAspect.hpp" #include -#include "dart/dynamics/GenericJoint.hpp" -#include "dart/dynamics/detail/PlanarJointAspect.hpp" +#include namespace dart { namespace dynamics { diff --git a/dart/dynamics/detail/UniversalJointAspect.hpp b/dart/dynamics/detail/UniversalJointAspect.hpp index 41932a200b983..4c50adab465f7 100644 --- a/dart/dynamics/detail/UniversalJointAspect.hpp +++ b/dart/dynamics/detail/UniversalJointAspect.hpp @@ -33,11 +33,11 @@ #ifndef DART_DYNAMICS_DETAIL_UNIVERSALJOINTASPECT_HPP_ #define DART_DYNAMICS_DETAIL_UNIVERSALJOINTASPECT_HPP_ -#include +#include "dart/dynamics/GenericJoint.hpp" #include -#include "dart/dynamics/GenericJoint.hpp" +#include namespace dart { namespace dynamics { diff --git a/dart/gui/GLFuncs.cpp b/dart/gui/GLFuncs.cpp index 71fe9a7221c8d..d1834b1941948 100644 --- a/dart/gui/GLFuncs.cpp +++ b/dart/gui/GLFuncs.cpp @@ -32,16 +32,17 @@ #include "dart/gui/GLFuncs.hpp" -#include -#include -#include - -#include - #include "dart/common/Console.hpp" #include "dart/gui/LoadOpengl.hpp" #include "dart/gui/glut/GLUTFuncs.hpp" #include "dart/math/Constants.hpp" + +#include + +#include +#include + +#include // TODO(JS): remove once glut become an optional dependency namespace dart { diff --git a/dart/gui/GLFuncs.hpp b/dart/gui/GLFuncs.hpp index 79c8eaaf8b66d..6776c3847193c 100644 --- a/dart/gui/GLFuncs.hpp +++ b/dart/gui/GLFuncs.hpp @@ -33,11 +33,11 @@ #ifndef DART_GUI_GLFUNCS_HPP_ #define DART_GUI_GLFUNCS_HPP_ -#include +#include "dart/common/Deprecated.hpp" #include -#include "dart/common/Deprecated.hpp" +#include namespace dart { namespace gui { diff --git a/dart/gui/OpenGLRenderInterface.cpp b/dart/gui/OpenGLRenderInterface.cpp index 0be70e8ed063e..03617de75fce4 100644 --- a/dart/gui/OpenGLRenderInterface.cpp +++ b/dart/gui/OpenGLRenderInterface.cpp @@ -32,10 +32,6 @@ #include "dart/gui/OpenGLRenderInterface.hpp" -#include - -#include - #include "dart/common/Console.hpp" #include "dart/dynamics/BodyNode.hpp" #include "dart/dynamics/BoxShape.hpp" @@ -49,6 +45,10 @@ #include "dart/gui/LoadOpengl.hpp" #include "dart/math/Icosphere.hpp" +#include + +#include + // Code taken from glut/lib/glut_shapes.c static GLUquadricObj* quadObj; diff --git a/dart/gui/OpenGLRenderInterface.hpp b/dart/gui/OpenGLRenderInterface.hpp index 578e5deb0652e..c3a664a3b9f17 100644 --- a/dart/gui/OpenGLRenderInterface.hpp +++ b/dart/gui/OpenGLRenderInterface.hpp @@ -33,12 +33,12 @@ #ifndef DART_GUI_OPENGLRENDERINTERFACE_HPP_ #define DART_GUI_OPENGLRENDERINTERFACE_HPP_ -#include -#include - #include "dart/gui/LoadOpengl.hpp" #include "dart/gui/RenderInterface.hpp" +#include +#include + namespace dart { namespace dynamics { diff --git a/dart/gui/RenderInterface.hpp b/dart/gui/RenderInterface.hpp index 54684199ef73f..a8e9f120da0ac 100644 --- a/dart/gui/RenderInterface.hpp +++ b/dart/gui/RenderInterface.hpp @@ -33,12 +33,12 @@ #ifndef DART_GUI_RENDERINTERFACE_HPP_ #define DART_GUI_RENDERINTERFACE_HPP_ -#include +#include "dart/math/MathTypes.hpp" #include #include -#include "dart/math/MathTypes.hpp" +#include namespace dart { namespace gui { diff --git a/dart/gui/glut/GLUTFuncs.cpp b/dart/gui/glut/GLUTFuncs.cpp index b77fc454cbafe..16ffc0c0a991a 100644 --- a/dart/gui/glut/GLUTFuncs.cpp +++ b/dart/gui/glut/GLUTFuncs.cpp @@ -32,14 +32,15 @@ #include "dart/gui/glut/GLUTFuncs.hpp" -#include -#include -#include +#include "dart/gui/LoadOpengl.hpp" +#include "dart/gui/glut/LoadGlut.hpp" #include -#include "dart/gui/LoadOpengl.hpp" -#include "dart/gui/glut/LoadGlut.hpp" +#include +#include + +#include namespace dart { namespace gui { diff --git a/dart/gui/glut/GlutWindow.cpp b/dart/gui/glut/GlutWindow.cpp index 73c59d0717182..4e28b25db6fc1 100644 --- a/dart/gui/glut/GlutWindow.cpp +++ b/dart/gui/glut/GlutWindow.cpp @@ -42,15 +42,16 @@ #include #include #endif -#include -#include -#include - #include "dart/common/Console.hpp" #include "dart/gui/GLFuncs.hpp" #include "dart/gui/OpenGLRenderInterface.hpp" #include "dart/gui/glut/LoadGlut.hpp" +#include +#include + +#include + namespace dart { namespace gui { namespace glut { diff --git a/dart/gui/glut/GraphWindow.cpp b/dart/gui/glut/GraphWindow.cpp index 562e7d468f575..b1612aab9df48 100644 --- a/dart/gui/glut/GraphWindow.cpp +++ b/dart/gui/glut/GraphWindow.cpp @@ -38,12 +38,13 @@ #include "dart/gui/glut/GraphWindow.hpp" -#include +#include "dart/gui/glut/GLUTFuncs.hpp" +#include "dart/gui/glut/LoadGlut.hpp" + #include #include -#include "dart/gui/glut/GLUTFuncs.hpp" -#include "dart/gui/glut/LoadGlut.hpp" +#include namespace dart { namespace gui { diff --git a/dart/gui/glut/GraphWindow.hpp b/dart/gui/glut/GraphWindow.hpp index 17234d16c05b6..9d09d356e5743 100644 --- a/dart/gui/glut/GraphWindow.hpp +++ b/dart/gui/glut/GraphWindow.hpp @@ -33,11 +33,11 @@ #ifndef DART_GUI_GLUT_GRAPHWINDOW_HPP_ #define DART_GUI_GLUT_GRAPHWINDOW_HPP_ -#include +#include "dart/gui/glut/Win2D.hpp" #include -#include "dart/gui/glut/Win2D.hpp" +#include namespace dart { namespace gui { diff --git a/dart/gui/glut/LoadGlut.hpp b/dart/gui/glut/LoadGlut.hpp index 7020c18dbf6dd..4820b4a638054 100644 --- a/dart/gui/glut/LoadGlut.hpp +++ b/dart/gui/glut/LoadGlut.hpp @@ -34,9 +34,9 @@ #define DART_GUI_GLUT_LOADGLUT_HPP_ #if defined(_WIN32) - #include // To disable glut::exit() function - #include + + #include // To disable glut::exit() function #elif defined(__linux__) #include #elif defined(__APPLE__) diff --git a/dart/gui/glut/MotionBlurSimWindow.hpp b/dart/gui/glut/MotionBlurSimWindow.hpp index 050b0467fd0f4..49d85779acc0f 100644 --- a/dart/gui/glut/MotionBlurSimWindow.hpp +++ b/dart/gui/glut/MotionBlurSimWindow.hpp @@ -41,11 +41,11 @@ #ifndef DART_GUI_GLUT_MOTIONBLURSIMWINDOW_HPP_ #define DART_GUI_GLUT_MOTIONBLURSIMWINDOW_HPP_ -#include +#include "dart/gui/glut/SimWindow.hpp" #include -#include "dart/gui/glut/SimWindow.hpp" +#include namespace dart { namespace gui { diff --git a/dart/gui/glut/SimWindow.cpp b/dart/gui/glut/SimWindow.cpp index d0fda2b4e0f89..72ca35a81d2f0 100644 --- a/dart/gui/glut/SimWindow.cpp +++ b/dart/gui/glut/SimWindow.cpp @@ -38,10 +38,6 @@ #include "dart/gui/glut/SimWindow.hpp" -#include -#include -#include - #include "dart/collision/CollisionDetector.hpp" #include "dart/constraint/ConstraintSolver.hpp" #include "dart/dynamics/BoxShape.hpp" @@ -65,6 +61,11 @@ #include "dart/simulation/World.hpp" #include "dart/utils/FileInfoWorld.hpp" +#include +#include + +#include + namespace dart { namespace gui { namespace glut { diff --git a/dart/gui/glut/SimWindow.hpp b/dart/gui/glut/SimWindow.hpp index fcd10d75472a5..803062dc96e83 100644 --- a/dart/gui/glut/SimWindow.hpp +++ b/dart/gui/glut/SimWindow.hpp @@ -33,14 +33,14 @@ #ifndef DART_GUI_GLUT_SIMWINDOW_HPP_ #define DART_GUI_GLUT_SIMWINDOW_HPP_ -#include - -#include - #include "dart/common/Deprecated.hpp" #include "dart/gui/glut/Win3D.hpp" #include "dart/simulation/World.hpp" +#include + +#include + namespace dart { namespace gui { namespace glut { diff --git a/dart/gui/glut/Win2D.cpp b/dart/gui/glut/Win2D.cpp index afd7616ae344e..86cb4ac07e69f 100644 --- a/dart/gui/glut/Win2D.cpp +++ b/dart/gui/glut/Win2D.cpp @@ -32,10 +32,10 @@ #include "dart/gui/glut/Win2D.hpp" -#include - #include "dart/gui/glut/LoadGlut.hpp" +#include + namespace dart { namespace gui { namespace glut { diff --git a/dart/gui/glut/Win3D.cpp b/dart/gui/glut/Win3D.cpp index 85f031b84b763..987bbcda96611 100644 --- a/dart/gui/glut/Win3D.cpp +++ b/dart/gui/glut/Win3D.cpp @@ -32,11 +32,11 @@ #include "dart/gui/glut/Win3D.hpp" -#include - #include "dart/gui/glut/LoadGlut.hpp" #include "dart/math/Constants.hpp" +#include + namespace dart { namespace gui { namespace glut { diff --git a/dart/gui/glut/Win3D.hpp b/dart/gui/glut/Win3D.hpp index 9fe7e94f6871e..360d560860c47 100644 --- a/dart/gui/glut/Win3D.hpp +++ b/dart/gui/glut/Win3D.hpp @@ -33,11 +33,11 @@ #ifndef DART_GUI_GLUT_WIN3D_HPP_ #define DART_GUI_GLUT_WIN3D_HPP_ -#include - #include "dart/gui/Trackball.hpp" #include "dart/gui/glut/Window.hpp" +#include + namespace dart { namespace gui { namespace glut { diff --git a/dart/gui/glut/Window.hpp b/dart/gui/glut/Window.hpp index 0606391113ce3..cc19c34d82776 100644 --- a/dart/gui/glut/Window.hpp +++ b/dart/gui/glut/Window.hpp @@ -33,11 +33,11 @@ #ifndef DART_GUI_GLUT_WINDOW_HPP_ #define DART_GUI_GLUT_WINDOW_HPP_ -#include - #include "dart/gui/LoadOpengl.hpp" #include "dart/gui/RenderInterface.hpp" +#include + namespace dart { namespace gui { namespace glut { diff --git a/dart/gui/osg/DefaultEventHandler.cpp b/dart/gui/osg/DefaultEventHandler.cpp index 271c4bf303b14..3c16e3525a171 100644 --- a/dart/gui/osg/DefaultEventHandler.cpp +++ b/dart/gui/osg/DefaultEventHandler.cpp @@ -32,10 +32,6 @@ #include "dart/gui/osg/DefaultEventHandler.hpp" -#include - -#include - #include "dart/dynamics/Entity.hpp" #include "dart/dynamics/ShapeFrame.hpp" #include "dart/gui/osg/MouseEventHandler.hpp" @@ -44,6 +40,10 @@ #include "dart/gui/osg/Viewer.hpp" #include "dart/gui/osg/render/ShapeNode.hpp" +#include + +#include + namespace dart { namespace gui { namespace osg { diff --git a/dart/gui/osg/DefaultEventHandler.hpp b/dart/gui/osg/DefaultEventHandler.hpp index 91f4a6bb4ce0c..99f40859ad8a3 100644 --- a/dart/gui/osg/DefaultEventHandler.hpp +++ b/dart/gui/osg/DefaultEventHandler.hpp @@ -33,16 +33,16 @@ #ifndef DART_GUI_OSG_DEFAULTEVENTHANDLER_HPP_ #define DART_GUI_OSG_DEFAULTEVENTHANDLER_HPP_ -#include -#include -#include +#include "dart/common/ClassWithVirtualBase.hpp" +#include "dart/common/Observer.hpp" +#include "dart/common/Subject.hpp" #include #include -#include "dart/common/ClassWithVirtualBase.hpp" -#include "dart/common/Observer.hpp" -#include "dart/common/Subject.hpp" +#include +#include +#include namespace dart { diff --git a/dart/gui/osg/DragAndDrop.hpp b/dart/gui/osg/DragAndDrop.hpp index 5ea13f35a9b6d..24e3a5e006874 100644 --- a/dart/gui/osg/DragAndDrop.hpp +++ b/dart/gui/osg/DragAndDrop.hpp @@ -33,15 +33,14 @@ #ifndef DART_GUI_OSG_DRAGANDDROP_HPP_ #define DART_GUI_OSG_DRAGANDDROP_HPP_ -#include - -#include - +#include "DefaultEventHandler.hpp" #include "dart/common/sub_ptr.hpp" #include "dart/dynamics/Entity.hpp" #include "dart/dynamics/Shape.hpp" -#include "DefaultEventHandler.hpp" +#include + +#include namespace dart { diff --git a/dart/gui/osg/GridVisual.cpp b/dart/gui/osg/GridVisual.cpp index d074348d73cd8..322f51b954943 100644 --- a/dart/gui/osg/GridVisual.cpp +++ b/dart/gui/osg/GridVisual.cpp @@ -32,8 +32,6 @@ #include "dart/gui/osg/GridVisual.hpp" -#include - #include "dart/dynamics/BodyNode.hpp" #include "dart/dynamics/SimpleFrame.hpp" #include "dart/dynamics/Skeleton.hpp" @@ -41,6 +39,8 @@ #include "dart/gui/osg/Utils.hpp" #include "dart/math/Helpers.hpp" +#include + namespace dart { namespace gui { namespace osg { diff --git a/dart/gui/osg/GridVisual.hpp b/dart/gui/osg/GridVisual.hpp index 8dee78426bf79..f35e211e34548 100644 --- a/dart/gui/osg/GridVisual.hpp +++ b/dart/gui/osg/GridVisual.hpp @@ -33,13 +33,13 @@ #ifndef DART_GUI_OSG_GRIDVISUAL_HPP_ #define DART_GUI_OSG_GRIDVISUAL_HPP_ -#include -#include - #include "dart/dynamics/SmartPointer.hpp" #include "dart/gui/osg/ShapeFrameNode.hpp" #include "dart/gui/osg/Viewer.hpp" +#include +#include + namespace dart { namespace gui { namespace osg { diff --git a/dart/gui/osg/ImGuiHandler.cpp b/dart/gui/osg/ImGuiHandler.cpp index c35fdecf0d7cf..6089d9ac7cbf1 100644 --- a/dart/gui/osg/ImGuiHandler.cpp +++ b/dart/gui/osg/ImGuiHandler.cpp @@ -38,16 +38,16 @@ #include "dart/gui/osg/ImGuiHandler.hpp" -#include - -#include -#include - #include "dart/common/Console.hpp" #include "dart/external/imgui/imgui.h" #include "dart/external/imgui/imgui_impl_opengl2.h" #include "dart/gui/osg/ImGuiWidget.hpp" +#include +#include + +#include + namespace dart { namespace gui { namespace osg { diff --git a/dart/gui/osg/ImGuiHandler.hpp b/dart/gui/osg/ImGuiHandler.hpp index 7090b3a51ed31..79f05e9592522 100644 --- a/dart/gui/osg/ImGuiHandler.hpp +++ b/dart/gui/osg/ImGuiHandler.hpp @@ -39,15 +39,15 @@ #ifndef DART_GUI_OSG_IMGUIHANDLER_HPP_ #define DART_GUI_OSG_IMGUIHANDLER_HPP_ -#include -#include -#include - #include #include #include #include +#include +#include +#include + namespace dart { namespace gui { namespace osg { diff --git a/dart/gui/osg/ImGuiViewer.hpp b/dart/gui/osg/ImGuiViewer.hpp index 2ee363259540e..7c80d9ef0b312 100644 --- a/dart/gui/osg/ImGuiViewer.hpp +++ b/dart/gui/osg/ImGuiViewer.hpp @@ -33,10 +33,10 @@ #ifndef DART_GUI_OSG_IMGUIVIEWER_HPP_ #define DART_GUI_OSG_IMGUIVIEWER_HPP_ -#include - #include "dart/gui/osg/Viewer.hpp" +#include + namespace dart { namespace gui { namespace osg { diff --git a/dart/gui/osg/RealTimeWorldNode.hpp b/dart/gui/osg/RealTimeWorldNode.hpp index 2b5328f7af9a8..8c3a57c4f3db8 100644 --- a/dart/gui/osg/RealTimeWorldNode.hpp +++ b/dart/gui/osg/RealTimeWorldNode.hpp @@ -33,10 +33,10 @@ #ifndef DART_GUI_OSG_REALTIMEWORLDNODE_HPP_ #define DART_GUI_OSG_REALTIMEWORLDNODE_HPP_ -#include - #include "dart/gui/osg/WorldNode.hpp" +#include + namespace dart { namespace gui { namespace osg { diff --git a/dart/gui/osg/ShapeFrameNode.cpp b/dart/gui/osg/ShapeFrameNode.cpp index e21577292dc1e..1b78fded726e0 100644 --- a/dart/gui/osg/ShapeFrameNode.cpp +++ b/dart/gui/osg/ShapeFrameNode.cpp @@ -32,10 +32,6 @@ #include "dart/gui/osg/ShapeFrameNode.hpp" -#include -#include -#include - #include "dart/gui/osg/Utils.hpp" #include "dart/gui/osg/render/BoxShapeNode.hpp" #include "dart/gui/osg/render/CapsuleShapeNode.hpp" @@ -51,6 +47,10 @@ #include "dart/gui/osg/render/ShapeNode.hpp" #include "dart/gui/osg/render/SoftMeshShapeNode.hpp" #include "dart/gui/osg/render/SphereShapeNode.hpp" + +#include +#include +#include #if HAVE_OCTOMAP #include "dart/gui/osg/render/VoxelGridShapeNode.hpp" #endif diff --git a/dart/gui/osg/ShapeFrameNode.hpp b/dart/gui/osg/ShapeFrameNode.hpp index e4145dbb63a00..60e5a599322b6 100644 --- a/dart/gui/osg/ShapeFrameNode.hpp +++ b/dart/gui/osg/ShapeFrameNode.hpp @@ -33,13 +33,13 @@ #ifndef DART_GUI_OSG_SHAPEFRAMENODE_HPP_ #define DART_GUI_OSG_SHAPEFRAMENODE_HPP_ -#include -#include +#include "dart/config.hpp" +#include "dart/dynamics/SmartPointer.hpp" #include -#include "dart/config.hpp" -#include "dart/dynamics/SmartPointer.hpp" +#include +#include namespace dart { namespace dynamics { diff --git a/dart/gui/osg/SupportPolygonVisual.hpp b/dart/gui/osg/SupportPolygonVisual.hpp index d11188652249c..663f8adceda48 100644 --- a/dart/gui/osg/SupportPolygonVisual.hpp +++ b/dart/gui/osg/SupportPolygonVisual.hpp @@ -33,12 +33,12 @@ #ifndef DART_GUI_OSG_SUPPORTPOLYGONVISUAL_HPP_ #define DART_GUI_OSG_SUPPORTPOLYGONVISUAL_HPP_ -#include - #include "dart/dynamics/SmartPointer.hpp" #include "dart/gui/osg/ShapeFrameNode.hpp" #include "dart/gui/osg/Viewer.hpp" +#include + namespace dart { namespace gui { namespace osg { diff --git a/dart/gui/osg/Viewer.cpp b/dart/gui/osg/Viewer.cpp index 493b149b45b29..1f3f79a5e6ced 100644 --- a/dart/gui/osg/Viewer.cpp +++ b/dart/gui/osg/Viewer.cpp @@ -32,11 +32,6 @@ #include "dart/gui/osg/Viewer.hpp" -#include - -#include -#include - #include "dart/dynamics/BodyNode.hpp" #include "dart/dynamics/Shape.hpp" #include "dart/dynamics/SimpleFrame.hpp" @@ -48,6 +43,11 @@ #include "dart/gui/osg/detail/CameraModeCallback.hpp" #include "dart/simulation/World.hpp" +#include +#include + +#include + namespace dart { namespace gui { namespace osg { diff --git a/dart/gui/osg/Viewer.hpp b/dart/gui/osg/Viewer.hpp index 4d7064c0a031a..ac392db7c34e9 100644 --- a/dart/gui/osg/Viewer.hpp +++ b/dart/gui/osg/Viewer.hpp @@ -33,16 +33,16 @@ #ifndef DART_GUI_OSG_VIEWER_HPP_ #define DART_GUI_OSG_VIEWER_HPP_ -#include -#include -#include +#include "dart/common/ClassWithVirtualBase.hpp" +#include "dart/common/Subject.hpp" #include #include #include -#include "dart/common/ClassWithVirtualBase.hpp" -#include "dart/common/Subject.hpp" +#include +#include +#include namespace dart { diff --git a/dart/gui/osg/WorldNode.cpp b/dart/gui/osg/WorldNode.cpp index 23c16dcc765f2..93f05e9ee54b2 100644 --- a/dart/gui/osg/WorldNode.cpp +++ b/dart/gui/osg/WorldNode.cpp @@ -32,16 +32,16 @@ #include "dart/gui/osg/WorldNode.hpp" -#include +#include "dart/dynamics/BodyNode.hpp" +#include "dart/dynamics/Skeleton.hpp" +#include "dart/gui/osg/ShapeFrameNode.hpp" +#include "dart/simulation/World.hpp" #include #include #include -#include "dart/dynamics/BodyNode.hpp" -#include "dart/dynamics/Skeleton.hpp" -#include "dart/gui/osg/ShapeFrameNode.hpp" -#include "dart/simulation/World.hpp" +#include namespace dart { namespace gui { diff --git a/dart/gui/osg/WorldNode.hpp b/dart/gui/osg/WorldNode.hpp index 24550e4a4adbe..3b616a167b450 100644 --- a/dart/gui/osg/WorldNode.hpp +++ b/dart/gui/osg/WorldNode.hpp @@ -33,13 +33,13 @@ #ifndef DART_GUI_OSG_WORLDNODE_HPP_ #define DART_GUI_OSG_WORLDNODE_HPP_ -#include -#include +#include "dart/gui/osg/Viewer.hpp" #include #include -#include "dart/gui/osg/Viewer.hpp" +#include +#include namespace dart { diff --git a/dart/gui/osg/detail/CameraModeCallback.hpp b/dart/gui/osg/detail/CameraModeCallback.hpp index 01f3a2c0a9a80..fc27ba0b904ca 100644 --- a/dart/gui/osg/detail/CameraModeCallback.hpp +++ b/dart/gui/osg/detail/CameraModeCallback.hpp @@ -33,11 +33,11 @@ #ifndef DART_GUI_OSG_DETAIL_CAMERAMODECALLBACK_HPP_ #define DART_GUI_OSG_DETAIL_CAMERAMODECALLBACK_HPP_ -#include +#include "dart/gui/osg/Viewer.hpp" #include -#include "dart/gui/osg/Viewer.hpp" +#include namespace dart::gui::osg::detail { diff --git a/dart/gui/osg/render/BoxShapeNode.cpp b/dart/gui/osg/render/BoxShapeNode.cpp index 5ed5df3531b01..29070085cbf0d 100644 --- a/dart/gui/osg/render/BoxShapeNode.cpp +++ b/dart/gui/osg/render/BoxShapeNode.cpp @@ -32,15 +32,15 @@ #include "dart/gui/osg/render/BoxShapeNode.hpp" +#include "dart/dynamics/BoxShape.hpp" +#include "dart/dynamics/SimpleFrame.hpp" +#include "dart/gui/osg/Utils.hpp" + #include #include #include #include -#include "dart/dynamics/BoxShape.hpp" -#include "dart/dynamics/SimpleFrame.hpp" -#include "dart/gui/osg/Utils.hpp" - namespace dart { namespace gui { namespace osg { diff --git a/dart/gui/osg/render/BoxShapeNode.hpp b/dart/gui/osg/render/BoxShapeNode.hpp index bf267315875f7..44bd874a78e1c 100644 --- a/dart/gui/osg/render/BoxShapeNode.hpp +++ b/dart/gui/osg/render/BoxShapeNode.hpp @@ -33,10 +33,10 @@ #ifndef DART_GUI_OSG_RENDER_BOXSHAPENODE_HPP_ #define DART_GUI_OSG_RENDER_BOXSHAPENODE_HPP_ -#include - #include "dart/gui/osg/render/ShapeNode.hpp" +#include + namespace dart { namespace dynamics { diff --git a/dart/gui/osg/render/CapsuleShapeNode.cpp b/dart/gui/osg/render/CapsuleShapeNode.cpp index 8f05dabd68ce5..aecc8d2f65f1b 100644 --- a/dart/gui/osg/render/CapsuleShapeNode.cpp +++ b/dart/gui/osg/render/CapsuleShapeNode.cpp @@ -32,15 +32,15 @@ #include "dart/gui/osg/render/CapsuleShapeNode.hpp" +#include "dart/dynamics/CapsuleShape.hpp" +#include "dart/dynamics/SimpleFrame.hpp" +#include "dart/gui/osg/Utils.hpp" + #include #include #include #include -#include "dart/dynamics/CapsuleShape.hpp" -#include "dart/dynamics/SimpleFrame.hpp" -#include "dart/gui/osg/Utils.hpp" - namespace dart { namespace gui { namespace osg { diff --git a/dart/gui/osg/render/CapsuleShapeNode.hpp b/dart/gui/osg/render/CapsuleShapeNode.hpp index 37b9d2a077dbc..881f796981791 100644 --- a/dart/gui/osg/render/CapsuleShapeNode.hpp +++ b/dart/gui/osg/render/CapsuleShapeNode.hpp @@ -33,10 +33,10 @@ #ifndef DART_GUI_OSG_RENDER_CAPSULESHAPENODE_HPP_ #define DART_GUI_OSG_RENDER_CAPSULESHAPENODE_HPP_ -#include - #include "dart/gui/osg/render/ShapeNode.hpp" +#include + namespace dart { namespace dynamics { diff --git a/dart/gui/osg/render/ConeShapeNode.cpp b/dart/gui/osg/render/ConeShapeNode.cpp index 4f797f24b8c89..e2c4dadac880e 100644 --- a/dart/gui/osg/render/ConeShapeNode.cpp +++ b/dart/gui/osg/render/ConeShapeNode.cpp @@ -32,15 +32,15 @@ #include "dart/gui/osg/render/ConeShapeNode.hpp" +#include "dart/dynamics/ConeShape.hpp" +#include "dart/dynamics/SimpleFrame.hpp" +#include "dart/gui/osg/Utils.hpp" + #include #include #include #include -#include "dart/dynamics/ConeShape.hpp" -#include "dart/dynamics/SimpleFrame.hpp" -#include "dart/gui/osg/Utils.hpp" - namespace dart { namespace gui { namespace osg { diff --git a/dart/gui/osg/render/ConeShapeNode.hpp b/dart/gui/osg/render/ConeShapeNode.hpp index 07f29bbb58933..8c79267c30b3c 100644 --- a/dart/gui/osg/render/ConeShapeNode.hpp +++ b/dart/gui/osg/render/ConeShapeNode.hpp @@ -33,10 +33,10 @@ #ifndef DART_GUI_OSG_RENDER_CONESHAPENODE_HPP_ #define DART_GUI_OSG_RENDER_CONESHAPENODE_HPP_ -#include - #include "dart/gui/osg/render/ShapeNode.hpp" +#include + namespace dart { namespace dynamics { diff --git a/dart/gui/osg/render/CylinderShapeNode.cpp b/dart/gui/osg/render/CylinderShapeNode.cpp index 414bf8e58e76e..a008bb86d1f47 100644 --- a/dart/gui/osg/render/CylinderShapeNode.cpp +++ b/dart/gui/osg/render/CylinderShapeNode.cpp @@ -32,15 +32,15 @@ #include "dart/gui/osg/render/CylinderShapeNode.hpp" +#include "dart/dynamics/CylinderShape.hpp" +#include "dart/dynamics/SimpleFrame.hpp" +#include "dart/gui/osg/Utils.hpp" + #include #include #include #include -#include "dart/dynamics/CylinderShape.hpp" -#include "dart/dynamics/SimpleFrame.hpp" -#include "dart/gui/osg/Utils.hpp" - namespace dart { namespace gui { namespace osg { diff --git a/dart/gui/osg/render/CylinderShapeNode.hpp b/dart/gui/osg/render/CylinderShapeNode.hpp index ee5537e08fc8c..4fbc6ac0cc1ee 100644 --- a/dart/gui/osg/render/CylinderShapeNode.hpp +++ b/dart/gui/osg/render/CylinderShapeNode.hpp @@ -33,10 +33,10 @@ #ifndef DART_GUI_OSG_RENDER_CYLINDERSHAPENODE_HPP_ #define DART_GUI_OSG_RENDER_CYLINDERSHAPENODE_HPP_ -#include - #include "dart/gui/osg/render/ShapeNode.hpp" +#include + namespace dart { namespace dynamics { diff --git a/dart/gui/osg/render/EllipsoidShapeNode.cpp b/dart/gui/osg/render/EllipsoidShapeNode.cpp index a8871eb84fb4e..682b2c45d31af 100644 --- a/dart/gui/osg/render/EllipsoidShapeNode.cpp +++ b/dart/gui/osg/render/EllipsoidShapeNode.cpp @@ -32,6 +32,10 @@ #include "dart/gui/osg/render/EllipsoidShapeNode.hpp" +#include "dart/dynamics/EllipsoidShape.hpp" +#include "dart/dynamics/SimpleFrame.hpp" +#include "dart/gui/osg/Utils.hpp" + #include #include #include @@ -39,10 +43,6 @@ #include #include -#include "dart/dynamics/EllipsoidShape.hpp" -#include "dart/dynamics/SimpleFrame.hpp" -#include "dart/gui/osg/Utils.hpp" - namespace dart { namespace gui { namespace osg { diff --git a/dart/gui/osg/render/EllipsoidShapeNode.hpp b/dart/gui/osg/render/EllipsoidShapeNode.hpp index 0e83cbf108a7a..0521a09661555 100644 --- a/dart/gui/osg/render/EllipsoidShapeNode.hpp +++ b/dart/gui/osg/render/EllipsoidShapeNode.hpp @@ -33,11 +33,11 @@ #ifndef DART_GUI_OSG_RENDER_ELLIPSOIDSHAPENODE_HPP_ #define DART_GUI_OSG_RENDER_ELLIPSOIDSHAPENODE_HPP_ +#include "dart/gui/osg/render/ShapeNode.hpp" + #include #include -#include "dart/gui/osg/render/ShapeNode.hpp" - namespace dart { namespace dynamics { diff --git a/dart/gui/osg/render/HeightmapShapeNode.hpp b/dart/gui/osg/render/HeightmapShapeNode.hpp index 3c2245cc44fd5..6a4c9029227c0 100644 --- a/dart/gui/osg/render/HeightmapShapeNode.hpp +++ b/dart/gui/osg/render/HeightmapShapeNode.hpp @@ -33,6 +33,12 @@ #ifndef DART_GUI_OSG_RENDER_HEIGHTMAPSHAPENODE_HPP_ #define DART_GUI_OSG_RENDER_HEIGHTMAPSHAPENODE_HPP_ +#include "dart/config.hpp" +#include "dart/dynamics/HeightmapShape.hpp" +#include "dart/dynamics/SimpleFrame.hpp" +#include "dart/gui/osg/Utils.hpp" +#include "dart/gui/osg/render/ShapeNode.hpp" + #include #include #include @@ -41,12 +47,6 @@ #include #include -#include "dart/config.hpp" -#include "dart/dynamics/HeightmapShape.hpp" -#include "dart/dynamics/SimpleFrame.hpp" -#include "dart/gui/osg/Utils.hpp" -#include "dart/gui/osg/render/ShapeNode.hpp" - namespace dart { namespace gui { namespace osg { diff --git a/dart/gui/osg/render/LineSegmentShapeNode.cpp b/dart/gui/osg/render/LineSegmentShapeNode.cpp index 56d79854b3aab..c6e1030e18f18 100644 --- a/dart/gui/osg/render/LineSegmentShapeNode.cpp +++ b/dart/gui/osg/render/LineSegmentShapeNode.cpp @@ -32,6 +32,11 @@ #include "dart/gui/osg/render/LineSegmentShapeNode.hpp" +#include "dart/dynamics/LineSegmentShape.hpp" +#include "dart/dynamics/SimpleFrame.hpp" +#include "dart/gui/osg/ShapeFrameNode.hpp" +#include "dart/gui/osg/Utils.hpp" + #include #include #include @@ -39,11 +44,6 @@ #include #include -#include "dart/dynamics/LineSegmentShape.hpp" -#include "dart/dynamics/SimpleFrame.hpp" -#include "dart/gui/osg/ShapeFrameNode.hpp" -#include "dart/gui/osg/Utils.hpp" - namespace dart { namespace gui { namespace osg { diff --git a/dart/gui/osg/render/LineSegmentShapeNode.hpp b/dart/gui/osg/render/LineSegmentShapeNode.hpp index 0fe3bd50a24fe..f1bd164b80c6d 100644 --- a/dart/gui/osg/render/LineSegmentShapeNode.hpp +++ b/dart/gui/osg/render/LineSegmentShapeNode.hpp @@ -33,10 +33,10 @@ #ifndef DART_GUI_OSG_RENDER_LINESEGMENTSHAPENODE_HPP_ #define DART_GUI_OSG_RENDER_LINESEGMENTSHAPENODE_HPP_ -#include - #include "dart/gui/osg/render/ShapeNode.hpp" +#include + namespace dart { namespace dynamics { diff --git a/dart/gui/osg/render/MeshShapeNode.cpp b/dart/gui/osg/render/MeshShapeNode.cpp index fc08153730f24..96db9460af382 100644 --- a/dart/gui/osg/render/MeshShapeNode.cpp +++ b/dart/gui/osg/render/MeshShapeNode.cpp @@ -32,7 +32,11 @@ #include "dart/gui/osg/render/MeshShapeNode.hpp" -#include +#include "dart/common/Console.hpp" +#include "dart/common/Filesystem.hpp" +#include "dart/dynamics/MeshShape.hpp" +#include "dart/dynamics/SimpleFrame.hpp" +#include "dart/gui/osg/Utils.hpp" #include #include @@ -41,11 +45,7 @@ #include #include -#include "dart/common/Console.hpp" -#include "dart/common/Filesystem.hpp" -#include "dart/dynamics/MeshShape.hpp" -#include "dart/dynamics/SimpleFrame.hpp" -#include "dart/gui/osg/Utils.hpp" +#include namespace dart { namespace gui { diff --git a/dart/gui/osg/render/MeshShapeNode.hpp b/dart/gui/osg/render/MeshShapeNode.hpp index bde1b12201b46..e07756379acc7 100644 --- a/dart/gui/osg/render/MeshShapeNode.hpp +++ b/dart/gui/osg/render/MeshShapeNode.hpp @@ -33,12 +33,12 @@ #ifndef DART_GUI_OSG_RENDER_MESHSHAPENODE_HPP_ #define DART_GUI_OSG_RENDER_MESHSHAPENODE_HPP_ -#include +#include "dart/gui/osg/render/ShapeNode.hpp" #include #include -#include "dart/gui/osg/render/ShapeNode.hpp" +#include struct aiNode; diff --git a/dart/gui/osg/render/MultiSphereShapeNode.cpp b/dart/gui/osg/render/MultiSphereShapeNode.cpp index b56accef35bc1..fe48260b513e3 100644 --- a/dart/gui/osg/render/MultiSphereShapeNode.cpp +++ b/dart/gui/osg/render/MultiSphereShapeNode.cpp @@ -32,6 +32,11 @@ #include "dart/gui/osg/render/MultiSphereShapeNode.hpp" +#include "dart/dynamics/MultiSphereConvexHullShape.hpp" +#include "dart/dynamics/SimpleFrame.hpp" +#include "dart/gui/osg/Utils.hpp" +#include "dart/math/Icosphere.hpp" + #include #include #include @@ -39,11 +44,6 @@ #include #include -#include "dart/dynamics/MultiSphereConvexHullShape.hpp" -#include "dart/dynamics/SimpleFrame.hpp" -#include "dart/gui/osg/Utils.hpp" -#include "dart/math/Icosphere.hpp" - namespace dart { namespace gui { namespace osg { diff --git a/dart/gui/osg/render/MultiSphereShapeNode.hpp b/dart/gui/osg/render/MultiSphereShapeNode.hpp index 55f6221c25dc5..cc6c97f5f191e 100644 --- a/dart/gui/osg/render/MultiSphereShapeNode.hpp +++ b/dart/gui/osg/render/MultiSphereShapeNode.hpp @@ -33,11 +33,11 @@ #ifndef DART_GUI_OSG_RENDER_MULTISPHERESHAPENODE_HPP_ #define DART_GUI_OSG_RENDER_MULTISPHERESHAPENODE_HPP_ +#include "dart/gui/osg/render/ShapeNode.hpp" + #include #include -#include "dart/gui/osg/render/ShapeNode.hpp" - namespace dart { namespace dynamics { diff --git a/dart/gui/osg/render/PlaneShapeNode.cpp b/dart/gui/osg/render/PlaneShapeNode.cpp index d49c4e2db57cc..f46bed41e9a26 100644 --- a/dart/gui/osg/render/PlaneShapeNode.cpp +++ b/dart/gui/osg/render/PlaneShapeNode.cpp @@ -32,15 +32,15 @@ #include "dart/gui/osg/render/PlaneShapeNode.hpp" +#include "dart/dynamics/PlaneShape.hpp" +#include "dart/dynamics/SimpleFrame.hpp" +#include "dart/gui/osg/Utils.hpp" + #include #include #include #include -#include "dart/dynamics/PlaneShape.hpp" -#include "dart/dynamics/SimpleFrame.hpp" -#include "dart/gui/osg/Utils.hpp" - namespace dart { namespace gui { namespace osg { diff --git a/dart/gui/osg/render/PlaneShapeNode.hpp b/dart/gui/osg/render/PlaneShapeNode.hpp index d5033fc0ab369..400d3fa4143ba 100644 --- a/dart/gui/osg/render/PlaneShapeNode.hpp +++ b/dart/gui/osg/render/PlaneShapeNode.hpp @@ -33,10 +33,10 @@ #ifndef DART_GUI_OSG_RENDER_PLANESHAPENODE_HPP_ #define DART_GUI_OSG_RENDER_PLANESHAPENODE_HPP_ -#include - #include "dart/gui/osg/render/ShapeNode.hpp" +#include + namespace dart { namespace dynamics { diff --git a/dart/gui/osg/render/PointCloudShapeNode.cpp b/dart/gui/osg/render/PointCloudShapeNode.cpp index 3d039212d5525..4e97302e4ac39 100644 --- a/dart/gui/osg/render/PointCloudShapeNode.cpp +++ b/dart/gui/osg/render/PointCloudShapeNode.cpp @@ -32,6 +32,11 @@ #include "dart/gui/osg/render/PointCloudShapeNode.hpp" +#include "dart/dynamics/PointCloudShape.hpp" +#include "dart/dynamics/SimpleFrame.hpp" +#include "dart/gui/osg/ShapeFrameNode.hpp" +#include "dart/gui/osg/Utils.hpp" + #include #include #include @@ -42,11 +47,6 @@ #include #include -#include "dart/dynamics/PointCloudShape.hpp" -#include "dart/dynamics/SimpleFrame.hpp" -#include "dart/gui/osg/ShapeFrameNode.hpp" -#include "dart/gui/osg/Utils.hpp" - namespace dart { namespace gui { namespace osg { diff --git a/dart/gui/osg/render/PointCloudShapeNode.hpp b/dart/gui/osg/render/PointCloudShapeNode.hpp index ff7b5aded1576..5bb9d6fb55847 100644 --- a/dart/gui/osg/render/PointCloudShapeNode.hpp +++ b/dart/gui/osg/render/PointCloudShapeNode.hpp @@ -33,12 +33,12 @@ #ifndef DART_GUI_OSG_RENDER_POINTCLOUDSHAPENODE_HPP_ #define DART_GUI_OSG_RENDER_POINTCLOUDSHAPENODE_HPP_ -#include -#include - #include "dart/dynamics/PointCloudShape.hpp" #include "dart/gui/osg/render/ShapeNode.hpp" +#include +#include + namespace dart { namespace dynamics { diff --git a/dart/gui/osg/render/PyramidShapeNode.cpp b/dart/gui/osg/render/PyramidShapeNode.cpp index 4036752bb2033..19a9dbfcc1ada 100644 --- a/dart/gui/osg/render/PyramidShapeNode.cpp +++ b/dart/gui/osg/render/PyramidShapeNode.cpp @@ -32,7 +32,10 @@ #include "dart/gui/osg/render/PyramidShapeNode.hpp" -#include +#include "dart/dynamics/PyramidShape.hpp" +#include "dart/dynamics/SimpleFrame.hpp" +#include "dart/gui/osg/ShapeFrameNode.hpp" +#include "dart/gui/osg/Utils.hpp" #include #include @@ -41,10 +44,7 @@ #include #include -#include "dart/dynamics/PyramidShape.hpp" -#include "dart/dynamics/SimpleFrame.hpp" -#include "dart/gui/osg/ShapeFrameNode.hpp" -#include "dart/gui/osg/Utils.hpp" +#include namespace dart { namespace gui { diff --git a/dart/gui/osg/render/PyramidShapeNode.hpp b/dart/gui/osg/render/PyramidShapeNode.hpp index ec900bd839d96..5587b9808f1cb 100644 --- a/dart/gui/osg/render/PyramidShapeNode.hpp +++ b/dart/gui/osg/render/PyramidShapeNode.hpp @@ -33,10 +33,10 @@ #ifndef DART_GUI_OSG_RENDER_PYRAMIDSHAPENODE_HPP_ #define DART_GUI_OSG_RENDER_PYRAMIDSHAPENODE_HPP_ -#include - #include "dart/gui/osg/render/ShapeNode.hpp" +#include + namespace dart { namespace dynamics { diff --git a/dart/gui/osg/render/ShapeNode.hpp b/dart/gui/osg/render/ShapeNode.hpp index 9a5edd2e4459a..8e104a102ac08 100644 --- a/dart/gui/osg/render/ShapeNode.hpp +++ b/dart/gui/osg/render/ShapeNode.hpp @@ -33,10 +33,10 @@ #ifndef DART_GUI_OSG_RENDER_SHAPEGEODE_HPP_ #define DART_GUI_OSG_RENDER_SHAPEGEODE_HPP_ -#include - #include +#include + namespace dart { namespace dynamics { diff --git a/dart/gui/osg/render/SoftMeshShapeNode.cpp b/dart/gui/osg/render/SoftMeshShapeNode.cpp index 998ddddb85e65..a4b2d2b9e5d35 100644 --- a/dart/gui/osg/render/SoftMeshShapeNode.cpp +++ b/dart/gui/osg/render/SoftMeshShapeNode.cpp @@ -32,17 +32,17 @@ #include "dart/gui/osg/render/SoftMeshShapeNode.hpp" -#include -#include -#include -#include - #include "dart/dynamics/PointMass.hpp" #include "dart/dynamics/SimpleFrame.hpp" #include "dart/dynamics/SoftBodyNode.hpp" #include "dart/dynamics/SoftMeshShape.hpp" #include "dart/gui/osg/Utils.hpp" +#include +#include +#include +#include + namespace dart { namespace gui { namespace osg { diff --git a/dart/gui/osg/render/SoftMeshShapeNode.hpp b/dart/gui/osg/render/SoftMeshShapeNode.hpp index 2025fab87ff26..e7caa5af57f53 100644 --- a/dart/gui/osg/render/SoftMeshShapeNode.hpp +++ b/dart/gui/osg/render/SoftMeshShapeNode.hpp @@ -33,10 +33,10 @@ #ifndef DART_GUI_OSG_RENDER_SOFTMESHSHAPENODE_HPP_ #define DART_GUI_OSG_RENDER_SOFTMESHSHAPENODE_HPP_ -#include - #include "dart/gui/osg/render/ShapeNode.hpp" +#include + namespace dart { namespace dynamics { diff --git a/dart/gui/osg/render/SphereShapeNode.cpp b/dart/gui/osg/render/SphereShapeNode.cpp index 6dd903842b8d2..7a3ca70bff4f6 100644 --- a/dart/gui/osg/render/SphereShapeNode.cpp +++ b/dart/gui/osg/render/SphereShapeNode.cpp @@ -32,6 +32,10 @@ #include "dart/gui/osg/render/SphereShapeNode.hpp" +#include "dart/dynamics/SimpleFrame.hpp" +#include "dart/dynamics/SphereShape.hpp" +#include "dart/gui/osg/Utils.hpp" + #include #include #include @@ -40,10 +44,6 @@ #include #include -#include "dart/dynamics/SimpleFrame.hpp" -#include "dart/dynamics/SphereShape.hpp" -#include "dart/gui/osg/Utils.hpp" - namespace dart { namespace gui { namespace osg { diff --git a/dart/gui/osg/render/SphereShapeNode.hpp b/dart/gui/osg/render/SphereShapeNode.hpp index e88cd2287499a..aabf88557c834 100644 --- a/dart/gui/osg/render/SphereShapeNode.hpp +++ b/dart/gui/osg/render/SphereShapeNode.hpp @@ -33,11 +33,11 @@ #ifndef DART_GUI_OSG_RENDER_SPHERESHAPENODE_HPP_ #define DART_GUI_OSG_RENDER_SPHERESHAPENODE_HPP_ +#include "dart/gui/osg/render/ShapeNode.hpp" + #include #include -#include "dart/gui/osg/render/ShapeNode.hpp" - namespace dart { namespace dynamics { diff --git a/dart/gui/osg/render/VoxelGridShapeNode.cpp b/dart/gui/osg/render/VoxelGridShapeNode.cpp index eaaf7658893de..a4989ead351ec 100644 --- a/dart/gui/osg/render/VoxelGridShapeNode.cpp +++ b/dart/gui/osg/render/VoxelGridShapeNode.cpp @@ -34,6 +34,10 @@ #if HAVE_OCTOMAP + #include "dart/dynamics/SimpleFrame.hpp" + #include "dart/dynamics/VoxelGridShape.hpp" + #include "dart/gui/osg/Utils.hpp" + #include #include #include @@ -41,10 +45,6 @@ #include #include - #include "dart/dynamics/SimpleFrame.hpp" - #include "dart/dynamics/VoxelGridShape.hpp" - #include "dart/gui/osg/Utils.hpp" - namespace dart { namespace gui { namespace osg { diff --git a/dart/gui/osg/render/VoxelGridShapeNode.hpp b/dart/gui/osg/render/VoxelGridShapeNode.hpp index 4571fa80cf2f4..cc618b056a5f5 100644 --- a/dart/gui/osg/render/VoxelGridShapeNode.hpp +++ b/dart/gui/osg/render/VoxelGridShapeNode.hpp @@ -37,11 +37,11 @@ #if HAVE_OCTOMAP + #include "dart/gui/osg/render/ShapeNode.hpp" + #include #include - #include "dart/gui/osg/render/ShapeNode.hpp" - namespace dart { namespace dynamics { diff --git a/dart/gui/osg/render/WarningShapeNode.hpp b/dart/gui/osg/render/WarningShapeNode.hpp index 9d6c5d04852ee..c168b545319de 100644 --- a/dart/gui/osg/render/WarningShapeNode.hpp +++ b/dart/gui/osg/render/WarningShapeNode.hpp @@ -33,11 +33,11 @@ #ifndef DART_GUI_OSG_RENDER_WARNINGSHAPENODE_HPP_ #define DART_GUI_OSG_RENDER_WARNINGSHAPENODE_HPP_ -#include +#include "dart/gui/osg/render/ShapeNode.hpp" #include -#include "dart/gui/osg/render/ShapeNode.hpp" +#include namespace dart { namespace gui { diff --git a/dart/integration/Integrator.hpp b/dart/integration/Integrator.hpp index 5d3d8d50169f8..0312d6e757590 100644 --- a/dart/integration/Integrator.hpp +++ b/dart/integration/Integrator.hpp @@ -33,10 +33,10 @@ #ifndef DART_INTEGRATION_INTEGRATOR_HPP_ #define DART_INTEGRATION_INTEGRATOR_HPP_ -#include - #include +#include + namespace dart { namespace integration { diff --git a/dart/lcpsolver/Lemke.cpp b/dart/lcpsolver/Lemke.cpp index 30b31cb783c54..2758f9b518371 100644 --- a/dart/lcpsolver/Lemke.cpp +++ b/dart/lcpsolver/Lemke.cpp @@ -32,11 +32,12 @@ #include "dart/lcpsolver/Lemke.hpp" -#include +#include "dart/math/Helpers.hpp" + #include #include -#include "dart/math/Helpers.hpp" +#include namespace dart { namespace lcpsolver { diff --git a/dart/lcpsolver/ODELCPSolver.cpp b/dart/lcpsolver/ODELCPSolver.cpp index 33873b078a336..d3e3dccc2d453 100644 --- a/dart/lcpsolver/ODELCPSolver.cpp +++ b/dart/lcpsolver/ODELCPSolver.cpp @@ -32,13 +32,13 @@ #include "dart/lcpsolver/ODELCPSolver.hpp" -#include - #include "dart/common/Macros.hpp" #include "dart/external/odelcpsolver/lcp.h" #include "dart/external/odelcpsolver/misc.h" #include "dart/lcpsolver/Lemke.hpp" +#include + namespace dart { namespace lcpsolver { diff --git a/dart/math/ConfigurationSpace.hpp b/dart/math/ConfigurationSpace.hpp index 86b0fe4e6c982..2884c15cc507d 100644 --- a/dart/math/ConfigurationSpace.hpp +++ b/dart/math/ConfigurationSpace.hpp @@ -33,11 +33,11 @@ #ifndef DART_MATH_CONFIGURATIONSPACE_HPP_ #define DART_MATH_CONFIGURATIONSPACE_HPP_ -#include - #include "dart/math/Geometry.hpp" #include "dart/math/MathTypes.hpp" +#include + namespace dart { namespace math { diff --git a/dart/math/Geometry.cpp b/dart/math/Geometry.cpp index a0108e1327297..aa68fb7639a39 100644 --- a/dart/math/Geometry.cpp +++ b/dart/math/Geometry.cpp @@ -32,15 +32,16 @@ #include "dart/math/Geometry.hpp" +#include "dart/common/Console.hpp" +#include "dart/math/Helpers.hpp" + #include -#include -#include #include #include #include -#include "dart/common/Console.hpp" -#include "dart/math/Helpers.hpp" +#include +#include #define DART_EPSILON 1e-6 diff --git a/dart/math/Geometry.hpp b/dart/math/Geometry.hpp index af37653062f18..bb7c55220417c 100644 --- a/dart/math/Geometry.hpp +++ b/dart/math/Geometry.hpp @@ -33,12 +33,12 @@ #ifndef DART_MATH_GEOMETRY_HPP_ #define DART_MATH_GEOMETRY_HPP_ -#include - #include "dart/common/Deprecated.hpp" #include "dart/math/Constants.hpp" #include "dart/math/MathTypes.hpp" +#include + namespace dart { namespace math { diff --git a/dart/math/Helpers.hpp b/dart/math/Helpers.hpp index 49181838d9245..22929523857c0 100644 --- a/dart/math/Helpers.hpp +++ b/dart/math/Helpers.hpp @@ -34,14 +34,15 @@ #define DART_MATH_HELPERS_HPP_ // Standard Libraries +#include +#include +#include + #include #include #include #include #include -#include -#include -#include // External Libraries #include diff --git a/dart/math/Icosphere.hpp b/dart/math/Icosphere.hpp index db81473bbcfd1..ffe6511c12356 100644 --- a/dart/math/Icosphere.hpp +++ b/dart/math/Icosphere.hpp @@ -33,12 +33,12 @@ #ifndef DART_MATH_ICOSPHERE_HPP_ #define DART_MATH_ICOSPHERE_HPP_ -#include -#include +#include "dart/math/TriMesh.hpp" #include -#include "dart/math/TriMesh.hpp" +#include +#include namespace dart { namespace math { diff --git a/dart/math/MathTypes.hpp b/dart/math/MathTypes.hpp index 28eca419b6cca..7e8edc218f6b3 100644 --- a/dart/math/MathTypes.hpp +++ b/dart/math/MathTypes.hpp @@ -33,13 +33,13 @@ #ifndef DART_MATH_MATHTYPES_HPP_ #define DART_MATH_MATHTYPES_HPP_ -#include -#include +#include "dart/common/Deprecated.hpp" +#include "dart/common/Memory.hpp" #include -#include "dart/common/Deprecated.hpp" -#include "dart/common/Memory.hpp" +#include +#include //------------------------------------------------------------------------------ // Types diff --git a/dart/math/Mesh.hpp b/dart/math/Mesh.hpp index 1f191a916562d..3ae4b822e9e55 100644 --- a/dart/math/Mesh.hpp +++ b/dart/math/Mesh.hpp @@ -33,10 +33,10 @@ #ifndef DART_MATH_MESH_HPP_ #define DART_MATH_MESH_HPP_ -#include - #include +#include + namespace dart { namespace math { diff --git a/dart/math/Random.hpp b/dart/math/Random.hpp index f37e368110085..4051799a43d3d 100644 --- a/dart/math/Random.hpp +++ b/dart/math/Random.hpp @@ -33,10 +33,10 @@ #ifndef DART_MATH_RANDOM_HPP_ #define DART_MATH_RANDOM_HPP_ -#include - #include +#include + namespace dart { namespace math { diff --git a/dart/math/TriMesh.hpp b/dart/math/TriMesh.hpp index 5a2b360cb370f..268db7459f189 100644 --- a/dart/math/TriMesh.hpp +++ b/dart/math/TriMesh.hpp @@ -33,10 +33,10 @@ #ifndef DART_MATH_TRIMESH_HPP_ #define DART_MATH_TRIMESH_HPP_ -#include - #include "dart/math/Mesh.hpp" +#include + namespace dart { namespace math { diff --git a/dart/math/detail/Geometry-impl.hpp b/dart/math/detail/Geometry-impl.hpp index 92f2aa1c25cce..4c01ee4f211ba 100644 --- a/dart/math/detail/Geometry-impl.hpp +++ b/dart/math/detail/Geometry-impl.hpp @@ -33,11 +33,11 @@ #ifndef DART_MATH_DETAIL_GEOMETRY_IMPL_HPP_ #define DART_MATH_DETAIL_GEOMETRY_IMPL_HPP_ -#include - #include "dart/external/convhull_3d/safe_convhull_3d.h" #include "dart/math/Geometry.hpp" +#include + namespace dart { namespace math { diff --git a/dart/math/detail/Icosphere-impl.hpp b/dart/math/detail/Icosphere-impl.hpp index d93d92b5bec90..46d701a54c689 100644 --- a/dart/math/detail/Icosphere-impl.hpp +++ b/dart/math/detail/Icosphere-impl.hpp @@ -30,11 +30,11 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include - #include "dart/math/Constants.hpp" #include "dart/math/Icosphere.hpp" +#include + namespace dart { namespace math { diff --git a/dart/math/detail/TriMesh-impl.hpp b/dart/math/detail/TriMesh-impl.hpp index 7bac0b903168e..ea0c629c086f7 100644 --- a/dart/math/detail/TriMesh-impl.hpp +++ b/dart/math/detail/TriMesh-impl.hpp @@ -33,11 +33,11 @@ #ifndef DART_MATH_DETAIL_TRIMESH_IMPL_HPP_ #define DART_MATH_DETAIL_TRIMESH_IMPL_HPP_ -#include - #include "dart/math/Geometry.hpp" #include "dart/math/TriMesh.hpp" +#include + namespace dart { namespace math { diff --git a/dart/optimizer/Function.hpp b/dart/optimizer/Function.hpp index 954cda686f64c..90c3788f1a4cd 100644 --- a/dart/optimizer/Function.hpp +++ b/dart/optimizer/Function.hpp @@ -33,12 +33,12 @@ #ifndef DART_OPTIMIZER_FUNCTION_HPP_ #define DART_OPTIMIZER_FUNCTION_HPP_ +#include + #include #include #include -#include - namespace dart { namespace optimizer { diff --git a/dart/optimizer/GenericMultiObjectiveProblem.cpp b/dart/optimizer/GenericMultiObjectiveProblem.cpp index 90963f05ebe50..3edcd3efe6172 100644 --- a/dart/optimizer/GenericMultiObjectiveProblem.cpp +++ b/dart/optimizer/GenericMultiObjectiveProblem.cpp @@ -32,14 +32,14 @@ #include "dart/optimizer/GenericMultiObjectiveProblem.hpp" -#include -#include -#include - #include "dart/common/Console.hpp" #include "dart/math/Helpers.hpp" #include "dart/optimizer/Function.hpp" +#include +#include +#include + namespace dart { namespace optimizer { diff --git a/dart/optimizer/GenericMultiObjectiveProblem.hpp b/dart/optimizer/GenericMultiObjectiveProblem.hpp index e1b85f797371a..6ac4dc9d42f40 100644 --- a/dart/optimizer/GenericMultiObjectiveProblem.hpp +++ b/dart/optimizer/GenericMultiObjectiveProblem.hpp @@ -33,13 +33,14 @@ #ifndef DART_OPTIMIZER_GENERICMULTIOBJECTIVEPROBLEM_HPP_ #define DART_OPTIMIZER_GENERICMULTIOBJECTIVEPROBLEM_HPP_ -#include -#include +#include "dart/optimizer/Function.hpp" +#include "dart/optimizer/MultiObjectiveProblem.hpp" #include -#include "dart/optimizer/Function.hpp" -#include "dart/optimizer/MultiObjectiveProblem.hpp" +#include + +#include namespace dart { namespace optimizer { diff --git a/dart/optimizer/GradientDescentSolver.cpp b/dart/optimizer/GradientDescentSolver.cpp index c7017825f2f43..9256d2949aff2 100644 --- a/dart/optimizer/GradientDescentSolver.cpp +++ b/dart/optimizer/GradientDescentSolver.cpp @@ -32,12 +32,12 @@ #include "dart/optimizer/GradientDescentSolver.hpp" -#include - #include "dart/common/Console.hpp" #include "dart/math/Helpers.hpp" #include "dart/optimizer/Problem.hpp" +#include + namespace dart { namespace optimizer { diff --git a/dart/optimizer/GradientDescentSolver.hpp b/dart/optimizer/GradientDescentSolver.hpp index 6981474596782..8901e3a3073ba 100644 --- a/dart/optimizer/GradientDescentSolver.hpp +++ b/dart/optimizer/GradientDescentSolver.hpp @@ -33,10 +33,10 @@ #ifndef DART_OPTIMIZER_GRADIENTDESCENTSOLVER_HPP_ #define DART_OPTIMIZER_GRADIENTDESCENTSOLVER_HPP_ -#include - #include "dart/optimizer/Solver.hpp" +#include + namespace dart { namespace optimizer { diff --git a/dart/optimizer/MultiObjectiveProblem.cpp b/dart/optimizer/MultiObjectiveProblem.cpp index b5cd9544b89ba..6e86f0ee1a082 100644 --- a/dart/optimizer/MultiObjectiveProblem.cpp +++ b/dart/optimizer/MultiObjectiveProblem.cpp @@ -32,14 +32,14 @@ #include "dart/optimizer/MultiObjectiveProblem.hpp" -#include -#include -#include - #include "dart/common/Console.hpp" #include "dart/math/Helpers.hpp" #include "dart/optimizer/Function.hpp" +#include +#include +#include + namespace dart { namespace optimizer { diff --git a/dart/optimizer/MultiObjectiveProblem.hpp b/dart/optimizer/MultiObjectiveProblem.hpp index 4363fd082b451..c07dc58955639 100644 --- a/dart/optimizer/MultiObjectiveProblem.hpp +++ b/dart/optimizer/MultiObjectiveProblem.hpp @@ -33,12 +33,13 @@ #ifndef DART_OPTIMIZER_MULTIOBJECTIVEPROBLEM_HPP_ #define DART_OPTIMIZER_MULTIOBJECTIVEPROBLEM_HPP_ -#include -#include +#include "dart/optimizer/Function.hpp" #include -#include "dart/optimizer/Function.hpp" +#include + +#include namespace dart { namespace optimizer { diff --git a/dart/optimizer/MultiObjectiveSolver.cpp b/dart/optimizer/MultiObjectiveSolver.cpp index 579a86d8b6de4..4215f78e143fe 100644 --- a/dart/optimizer/MultiObjectiveSolver.cpp +++ b/dart/optimizer/MultiObjectiveSolver.cpp @@ -32,11 +32,11 @@ #include "dart/optimizer/MultiObjectiveSolver.hpp" -#include - #include "dart/common/Console.hpp" #include "dart/optimizer/MultiObjectiveProblem.hpp" +#include + namespace dart { namespace optimizer { diff --git a/dart/optimizer/MultiObjectiveSolver.hpp b/dart/optimizer/MultiObjectiveSolver.hpp index 2dee300ff25df..8b6b343bd704f 100644 --- a/dart/optimizer/MultiObjectiveSolver.hpp +++ b/dart/optimizer/MultiObjectiveSolver.hpp @@ -33,13 +33,13 @@ #ifndef DART_OPTIMIZER_MULTIOBJECTIVESOLVER_HPP_ #define DART_OPTIMIZER_MULTIOBJECTIVESOLVER_HPP_ -#include -#include -#include +#include "dart/optimizer/Population.hpp" #include -#include "dart/optimizer/Population.hpp" +#include +#include +#include namespace dart { namespace optimizer { diff --git a/dart/optimizer/Population.hpp b/dart/optimizer/Population.hpp index 3827c1893d93b..5aae507af06db 100644 --- a/dart/optimizer/Population.hpp +++ b/dart/optimizer/Population.hpp @@ -33,13 +33,13 @@ #ifndef DART_OPTIMIZER_POPULATION_HPP_ #define DART_OPTIMIZER_POPULATION_HPP_ -#include -#include -#include +#include "dart/optimizer/MultiObjectiveProblem.hpp" #include -#include "dart/optimizer/MultiObjectiveProblem.hpp" +#include +#include +#include namespace dart { namespace optimizer { diff --git a/dart/optimizer/Problem.cpp b/dart/optimizer/Problem.cpp index f7cddc8c9a75a..1f059ea4c370e 100644 --- a/dart/optimizer/Problem.cpp +++ b/dart/optimizer/Problem.cpp @@ -32,13 +32,13 @@ #include "dart/optimizer/Problem.hpp" -#include -#include - #include "dart/common/Console.hpp" #include "dart/math/Helpers.hpp" #include "dart/optimizer/Function.hpp" +#include +#include + namespace dart { namespace optimizer { diff --git a/dart/optimizer/Problem.hpp b/dart/optimizer/Problem.hpp index a8e2b44cf077c..0f7759b5f41a1 100644 --- a/dart/optimizer/Problem.hpp +++ b/dart/optimizer/Problem.hpp @@ -33,12 +33,13 @@ #ifndef DART_OPTIMIZER_PROBLEM_HPP_ #define DART_OPTIMIZER_PROBLEM_HPP_ -#include -#include +#include "dart/optimizer/Function.hpp" #include -#include "dart/optimizer/Function.hpp" +#include + +#include namespace dart { namespace optimizer { diff --git a/dart/optimizer/Solver.hpp b/dart/optimizer/Solver.hpp index b3811f44b6717..c1cb526ed173c 100644 --- a/dart/optimizer/Solver.hpp +++ b/dart/optimizer/Solver.hpp @@ -33,11 +33,11 @@ #ifndef DART_OPTIMIZER_SOLVER_HPP_ #define DART_OPTIMIZER_SOLVER_HPP_ +#include + #include #include -#include - namespace dart { namespace optimizer { diff --git a/dart/optimizer/ipopt/IpoptSolver.hpp b/dart/optimizer/ipopt/IpoptSolver.hpp index 652081e34441d..41d06485fa8b4 100644 --- a/dart/optimizer/ipopt/IpoptSolver.hpp +++ b/dart/optimizer/ipopt/IpoptSolver.hpp @@ -33,9 +33,9 @@ #ifndef DART_OPTIMIZER_IPOPT_IPOPTSOLVER_HPP_ #define DART_OPTIMIZER_IPOPT_IPOPTSOLVER_HPP_ -#include - #include "dart/optimizer/ipopt/BackwardCompatibility.hpp" + +#include #if IPOPT_VERSION_GE(3, 13, 0) #include #include diff --git a/dart/optimizer/nlopt/NloptSolver.cpp b/dart/optimizer/nlopt/NloptSolver.cpp index ff33d3bb02e0d..0a677d4d66ca3 100644 --- a/dart/optimizer/nlopt/NloptSolver.cpp +++ b/dart/optimizer/nlopt/NloptSolver.cpp @@ -32,15 +32,15 @@ #include "dart/optimizer/nlopt/NloptSolver.hpp" -#include - -#include - #include "dart/common/Console.hpp" #include "dart/common/StlHelpers.hpp" #include "dart/optimizer/Function.hpp" #include "dart/optimizer/Problem.hpp" +#include + +#include + namespace dart { namespace optimizer { diff --git a/dart/optimizer/nlopt/NloptSolver.hpp b/dart/optimizer/nlopt/NloptSolver.hpp index 00f2ca879ba89..f9d674455605c 100644 --- a/dart/optimizer/nlopt/NloptSolver.hpp +++ b/dart/optimizer/nlopt/NloptSolver.hpp @@ -33,11 +33,11 @@ #ifndef DART_OPTIMIZER_NLOPT_NLOPTSOLVER_HPP_ #define DART_OPTIMIZER_NLOPT_NLOPTSOLVER_HPP_ -#include - #include "dart/common/Deprecated.hpp" #include "dart/optimizer/Solver.hpp" +#include + namespace dart { namespace optimizer { diff --git a/dart/simulation/Recording.cpp b/dart/simulation/Recording.cpp index e9379542d18e4..013dd4f08ffb7 100644 --- a/dart/simulation/Recording.cpp +++ b/dart/simulation/Recording.cpp @@ -38,10 +38,10 @@ #include "dart/simulation/Recording.hpp" -#include - #include "dart/dynamics/Skeleton.hpp" +#include + namespace dart { namespace simulation { diff --git a/dart/simulation/Recording.hpp b/dart/simulation/Recording.hpp index d79c799383394..5ce5bbc10285b 100644 --- a/dart/simulation/Recording.hpp +++ b/dart/simulation/Recording.hpp @@ -39,11 +39,11 @@ #ifndef DART_SIMULATION_RECORDING_HPP_ #define DART_SIMULATION_RECORDING_HPP_ -#include +#include "dart/dynamics/Skeleton.hpp" #include -#include "dart/dynamics/Skeleton.hpp" +#include namespace dart { diff --git a/dart/simulation/World.cpp b/dart/simulation/World.cpp index 5f37742c22437..fb169b4e54982 100644 --- a/dart/simulation/World.cpp +++ b/dart/simulation/World.cpp @@ -38,10 +38,6 @@ #include "dart/simulation/World.hpp" -#include -#include -#include - #include "dart/collision/CollisionGroup.hpp" #include "dart/common/Console.hpp" #include "dart/constraint/BoxedLcpConstraintSolver.hpp" @@ -49,6 +45,10 @@ #include "dart/dynamics/Skeleton.hpp" #include "dart/integration/SemiImplicitEulerIntegrator.hpp" +#include +#include +#include + namespace dart { namespace simulation { diff --git a/dart/simulation/World.hpp b/dart/simulation/World.hpp index 27e4897b80418..6ee3f333a6fb3 100644 --- a/dart/simulation/World.hpp +++ b/dart/simulation/World.hpp @@ -39,12 +39,6 @@ #ifndef DART_SIMULATION_WORLD_HPP_ #define DART_SIMULATION_WORLD_HPP_ -#include -#include -#include - -#include - #include "dart/collision/CollisionOption.hpp" #include "dart/common/NameManager.hpp" #include "dart/common/SmartPointer.hpp" @@ -55,6 +49,12 @@ #include "dart/simulation/Recording.hpp" #include "dart/simulation/SmartPointer.hpp" +#include + +#include +#include +#include + namespace dart { namespace integration { diff --git a/dart/utils/C3D.hpp b/dart/utils/C3D.hpp index 04d43d7dbcd45..9508c7e4cfba4 100644 --- a/dart/utils/C3D.hpp +++ b/dart/utils/C3D.hpp @@ -33,12 +33,13 @@ #ifndef DART_UTILS_C3D_HPP_ #define DART_UTILS_C3D_HPP_ -#include -#include +#include "dart/math/MathTypes.hpp" #include -#include "dart/math/MathTypes.hpp" +#include + +#include //////////////////////////////////////////////////////////////////////////////// // C3D file reader and writer diff --git a/dart/utils/CompositeResourceRetriever.cpp b/dart/utils/CompositeResourceRetriever.cpp index 92944a5037769..25b1a1ffc215c 100644 --- a/dart/utils/CompositeResourceRetriever.cpp +++ b/dart/utils/CompositeResourceRetriever.cpp @@ -32,11 +32,11 @@ #include "dart/utils/CompositeResourceRetriever.hpp" -#include - #include "dart/common/Console.hpp" #include "dart/common/Uri.hpp" +#include + namespace dart { namespace utils { diff --git a/dart/utils/CompositeResourceRetriever.hpp b/dart/utils/CompositeResourceRetriever.hpp index 1498e17eb09af..a37fe2d5a66a4 100644 --- a/dart/utils/CompositeResourceRetriever.hpp +++ b/dart/utils/CompositeResourceRetriever.hpp @@ -33,12 +33,12 @@ #ifndef DART_UTILS_COMPOSITERESOURCERETRIEVER_HPP_ #define DART_UTILS_COMPOSITERESOURCERETRIEVER_HPP_ -#include -#include - #include "dart/common/ClassWithVirtualBase.hpp" #include "dart/common/ResourceRetriever.hpp" +#include +#include + namespace dart { namespace utils { diff --git a/dart/utils/DartResourceRetriever.cpp b/dart/utils/DartResourceRetriever.cpp index 326cd1c4b7144..743fd092ffdde 100644 --- a/dart/utils/DartResourceRetriever.cpp +++ b/dart/utils/DartResourceRetriever.cpp @@ -32,14 +32,15 @@ #include "dart/utils/DartResourceRetriever.hpp" -#include -#include -#include - #include "dart/common/Console.hpp" #include "dart/common/LocalResourceRetriever.hpp" #include "dart/config.hpp" +#include +#include + +#include + namespace dart { namespace utils { diff --git a/dart/utils/DartResourceRetriever.hpp b/dart/utils/DartResourceRetriever.hpp index d64ceaf7c6daa..d88fafed66e99 100644 --- a/dart/utils/DartResourceRetriever.hpp +++ b/dart/utils/DartResourceRetriever.hpp @@ -33,11 +33,11 @@ #ifndef DART_UTILS_DARTRESOURCERETRIEVER_HPP_ #define DART_UTILS_DARTRESOURCERETRIEVER_HPP_ +#include "dart/common/ResourceRetriever.hpp" + #include #include -#include "dart/common/ResourceRetriever.hpp" - namespace dart { namespace utils { diff --git a/dart/utils/FileInfoC3D.cpp b/dart/utils/FileInfoC3D.cpp index a6642fe0d231d..a1f2a7ac760c2 100644 --- a/dart/utils/FileInfoC3D.cpp +++ b/dart/utils/FileInfoC3D.cpp @@ -32,10 +32,10 @@ #include "dart/utils/FileInfoC3D.hpp" -#include - #include "dart/utils/C3D.hpp" +#include + namespace dart { namespace utils { diff --git a/dart/utils/FileInfoC3D.hpp b/dart/utils/FileInfoC3D.hpp index e6ed3e4244a5b..279752740b95f 100644 --- a/dart/utils/FileInfoC3D.hpp +++ b/dart/utils/FileInfoC3D.hpp @@ -33,11 +33,11 @@ #ifndef DART_UTILS_FILEINFOC3D_HPP_ #define DART_UTILS_FILEINFOC3D_HPP_ -#include +#include "dart/math/MathTypes.hpp" #include -#include "dart/math/MathTypes.hpp" +#include namespace dart { namespace utils { diff --git a/dart/utils/FileInfoDof.cpp b/dart/utils/FileInfoDof.cpp index ee2527775496f..135579a30ac85 100644 --- a/dart/utils/FileInfoDof.cpp +++ b/dart/utils/FileInfoDof.cpp @@ -32,14 +32,14 @@ #include "dart/utils/FileInfoDof.hpp" -#include -#include - #include "dart/dynamics/DegreeOfFreedom.hpp" #include "dart/dynamics/Joint.hpp" #include "dart/dynamics/Skeleton.hpp" #include "dart/simulation/Recording.hpp" +#include +#include + namespace dart { namespace utils { diff --git a/dart/utils/FileInfoDof.hpp b/dart/utils/FileInfoDof.hpp index 0bfebff5b973b..76d998b11ab24 100644 --- a/dart/utils/FileInfoDof.hpp +++ b/dart/utils/FileInfoDof.hpp @@ -33,10 +33,10 @@ #ifndef DART_UTILS_FILEINFODOF_HPP_ #define DART_UTILS_FILEINFODOF_HPP_ -#include - #include +#include + namespace dart { namespace dynamics { diff --git a/dart/utils/FileInfoWorld.cpp b/dart/utils/FileInfoWorld.cpp index 8ab7578dbd75b..c056cbfad6e72 100644 --- a/dart/utils/FileInfoWorld.cpp +++ b/dart/utils/FileInfoWorld.cpp @@ -32,11 +32,11 @@ #include "dart/utils/FileInfoWorld.hpp" +#include "dart/simulation/Recording.hpp" + #include #include -#include "dart/simulation/Recording.hpp" - namespace dart { namespace utils { diff --git a/dart/utils/PackageResourceRetriever.cpp b/dart/utils/PackageResourceRetriever.cpp index 49bce1380a074..1852205d41dd4 100644 --- a/dart/utils/PackageResourceRetriever.cpp +++ b/dart/utils/PackageResourceRetriever.cpp @@ -32,14 +32,15 @@ #include "dart/utils/PackageResourceRetriever.hpp" -#include -#include -#include - #include "dart/common/Console.hpp" #include "dart/common/LocalResourceRetriever.hpp" #include "dart/common/Uri.hpp" +#include +#include + +#include + namespace dart { namespace utils { diff --git a/dart/utils/PackageResourceRetriever.hpp b/dart/utils/PackageResourceRetriever.hpp index 0921ff229fea7..521581d757f3d 100644 --- a/dart/utils/PackageResourceRetriever.hpp +++ b/dart/utils/PackageResourceRetriever.hpp @@ -33,12 +33,12 @@ #ifndef DART_UTILS_PACKAGERESOURCERETRIEVER_HPP_ #define DART_UTILS_PACKAGERESOURCERETRIEVER_HPP_ -#include -#include - #include "dart/common/ClassWithVirtualBase.hpp" #include "dart/common/ResourceRetriever.hpp" +#include +#include + namespace dart { namespace utils { diff --git a/dart/utils/SkelParser.cpp b/dart/utils/SkelParser.cpp index a303c7e02261c..04a2c1bf18649 100644 --- a/dart/utils/SkelParser.cpp +++ b/dart/utils/SkelParser.cpp @@ -32,13 +32,6 @@ #include "dart/utils/SkelParser.hpp" -#include -#include -#include - -#include -#include - #include "dart/collision/CollisionObject.hpp" #include "dart/collision/dart/DARTCollisionDetector.hpp" #include "dart/collision/fcl/FCLCollisionDetector.hpp" @@ -77,6 +70,14 @@ #include "dart/utils/DartResourceRetriever.hpp" #include "dart/utils/XmlHelpers.hpp" +#include +#include + +#include +#include + +#include + namespace dart { namespace utils { diff --git a/dart/utils/SkelParser.hpp b/dart/utils/SkelParser.hpp index 66c5cfdc632d8..a2583f184300c 100644 --- a/dart/utils/SkelParser.hpp +++ b/dart/utils/SkelParser.hpp @@ -33,12 +33,12 @@ #ifndef DART_UTILS_SKELPARSER_HPP_ #define DART_UTILS_SKELPARSER_HPP_ -#include - #include "dart/common/LocalResourceRetriever.hpp" #include "dart/common/Uri.hpp" #include "dart/simulation/World.hpp" +#include + namespace dart { namespace utils { diff --git a/dart/utils/VskParser.cpp b/dart/utils/VskParser.cpp index a4c8c446b5009..de2f10af8d1be 100644 --- a/dart/utils/VskParser.cpp +++ b/dart/utils/VskParser.cpp @@ -33,12 +33,12 @@ #include "dart/utils/VskParser.hpp" // Standard Library +#include + #include #include #include -#include - // Local Files #include "dart/common/LocalResourceRetriever.hpp" #include "dart/common/Uri.hpp" diff --git a/dart/utils/XmlHelpers.cpp b/dart/utils/XmlHelpers.cpp index be573af59b2cf..58a5f3fad7415 100644 --- a/dart/utils/XmlHelpers.cpp +++ b/dart/utils/XmlHelpers.cpp @@ -32,15 +32,15 @@ #include "dart/utils/XmlHelpers.hpp" -#include -#include - -#include - #include "dart/common/Console.hpp" #include "dart/common/LocalResourceRetriever.hpp" #include "dart/math/Geometry.hpp" +#include + +#include +#include + namespace dart { namespace utils { diff --git a/dart/utils/XmlHelpers.hpp b/dart/utils/XmlHelpers.hpp index 206541a5dc9e3..46b643a64e192 100644 --- a/dart/utils/XmlHelpers.hpp +++ b/dart/utils/XmlHelpers.hpp @@ -33,12 +33,6 @@ #ifndef DART_UTILS_XMLHELPERS_HPP_ #define DART_UTILS_XMLHELPERS_HPP_ -#include - -#include -#include -#include - #include "dart/common/Console.hpp" #include "dart/common/Deprecated.hpp" #include "dart/common/Logging.hpp" @@ -46,6 +40,12 @@ #include "dart/math/Geometry.hpp" #include "dart/math/MathTypes.hpp" +#include +#include +#include + +#include + namespace dart { namespace utils { diff --git a/dart/utils/mjcf/MjcfParser.cpp b/dart/utils/mjcf/MjcfParser.cpp index fa8e209104992..00fa95788f44c 100644 --- a/dart/utils/mjcf/MjcfParser.cpp +++ b/dart/utils/mjcf/MjcfParser.cpp @@ -32,12 +32,6 @@ #include "dart/utils/mjcf/MjcfParser.hpp" -#include -#include -#include - -#include - #include "dart/collision/collision.hpp" #include "dart/common/common.hpp" #include "dart/config.hpp" @@ -50,6 +44,13 @@ #include "dart/utils/mjcf/detail/Utils.hpp" #include "dart/utils/mjcf/detail/Worldbody.hpp" +#include + +#include +#include + +#include + namespace dart { namespace utils { namespace MjcfParser { diff --git a/dart/utils/mjcf/MjcfParser.hpp b/dart/utils/mjcf/MjcfParser.hpp index abf8f94757c6c..0ca44922bd693 100644 --- a/dart/utils/mjcf/MjcfParser.hpp +++ b/dart/utils/mjcf/MjcfParser.hpp @@ -33,12 +33,12 @@ #ifndef DART_UTILS_MJCFPARSER_HPP_ #define DART_UTILS_MJCFPARSER_HPP_ -#include - #include "dart/common/LocalResourceRetriever.hpp" #include "dart/common/Uri.hpp" #include "dart/simulation/World.hpp" +#include + namespace dart { namespace utils { namespace MjcfParser { diff --git a/dart/utils/mjcf/detail/Asset.hpp b/dart/utils/mjcf/detail/Asset.hpp index e593970ab94df..21c0fdaba2b9e 100644 --- a/dart/utils/mjcf/detail/Asset.hpp +++ b/dart/utils/mjcf/detail/Asset.hpp @@ -33,15 +33,15 @@ #ifndef DART_UTILS_MJCF_DETAIL_ASSET_HPP_ #define DART_UTILS_MJCF_DETAIL_ASSET_HPP_ -#include -#include - -#include - #include "dart/utils/mjcf/detail/Compiler.hpp" #include "dart/utils/mjcf/detail/Error.hpp" #include "dart/utils/mjcf/detail/Mesh.hpp" +#include + +#include +#include + namespace dart { namespace utils { namespace MjcfParser { diff --git a/dart/utils/mjcf/detail/Body.hpp b/dart/utils/mjcf/detail/Body.hpp index aec98ddbf9677..5b25dbf711743 100644 --- a/dart/utils/mjcf/detail/Body.hpp +++ b/dart/utils/mjcf/detail/Body.hpp @@ -33,8 +33,6 @@ #ifndef DART_UTILS_MJCF_DETAIL_BODY_HPP_ #define DART_UTILS_MJCF_DETAIL_BODY_HPP_ -#include - #include "dart/utils/mjcf/detail/BodyAttributes.hpp" #include "dart/utils/mjcf/detail/Compiler.hpp" #include "dart/utils/mjcf/detail/Error.hpp" @@ -43,6 +41,8 @@ #include "dart/utils/mjcf/detail/Joint.hpp" #include "dart/utils/mjcf/detail/Site.hpp" +#include + namespace dart { namespace utils { namespace MjcfParser { diff --git a/dart/utils/mjcf/detail/BodyAttributes.hpp b/dart/utils/mjcf/detail/BodyAttributes.hpp index 6f9b2874d34a7..43832e767801b 100644 --- a/dart/utils/mjcf/detail/BodyAttributes.hpp +++ b/dart/utils/mjcf/detail/BodyAttributes.hpp @@ -33,16 +33,16 @@ #ifndef DART_UTILS_MJCF_DETAIL_BODYATTRIBUTES_HPP_ #define DART_UTILS_MJCF_DETAIL_BODYATTRIBUTES_HPP_ -#include - -#include -#include - #include "dart/common/Optional.hpp" #include "dart/math/MathTypes.hpp" #include "dart/utils/mjcf/detail/Error.hpp" #include "dart/utils/mjcf/detail/Inertial.hpp" +#include +#include + +#include + namespace dart { namespace utils { namespace MjcfParser { diff --git a/dart/utils/mjcf/detail/Compiler.hpp b/dart/utils/mjcf/detail/Compiler.hpp index 7deaf4f86e9a6..65ba19590b8b0 100644 --- a/dart/utils/mjcf/detail/Compiler.hpp +++ b/dart/utils/mjcf/detail/Compiler.hpp @@ -33,15 +33,15 @@ #ifndef DART_UTILS_MJCF_DETAIL_COMPILER_HPP_ #define DART_UTILS_MJCF_DETAIL_COMPILER_HPP_ -#include -#include - #include "dart/common/Platform.hpp" #include "dart/common/ResourceRetriever.hpp" #include "dart/common/Uri.hpp" #include "dart/utils/mjcf/detail/Error.hpp" #include "dart/utils/mjcf/detail/Types.hpp" +#include +#include + namespace dart { namespace utils { namespace MjcfParser { diff --git a/dart/utils/mjcf/detail/Default.hpp b/dart/utils/mjcf/detail/Default.hpp index b1c606fa21d8e..e094ef32c4982 100644 --- a/dart/utils/mjcf/detail/Default.hpp +++ b/dart/utils/mjcf/detail/Default.hpp @@ -33,11 +33,6 @@ #ifndef DART_UTILS_MJCF_DETAIL_DEFAULT_HPP_ #define DART_UTILS_MJCF_DETAIL_DEFAULT_HPP_ -#include -#include - -#include - #include "dart/common/Optional.hpp" #include "dart/utils/mjcf/detail/Error.hpp" #include "dart/utils/mjcf/detail/GeomAttributes.hpp" @@ -45,6 +40,11 @@ #include "dart/utils/mjcf/detail/MeshAttributes.hpp" #include "dart/utils/mjcf/detail/WeldAttributes.hpp" +#include + +#include +#include + namespace dart { namespace utils { namespace MjcfParser { diff --git a/dart/utils/mjcf/detail/Equality.hpp b/dart/utils/mjcf/detail/Equality.hpp index 49cd516610459..f28e74d615867 100644 --- a/dart/utils/mjcf/detail/Equality.hpp +++ b/dart/utils/mjcf/detail/Equality.hpp @@ -33,12 +33,12 @@ #ifndef DART_UTILS_MJCF_DETAIL_EQUALITY_HPP_ #define DART_UTILS_MJCF_DETAIL_EQUALITY_HPP_ -#include +#include "dart/utils/mjcf/detail/Error.hpp" +#include "dart/utils/mjcf/detail/Weld.hpp" #include -#include "dart/utils/mjcf/detail/Error.hpp" -#include "dart/utils/mjcf/detail/Weld.hpp" +#include namespace dart { namespace utils { diff --git a/dart/utils/mjcf/detail/Geom.hpp b/dart/utils/mjcf/detail/Geom.hpp index c828b2c824b19..d48627e999fff 100644 --- a/dart/utils/mjcf/detail/Geom.hpp +++ b/dart/utils/mjcf/detail/Geom.hpp @@ -33,14 +33,14 @@ #ifndef DART_UTILS_MJCF_DETAIL_GEOM_HPP_ #define DART_UTILS_MJCF_DETAIL_GEOM_HPP_ -#include - #include "dart/utils/mjcf/detail/Compiler.hpp" #include "dart/utils/mjcf/detail/Default.hpp" #include "dart/utils/mjcf/detail/Error.hpp" #include "dart/utils/mjcf/detail/GeomAttributes.hpp" #include "dart/utils/mjcf/detail/Types.hpp" +#include + namespace dart { namespace utils { namespace MjcfParser { diff --git a/dart/utils/mjcf/detail/GeomAttributes.hpp b/dart/utils/mjcf/detail/GeomAttributes.hpp index 0fa37acd8a37a..edf725978901a 100644 --- a/dart/utils/mjcf/detail/GeomAttributes.hpp +++ b/dart/utils/mjcf/detail/GeomAttributes.hpp @@ -33,14 +33,14 @@ #ifndef DART_UTILS_MJCF_DETAIL_GEOMATTRIBUTES_HPP_ #define DART_UTILS_MJCF_DETAIL_GEOMATTRIBUTES_HPP_ -#include -#include - #include "dart/common/Optional.hpp" #include "dart/math/MathTypes.hpp" #include "dart/utils/mjcf/detail/Error.hpp" #include "dart/utils/mjcf/detail/Types.hpp" +#include +#include + namespace dart { namespace utils { namespace MjcfParser { diff --git a/dart/utils/mjcf/detail/Inertial.hpp b/dart/utils/mjcf/detail/Inertial.hpp index dd07b248c309c..ed6a2b8eb45e3 100644 --- a/dart/utils/mjcf/detail/Inertial.hpp +++ b/dart/utils/mjcf/detail/Inertial.hpp @@ -33,13 +33,13 @@ #ifndef DART_UTILS_MJCF_DETAIL_INERTIAL_HPP_ #define DART_UTILS_MJCF_DETAIL_INERTIAL_HPP_ -#include - #include "dart/common/Optional.hpp" #include "dart/math/MathTypes.hpp" #include "dart/utils/mjcf/detail/Compiler.hpp" #include "dart/utils/mjcf/detail/Error.hpp" +#include + namespace dart { namespace utils { namespace MjcfParser { diff --git a/dart/utils/mjcf/detail/Joint.hpp b/dart/utils/mjcf/detail/Joint.hpp index 875dab7d867a6..6a8ee79b0f5d2 100644 --- a/dart/utils/mjcf/detail/Joint.hpp +++ b/dart/utils/mjcf/detail/Joint.hpp @@ -33,14 +33,14 @@ #ifndef DART_UTILS_MJCF_DETAIL_JOINT_HPP_ #define DART_UTILS_MJCF_DETAIL_JOINT_HPP_ -#include - #include "dart/utils/mjcf/detail/Compiler.hpp" #include "dart/utils/mjcf/detail/Default.hpp" #include "dart/utils/mjcf/detail/Error.hpp" #include "dart/utils/mjcf/detail/JointAttributes.hpp" #include "dart/utils/mjcf/detail/Types.hpp" +#include + namespace dart { namespace utils { namespace MjcfParser { diff --git a/dart/utils/mjcf/detail/JointAttributes.hpp b/dart/utils/mjcf/detail/JointAttributes.hpp index 372cd04fd380e..dbe1f9fbcedf9 100644 --- a/dart/utils/mjcf/detail/JointAttributes.hpp +++ b/dart/utils/mjcf/detail/JointAttributes.hpp @@ -33,13 +33,13 @@ #ifndef DART_UTILS_MJCF_DETAIL_JOINTATTRIBUTES_HPP_ #define DART_UTILS_MJCF_DETAIL_JOINTATTRIBUTES_HPP_ -#include -#include - #include "dart/common/Optional.hpp" #include "dart/utils/mjcf/detail/Error.hpp" #include "dart/utils/mjcf/detail/Types.hpp" +#include +#include + namespace dart { namespace utils { namespace MjcfParser { diff --git a/dart/utils/mjcf/detail/Mesh.cpp b/dart/utils/mjcf/detail/Mesh.cpp index 48b753ef2f827..4557f69178e42 100644 --- a/dart/utils/mjcf/detail/Mesh.cpp +++ b/dart/utils/mjcf/detail/Mesh.cpp @@ -32,12 +32,12 @@ #include "dart/utils/mjcf/detail/Mesh.hpp" -#include - #include "dart/dynamics/MeshShape.hpp" #include "dart/utils/XmlHelpers.hpp" #include "dart/utils/mjcf/detail/Utils.hpp" +#include + namespace dart { namespace utils { namespace MjcfParser { diff --git a/dart/utils/mjcf/detail/Mesh.hpp b/dart/utils/mjcf/detail/Mesh.hpp index b8482e12a1fec..26e684b776ba6 100644 --- a/dart/utils/mjcf/detail/Mesh.hpp +++ b/dart/utils/mjcf/detail/Mesh.hpp @@ -33,13 +33,13 @@ #ifndef DART_UTILS_MJCF_DETAIL_MESH_HPP_ #define DART_UTILS_MJCF_DETAIL_MESH_HPP_ -#include - #include "dart/dynamics/MeshShape.hpp" #include "dart/utils/mjcf/detail/Compiler.hpp" #include "dart/utils/mjcf/detail/Error.hpp" #include "dart/utils/mjcf/detail/MeshAttributes.hpp" +#include + namespace dart { namespace utils { namespace MjcfParser { diff --git a/dart/utils/mjcf/detail/MeshAttributes.hpp b/dart/utils/mjcf/detail/MeshAttributes.hpp index cba7420622ba0..85735df10a057 100644 --- a/dart/utils/mjcf/detail/MeshAttributes.hpp +++ b/dart/utils/mjcf/detail/MeshAttributes.hpp @@ -33,12 +33,12 @@ #ifndef DART_UTILS_MJCF_DETAIL_MESHATTRIBUTES_HPP_ #define DART_UTILS_MJCF_DETAIL_MESHATTRIBUTES_HPP_ -#include -#include - #include "dart/common/Optional.hpp" #include "dart/utils/mjcf/detail/Error.hpp" +#include +#include + namespace dart { namespace utils { namespace MjcfParser { diff --git a/dart/utils/mjcf/detail/MujocoModel.hpp b/dart/utils/mjcf/detail/MujocoModel.hpp index 702433d2e6b93..8132a29f965e3 100644 --- a/dart/utils/mjcf/detail/MujocoModel.hpp +++ b/dart/utils/mjcf/detail/MujocoModel.hpp @@ -33,8 +33,6 @@ #ifndef DART_UTILS_MJCF_DETAIL_MUJOCOMODEL_HPP_ #define DART_UTILS_MJCF_DETAIL_MUJOCOMODEL_HPP_ -#include - #include "dart/common/ResourceRetriever.hpp" #include "dart/common/Uri.hpp" #include "dart/utils/mjcf/detail/Asset.hpp" @@ -46,6 +44,8 @@ #include "dart/utils/mjcf/detail/Size.hpp" #include "dart/utils/mjcf/detail/Worldbody.hpp" +#include + namespace dart { namespace utils { namespace MjcfParser { diff --git a/dart/utils/mjcf/detail/Option.hpp b/dart/utils/mjcf/detail/Option.hpp index e208da82896b5..2d9ba579b0c57 100644 --- a/dart/utils/mjcf/detail/Option.hpp +++ b/dart/utils/mjcf/detail/Option.hpp @@ -33,12 +33,12 @@ #ifndef DART_UTILS_MJCF_DETAIL_OPTION_HPP_ #define DART_UTILS_MJCF_DETAIL_OPTION_HPP_ -#include -#include - #include "dart/utils/mjcf/detail/Error.hpp" #include "dart/utils/mjcf/detail/Types.hpp" +#include +#include + namespace dart { namespace utils { namespace MjcfParser { diff --git a/dart/utils/mjcf/detail/Site.hpp b/dart/utils/mjcf/detail/Site.hpp index fded010aeaa4d..5907d5f939bae 100644 --- a/dart/utils/mjcf/detail/Site.hpp +++ b/dart/utils/mjcf/detail/Site.hpp @@ -33,16 +33,16 @@ #ifndef DART_UTILS_MJCF_DETAIL_SITE_HPP_ #define DART_UTILS_MJCF_DETAIL_SITE_HPP_ -#include - -#include - #include "dart/common/Optional.hpp" #include "dart/math/MathTypes.hpp" #include "dart/utils/mjcf/detail/Compiler.hpp" #include "dart/utils/mjcf/detail/Error.hpp" #include "dart/utils/mjcf/detail/Types.hpp" +#include + +#include + namespace dart { namespace utils { namespace MjcfParser { diff --git a/dart/utils/mjcf/detail/Size.hpp b/dart/utils/mjcf/detail/Size.hpp index 4f4758f3fc25b..a5dcd0366c838 100644 --- a/dart/utils/mjcf/detail/Size.hpp +++ b/dart/utils/mjcf/detail/Size.hpp @@ -33,10 +33,10 @@ #ifndef DART_UTILS_MJCF_DETAIL_SIZE_HPP_ #define DART_UTILS_MJCF_DETAIL_SIZE_HPP_ -#include - #include "dart/utils/mjcf/detail/Error.hpp" +#include + namespace dart { namespace utils { namespace MjcfParser { diff --git a/dart/utils/mjcf/detail/Utils.hpp b/dart/utils/mjcf/detail/Utils.hpp index 9ddcf644a9cdd..42c872a26e0c3 100644 --- a/dart/utils/mjcf/detail/Utils.hpp +++ b/dart/utils/mjcf/detail/Utils.hpp @@ -33,14 +33,14 @@ #ifndef DART_UTILS_MJCF_DETAIL_UTILS_HPP_ #define DART_UTILS_MJCF_DETAIL_UTILS_HPP_ -#include -#include - #include "dart/common/Optional.hpp" #include "dart/simulation/World.hpp" #include "dart/utils/mjcf/detail/Compiler.hpp" #include "dart/utils/mjcf/detail/Error.hpp" +#include +#include + namespace dart { namespace utils { namespace MjcfParser { diff --git a/dart/utils/mjcf/detail/Weld.hpp b/dart/utils/mjcf/detail/Weld.hpp index e3135d31a78ea..8588d7db4f36c 100644 --- a/dart/utils/mjcf/detail/Weld.hpp +++ b/dart/utils/mjcf/detail/Weld.hpp @@ -33,12 +33,12 @@ #ifndef DART_UTILS_MJCF_DETAIL_WELD_HPP_ #define DART_UTILS_MJCF_DETAIL_WELD_HPP_ -#include - #include "dart/utils/mjcf/detail/Default.hpp" #include "dart/utils/mjcf/detail/Error.hpp" #include "dart/utils/mjcf/detail/WeldAttributes.hpp" +#include + namespace dart { namespace utils { namespace MjcfParser { diff --git a/dart/utils/mjcf/detail/WeldAttributes.hpp b/dart/utils/mjcf/detail/WeldAttributes.hpp index 8a5c8c3dca28f..b6c2cd0d0fccc 100644 --- a/dart/utils/mjcf/detail/WeldAttributes.hpp +++ b/dart/utils/mjcf/detail/WeldAttributes.hpp @@ -33,12 +33,12 @@ #ifndef DART_UTILS_MJCF_DETAIL_WELDATTRIBUTES_HPP_ #define DART_UTILS_MJCF_DETAIL_WELDATTRIBUTES_HPP_ -#include -#include - #include "dart/common/Optional.hpp" #include "dart/utils/mjcf/detail/Error.hpp" +#include +#include + namespace dart { namespace utils { namespace MjcfParser { diff --git a/dart/utils/mjcf/detail/Worldbody.hpp b/dart/utils/mjcf/detail/Worldbody.hpp index e623354ac2757..c508502e87b37 100644 --- a/dart/utils/mjcf/detail/Worldbody.hpp +++ b/dart/utils/mjcf/detail/Worldbody.hpp @@ -33,11 +33,6 @@ #ifndef DART_UTILS_MJCF_DETAIL_WORLDBODY_HPP_ #define DART_UTILS_MJCF_DETAIL_WORLDBODY_HPP_ -#include -#include - -#include - #include "dart/utils/mjcf/detail/Body.hpp" #include "dart/utils/mjcf/detail/Compiler.hpp" #include "dart/utils/mjcf/detail/Error.hpp" @@ -45,6 +40,11 @@ #include "dart/utils/mjcf/detail/Site.hpp" #include "dart/utils/mjcf/detail/Size.hpp" +#include + +#include +#include + namespace dart { namespace utils { namespace MjcfParser { diff --git a/dart/utils/sdf/SdfParser.cpp b/dart/utils/sdf/SdfParser.cpp index be06a5c354e51..bc679755e43d2 100644 --- a/dart/utils/sdf/SdfParser.cpp +++ b/dart/utils/sdf/SdfParser.cpp @@ -32,16 +32,6 @@ #include "dart/utils/sdf/SdfParser.hpp" -#include -#include -#include -#include -#include - -#include -#include -#include - #include "dart/common/Console.hpp" #include "dart/common/LocalResourceRetriever.hpp" #include "dart/common/ResourceRetriever.hpp" @@ -66,6 +56,16 @@ #include "dart/utils/SkelParser.hpp" #include "dart/utils/XmlHelpers.hpp" +#include +#include +#include + +#include +#include +#include +#include +#include + namespace dart { namespace utils { diff --git a/dart/utils/urdf/DartLoader.cpp b/dart/utils/urdf/DartLoader.cpp index 3fcffb5a49935..97125a1c12f97 100644 --- a/dart/utils/urdf/DartLoader.cpp +++ b/dart/utils/urdf/DartLoader.cpp @@ -32,10 +32,6 @@ #include "dart/utils/urdf/DartLoader.hpp" -#include -#include -#include - #include "dart/dynamics/BodyNode.hpp" #include "dart/dynamics/BoxShape.hpp" #include "dart/dynamics/CylinderShape.hpp" @@ -55,6 +51,10 @@ #include "dart/utils/urdf/IncludeUrdf.hpp" #include "dart/utils/urdf/urdf_world_parser.hpp" +#include +#include +#include + namespace dart { namespace utils { diff --git a/dart/utils/urdf/DartLoader.hpp b/dart/utils/urdf/DartLoader.hpp index a82205c9bbbff..9c491b366f104 100644 --- a/dart/utils/urdf/DartLoader.hpp +++ b/dart/utils/urdf/DartLoader.hpp @@ -33,12 +33,6 @@ #ifndef DART_UTILS_URDF_DARTLOADER_HPP_ #define DART_UTILS_URDF_DARTLOADER_HPP_ -#include -#include - -#include -#include - #include "dart/common/LocalResourceRetriever.hpp" #include "dart/common/ResourceRetriever.hpp" #include "dart/common/Uri.hpp" @@ -49,6 +43,12 @@ #include "dart/utils/CompositeResourceRetriever.hpp" #include "dart/utils/PackageResourceRetriever.hpp" +#include +#include + +#include +#include + namespace urdf { class ModelInterface; class Link; diff --git a/dart/utils/urdf/urdf_world_parser.cpp b/dart/utils/urdf/urdf_world_parser.cpp index 41701859cfe9b..04b7c0aa32424 100644 --- a/dart/utils/urdf/urdf_world_parser.cpp +++ b/dart/utils/urdf/urdf_world_parser.cpp @@ -36,16 +36,16 @@ #include "dart/utils/urdf/urdf_world_parser.hpp" +#include "dart/common/Console.hpp" +#include "dart/utils/urdf/IncludeUrdf.hpp" + +#include + #include #include #include #include -#include - -#include "dart/common/Console.hpp" -#include "dart/utils/urdf/IncludeUrdf.hpp" - const bool debug = false; namespace dart { diff --git a/dart/utils/urdf/urdf_world_parser.hpp b/dart/utils/urdf/urdf_world_parser.hpp index ff259df6efabb..15a7f9c873993 100644 --- a/dart/utils/urdf/urdf_world_parser.hpp +++ b/dart/utils/urdf/urdf_world_parser.hpp @@ -37,13 +37,13 @@ #pragma once -#include - #include "dart/common/ResourceRetriever.hpp" #include "dart/common/Uri.hpp" #include "dart/utils/urdf/BackwardCompatibility.hpp" #include "dart/utils/urdf/IncludeUrdf.hpp" +#include + namespace dart { namespace utils { namespace urdf_parsing { diff --git a/examples/atlas_puppet/main.cpp b/examples/atlas_puppet/main.cpp index 89b7356017262..ec28c56564a1e 100644 --- a/examples/atlas_puppet/main.cpp +++ b/examples/atlas_puppet/main.cpp @@ -30,11 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include #include + #include #include +#include + using namespace dart::common; using namespace dart::dynamics; using namespace dart::simulation; diff --git a/examples/atlas_simbicon/AtlasSimbiconEventHandler.hpp b/examples/atlas_simbicon/AtlasSimbiconEventHandler.hpp index c8465b4a77c3c..682876a868fe3 100644 --- a/examples/atlas_simbicon/AtlasSimbiconEventHandler.hpp +++ b/examples/atlas_simbicon/AtlasSimbiconEventHandler.hpp @@ -33,11 +33,13 @@ #ifndef DART_EXAMPLE_OSG_OSGATLASSIMBICON_ATLASSIMBICONEVENTHANDLER_HPP_ #define DART_EXAMPLE_OSG_OSGATLASSIMBICON_ATLASSIMBICONEVENTHANDLER_HPP_ -#include +#include "AtlasSimbiconWorldNode.hpp" + #include + #include -#include "AtlasSimbiconWorldNode.hpp" +#include class AtlasSimbiconEventHandler : public osgGA::GUIEventHandler { diff --git a/examples/atlas_simbicon/AtlasSimbiconWidget.cpp b/examples/atlas_simbicon/AtlasSimbiconWidget.cpp index 38d7b070470f1..766287e94cc47 100644 --- a/examples/atlas_simbicon/AtlasSimbiconWidget.cpp +++ b/examples/atlas_simbicon/AtlasSimbiconWidget.cpp @@ -38,9 +38,8 @@ #include "AtlasSimbiconWidget.hpp" -#include "dart/external/imgui/imgui.h" - #include "AtlasSimbiconWorldNode.hpp" +#include "dart/external/imgui/imgui.h" //============================================================================== AtlasSimbiconWidget::AtlasSimbiconWidget( diff --git a/examples/atlas_simbicon/AtlasSimbiconWorldNode.hpp b/examples/atlas_simbicon/AtlasSimbiconWorldNode.hpp index 1998fc981b597..8f2df1b8180e3 100644 --- a/examples/atlas_simbicon/AtlasSimbiconWorldNode.hpp +++ b/examples/atlas_simbicon/AtlasSimbiconWorldNode.hpp @@ -33,11 +33,13 @@ #ifndef DART_EXAMPLE_OSG_OSGATLASSIMBICON_ATLASSIMBICONWORLDNODE_HPP_ #define DART_EXAMPLE_OSG_OSGATLASSIMBICON_ATLASSIMBICONWORLDNODE_HPP_ -#include +#include "Controller.hpp" + #include + #include -#include "Controller.hpp" +#include class AtlasSimbiconWorldNode : public dart::gui::osg::RealTimeWorldNode { diff --git a/examples/atlas_simbicon/Controller.hpp b/examples/atlas_simbicon/Controller.hpp index 1efcc9d540bde..7de59b293a0b9 100644 --- a/examples/atlas_simbicon/Controller.hpp +++ b/examples/atlas_simbicon/Controller.hpp @@ -33,10 +33,11 @@ #ifndef EXAMPLES_ATLASSIMBICON_CONTROLLER_HPP_ #define EXAMPLES_ATLASSIMBICON_CONTROLLER_HPP_ -#include +#include #include -#include + +#include class StateMachine; diff --git a/examples/atlas_simbicon/State.hpp b/examples/atlas_simbicon/State.hpp index 3f0f8c328f036..69fa138bafd60 100644 --- a/examples/atlas_simbicon/State.hpp +++ b/examples/atlas_simbicon/State.hpp @@ -33,13 +33,14 @@ #ifndef EXAMPLES_ATLASSIMBICON_STATE_HPP_ #define EXAMPLES_ATLASSIMBICON_STATE_HPP_ +#include + +#include + #include #include #include -#include -#include - #define ATLAS_DEFAULT_KD 1.0 // No more than 1.0 #define ATLAS_DEFAULT_KP 1e+3 diff --git a/examples/atlas_simbicon/StateMachine.hpp b/examples/atlas_simbicon/StateMachine.hpp index cb0ead4cbb6c8..a0b39f9fb6299 100644 --- a/examples/atlas_simbicon/StateMachine.hpp +++ b/examples/atlas_simbicon/StateMachine.hpp @@ -33,11 +33,12 @@ #ifndef EXAMPLES_ATLASSIMBICON_STATEMACHINE_HPP_ #define EXAMPLES_ATLASSIMBICON_STATEMACHINE_HPP_ -#include -#include +#include #include -#include + +#include +#include class State; diff --git a/examples/atlas_simbicon/TerminalCondition.hpp b/examples/atlas_simbicon/TerminalCondition.hpp index 432eb6a6df06d..c92f108c87521 100644 --- a/examples/atlas_simbicon/TerminalCondition.hpp +++ b/examples/atlas_simbicon/TerminalCondition.hpp @@ -33,11 +33,12 @@ #ifndef EXAMPLES_ATLASSIMBICON_TERMINALCONDITION_HPP_ #define EXAMPLES_ATLASSIMBICON_TERMINALCONDITION_HPP_ -#include -#include +#include #include -#include + +#include +#include class State; diff --git a/examples/atlas_simbicon/main.cpp b/examples/atlas_simbicon/main.cpp index 2538ba5516008..71650b68eafc1 100644 --- a/examples/atlas_simbicon/main.cpp +++ b/examples/atlas_simbicon/main.cpp @@ -30,14 +30,16 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include +#include "AtlasSimbiconEventHandler.hpp" +#include "AtlasSimbiconWidget.hpp" +#include "AtlasSimbiconWorldNode.hpp" + #include + #include #include -#include "AtlasSimbiconEventHandler.hpp" -#include "AtlasSimbiconWidget.hpp" -#include "AtlasSimbiconWorldNode.hpp" +#include int main() { diff --git a/examples/biped_stand/main.cpp b/examples/biped_stand/main.cpp index 6a463348dcb31..b3c53dd569d35 100644 --- a/examples/biped_stand/main.cpp +++ b/examples/biped_stand/main.cpp @@ -30,10 +30,12 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include #include + #include +#include + using namespace dart; //============================================================================== diff --git a/examples/box_stacking/main.cpp b/examples/box_stacking/main.cpp index 6951cc31ed1ec..89c0fd488d4df 100644 --- a/examples/box_stacking/main.cpp +++ b/examples/box_stacking/main.cpp @@ -30,12 +30,14 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include +#include + +#include #include #include -#include -#include + +#include using namespace dart; diff --git a/examples/deprecated_examples/glut_add_delete_skels/Main.cpp b/examples/deprecated_examples/glut_add_delete_skels/Main.cpp index 3b8025cbb8eb5..da7df53f8824e 100644 --- a/examples/deprecated_examples/glut_add_delete_skels/Main.cpp +++ b/examples/deprecated_examples/glut_add_delete_skels/Main.cpp @@ -30,12 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include +#include "MyWindow.hpp" -#include #include -#include "MyWindow.hpp" +#include + +#include int main(int argc, char* argv[]) { diff --git a/examples/deprecated_examples/glut_add_delete_skels/MyWindow.hpp b/examples/deprecated_examples/glut_add_delete_skels/MyWindow.hpp index 75d14d6934086..ebffe6965b27b 100644 --- a/examples/deprecated_examples/glut_add_delete_skels/MyWindow.hpp +++ b/examples/deprecated_examples/glut_add_delete_skels/MyWindow.hpp @@ -33,9 +33,10 @@ #ifndef EXAMPLES_ADDDELETESKELS_MYWINDOW_HPP_ #define EXAMPLES_ADDDELETESKELS_MYWINDOW_HPP_ -#include #include +#include + /// \brief class MyWindow : public dart::gui::glut::SimWindow { diff --git a/examples/deprecated_examples/glut_atlas_simbicon/Controller.hpp b/examples/deprecated_examples/glut_atlas_simbicon/Controller.hpp index 972d5b74720d1..3e92d54fa116b 100644 --- a/examples/deprecated_examples/glut_atlas_simbicon/Controller.hpp +++ b/examples/deprecated_examples/glut_atlas_simbicon/Controller.hpp @@ -33,10 +33,11 @@ #ifndef EXAMPLES_ATLASSIMBICON_CONTROLLER_HPP_ #define EXAMPLES_ATLASSIMBICON_CONTROLLER_HPP_ -#include +#include #include -#include + +#include class StateMachine; diff --git a/examples/deprecated_examples/glut_atlas_simbicon/Humanoid.hpp b/examples/deprecated_examples/glut_atlas_simbicon/Humanoid.hpp index c951f5d449de9..d9fa72ce29bce 100644 --- a/examples/deprecated_examples/glut_atlas_simbicon/Humanoid.hpp +++ b/examples/deprecated_examples/glut_atlas_simbicon/Humanoid.hpp @@ -33,11 +33,12 @@ #ifndef EXAMPLES_ATLASSIMBICON_HUMANOID_HPP_ #define EXAMPLES_ATLASSIMBICON_HUMANOID_HPP_ -#include -#include +#include #include -#include + +#include +#include class State; diff --git a/examples/deprecated_examples/glut_atlas_simbicon/Main.cpp b/examples/deprecated_examples/glut_atlas_simbicon/Main.cpp index 41c677f6663a0..a701e3cc71cf7 100644 --- a/examples/deprecated_examples/glut_atlas_simbicon/Main.cpp +++ b/examples/deprecated_examples/glut_atlas_simbicon/Main.cpp @@ -30,14 +30,15 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include +#include "Controller.hpp" +#include "MyWindow.hpp" -#include #include #include -#include "Controller.hpp" -#include "MyWindow.hpp" +#include + +#include using namespace std; using namespace Eigen; diff --git a/examples/deprecated_examples/glut_atlas_simbicon/MyWindow.hpp b/examples/deprecated_examples/glut_atlas_simbicon/MyWindow.hpp index 6252bc4435375..68e289707c83c 100644 --- a/examples/deprecated_examples/glut_atlas_simbicon/MyWindow.hpp +++ b/examples/deprecated_examples/glut_atlas_simbicon/MyWindow.hpp @@ -33,10 +33,11 @@ #ifndef EXAMPLES_ATLASSIMBICON_MYWINDOW_HPP_ #define EXAMPLES_ATLASSIMBICON_MYWINDOW_HPP_ -#include +#include "Controller.hpp" + #include -#include "Controller.hpp" +#include /// \brief class MyWindow class MyWindow : public dart::gui::glut::SimWindow diff --git a/examples/deprecated_examples/glut_atlas_simbicon/State.hpp b/examples/deprecated_examples/glut_atlas_simbicon/State.hpp index 3f0f8c328f036..69fa138bafd60 100644 --- a/examples/deprecated_examples/glut_atlas_simbicon/State.hpp +++ b/examples/deprecated_examples/glut_atlas_simbicon/State.hpp @@ -33,13 +33,14 @@ #ifndef EXAMPLES_ATLASSIMBICON_STATE_HPP_ #define EXAMPLES_ATLASSIMBICON_STATE_HPP_ +#include + +#include + #include #include #include -#include -#include - #define ATLAS_DEFAULT_KD 1.0 // No more than 1.0 #define ATLAS_DEFAULT_KP 1e+3 diff --git a/examples/deprecated_examples/glut_atlas_simbicon/StateMachine.hpp b/examples/deprecated_examples/glut_atlas_simbicon/StateMachine.hpp index 8fc669d4bb70d..984ecd79f0128 100644 --- a/examples/deprecated_examples/glut_atlas_simbicon/StateMachine.hpp +++ b/examples/deprecated_examples/glut_atlas_simbicon/StateMachine.hpp @@ -33,11 +33,12 @@ #ifndef EXAMPLES_ATLASSIMBICON_STATEMACHINE_HPP_ #define EXAMPLES_ATLASSIMBICON_STATEMACHINE_HPP_ -#include -#include +#include #include -#include + +#include +#include class State; diff --git a/examples/deprecated_examples/glut_atlas_simbicon/TerminalCondition.hpp b/examples/deprecated_examples/glut_atlas_simbicon/TerminalCondition.hpp index 432eb6a6df06d..c92f108c87521 100644 --- a/examples/deprecated_examples/glut_atlas_simbicon/TerminalCondition.hpp +++ b/examples/deprecated_examples/glut_atlas_simbicon/TerminalCondition.hpp @@ -33,11 +33,12 @@ #ifndef EXAMPLES_ATLASSIMBICON_TERMINALCONDITION_HPP_ #define EXAMPLES_ATLASSIMBICON_TERMINALCONDITION_HPP_ -#include -#include +#include #include -#include + +#include +#include class State; diff --git a/examples/deprecated_examples/glut_biped_stand/Controller.hpp b/examples/deprecated_examples/glut_biped_stand/Controller.hpp index a130ce72c4094..a7ba928b124aa 100644 --- a/examples/deprecated_examples/glut_biped_stand/Controller.hpp +++ b/examples/deprecated_examples/glut_biped_stand/Controller.hpp @@ -33,10 +33,11 @@ #ifndef EXAMPLES_BIPEDSTAND_CONTROLLER_HPP_ #define EXAMPLES_BIPEDSTAND_CONTROLLER_HPP_ -#include +#include #include -#include + +#include class Controller { diff --git a/examples/deprecated_examples/glut_biped_stand/Main.cpp b/examples/deprecated_examples/glut_biped_stand/Main.cpp index 023bfd5ace148..5a2c997d5e713 100644 --- a/examples/deprecated_examples/glut_biped_stand/Main.cpp +++ b/examples/deprecated_examples/glut_biped_stand/Main.cpp @@ -30,13 +30,14 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include -#include +#include "MyWindow.hpp" -#include #include -#include "MyWindow.hpp" +#include + +#include +#include int main(int argc, char* argv[]) { diff --git a/examples/deprecated_examples/glut_biped_stand/MyWindow.hpp b/examples/deprecated_examples/glut_biped_stand/MyWindow.hpp index 95f255bbbf15c..5ea0422c02e10 100644 --- a/examples/deprecated_examples/glut_biped_stand/MyWindow.hpp +++ b/examples/deprecated_examples/glut_biped_stand/MyWindow.hpp @@ -33,13 +33,15 @@ #ifndef EXAMPLES_BIPEDSTAND_MYWINDOW_HPP_ #define EXAMPLES_BIPEDSTAND_MYWINDOW_HPP_ -#include +#include "Controller.hpp" -#include -#include #include -#include "Controller.hpp" +#include + +#include + +#include class MyWindow : public dart::gui::glut::SimWindow { diff --git a/examples/deprecated_examples/glut_hardcoded_design/Main.cpp b/examples/deprecated_examples/glut_hardcoded_design/Main.cpp index 054ae0bc2dac6..a01b57f69c642 100644 --- a/examples/deprecated_examples/glut_hardcoded_design/Main.cpp +++ b/examples/deprecated_examples/glut_hardcoded_design/Main.cpp @@ -40,10 +40,10 @@ * '-' will make the joints move in the negative direction. */ -#include - #include "MyWindow.hpp" +#include + int main(int argc, char* argv[]) { // Create Left Leg skeleton diff --git a/examples/deprecated_examples/glut_hardcoded_design/MyWindow.hpp b/examples/deprecated_examples/glut_hardcoded_design/MyWindow.hpp index 6f686561ca487..12464681660c5 100644 --- a/examples/deprecated_examples/glut_hardcoded_design/MyWindow.hpp +++ b/examples/deprecated_examples/glut_hardcoded_design/MyWindow.hpp @@ -40,11 +40,12 @@ #ifndef EXAMPLES_HARDCODEDDESIGN_MYWINDOW_HPP_ #define EXAMPLES_HARDCODEDDESIGN_MYWINDOW_HPP_ -#include -#include +#include #include -#include + +#include +#include class MyWindow : public dart::gui::glut::SimWindow { diff --git a/examples/deprecated_examples/glut_hybrid_dynamics/Main.cpp b/examples/deprecated_examples/glut_hybrid_dynamics/Main.cpp index eadb579032335..5803613cf0262 100644 --- a/examples/deprecated_examples/glut_hybrid_dynamics/Main.cpp +++ b/examples/deprecated_examples/glut_hybrid_dynamics/Main.cpp @@ -30,12 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include +#include "MyWindow.hpp" -#include #include -#include "MyWindow.hpp" +#include + +#include int main(int argc, char* argv[]) { diff --git a/examples/deprecated_examples/glut_hybrid_dynamics/MyWindow.hpp b/examples/deprecated_examples/glut_hybrid_dynamics/MyWindow.hpp index d8946529b4c68..6b9e4223aa6ea 100644 --- a/examples/deprecated_examples/glut_hybrid_dynamics/MyWindow.hpp +++ b/examples/deprecated_examples/glut_hybrid_dynamics/MyWindow.hpp @@ -33,9 +33,10 @@ #ifndef EXAMPLES_HYBRIDDYNAMICS_MYWINDOW_HPP_ #define EXAMPLES_HYBRIDDYNAMICS_MYWINDOW_HPP_ -#include #include +#include + /// \brief class MyWindow : public dart::gui::glut::SimWindow { diff --git a/examples/deprecated_examples/glut_joint_constraints/Controller.hpp b/examples/deprecated_examples/glut_joint_constraints/Controller.hpp index 3ab7bc94ca0ce..2df1c104f7fa8 100644 --- a/examples/deprecated_examples/glut_joint_constraints/Controller.hpp +++ b/examples/deprecated_examples/glut_joint_constraints/Controller.hpp @@ -33,10 +33,11 @@ #ifndef EXAMPLES_JOINTCONSTRAINTS_CONTROLLER_HPP_ #define EXAMPLES_JOINTCONSTRAINTS_CONTROLLER_HPP_ -#include +#include #include -#include + +#include class Controller { diff --git a/examples/deprecated_examples/glut_joint_constraints/Main.cpp b/examples/deprecated_examples/glut_joint_constraints/Main.cpp index af52a1f3071fb..6f4d52b17beb2 100644 --- a/examples/deprecated_examples/glut_joint_constraints/Main.cpp +++ b/examples/deprecated_examples/glut_joint_constraints/Main.cpp @@ -30,13 +30,15 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include +#include "MyWindow.hpp" -#include #include + #include -#include "MyWindow.hpp" +#include + +#include using namespace dart; using namespace dynamics; diff --git a/examples/deprecated_examples/glut_joint_constraints/MyWindow.hpp b/examples/deprecated_examples/glut_joint_constraints/MyWindow.hpp index c137f3d2f299e..005d7aa3bdd86 100644 --- a/examples/deprecated_examples/glut_joint_constraints/MyWindow.hpp +++ b/examples/deprecated_examples/glut_joint_constraints/MyWindow.hpp @@ -33,12 +33,14 @@ #ifndef EXAMPLES_JOINTCONSTRAINTS_MYWINDOW_HPP_ #define EXAMPLES_JOINTCONSTRAINTS_MYWINDOW_HPP_ - #include - #include + #include "Controller.hpp" + #include - #include - #include "Controller.hpp" + #include + + #include + #include class MyWindow : public dart::gui::glut::SimWindow { @@ -75,14 +77,14 @@ class MyWindow : public dart::gui::glut::SimWindow #endif // EXAMPLES_JOINTCONSTRAINTS_MYWINDOW_HPP_ /* -#include - #include "Controller.hpp" #include "dynamics/SkeletonDynamics.hpp" #include "integration/EulerIntegrator.hpp" #include "integration/RK4Integrator.hpp" #include "yui/Win3D.hpp" +#include + class MyWindow : public yui::Win3D, public integration::IntegrableSystem { public: // MyWindow(dynamics::SkeletonDynamics* _m1, dynamics::SkeletonDynamics* diff --git a/examples/deprecated_examples/glut_mixed_chain/Main.cpp b/examples/deprecated_examples/glut_mixed_chain/Main.cpp index f1d8b96c39ef7..60590e270ea50 100644 --- a/examples/deprecated_examples/glut_mixed_chain/Main.cpp +++ b/examples/deprecated_examples/glut_mixed_chain/Main.cpp @@ -36,12 +36,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include +#include "MyWindow.hpp" -#include #include -#include "MyWindow.hpp" +#include + +#include int main(int argc, char* argv[]) { diff --git a/examples/deprecated_examples/glut_mixed_chain/MyWindow.hpp b/examples/deprecated_examples/glut_mixed_chain/MyWindow.hpp index 5d0f6fb03285a..0c933cae73aff 100644 --- a/examples/deprecated_examples/glut_mixed_chain/MyWindow.hpp +++ b/examples/deprecated_examples/glut_mixed_chain/MyWindow.hpp @@ -39,9 +39,10 @@ #ifndef EXAMPLES_TESTDROP_MYWINDOW_HPP_ #define EXAMPLES_TESTDROP_MYWINDOW_HPP_ -#include #include +#include + /// \brief class MyWindow : public dart::gui::glut::SoftSimWindow { diff --git a/examples/deprecated_examples/glut_operational_space_control/Controller.hpp b/examples/deprecated_examples/glut_operational_space_control/Controller.hpp index 8501a8d5b07f8..02cbc5832773a 100644 --- a/examples/deprecated_examples/glut_operational_space_control/Controller.hpp +++ b/examples/deprecated_examples/glut_operational_space_control/Controller.hpp @@ -33,9 +33,10 @@ #ifndef EXAMPLES_OPERATIONALSPACECONTROL_CONTROLLER_HPP_ #define EXAMPLES_OPERATIONALSPACECONTROL_CONTROLLER_HPP_ -#include #include +#include + /// \brief Operational space controller for 6-dof manipulator class Controller { diff --git a/examples/deprecated_examples/glut_operational_space_control/Main.cpp b/examples/deprecated_examples/glut_operational_space_control/Main.cpp index 1396328f3eb4c..8ead547a8fb4e 100644 --- a/examples/deprecated_examples/glut_operational_space_control/Main.cpp +++ b/examples/deprecated_examples/glut_operational_space_control/Main.cpp @@ -30,10 +30,11 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include +#include "MyWindow.hpp" + #include -#include "MyWindow.hpp" +#include int main(int argc, char* argv[]) { diff --git a/examples/deprecated_examples/glut_operational_space_control/MyWindow.hpp b/examples/deprecated_examples/glut_operational_space_control/MyWindow.hpp index 61ab7c6ec8b9d..79a8c95381743 100644 --- a/examples/deprecated_examples/glut_operational_space_control/MyWindow.hpp +++ b/examples/deprecated_examples/glut_operational_space_control/MyWindow.hpp @@ -33,10 +33,11 @@ #ifndef EXAMPLES_OPERATIONALSPACECONTROL_MYWINDOW_HPP_ #define EXAMPLES_OPERATIONALSPACECONTROL_MYWINDOW_HPP_ -#include +#include "Controller.hpp" + #include -#include "Controller.hpp" +#include /// \brief class MyWindow class MyWindow : public dart::gui::glut::SimWindow diff --git a/examples/deprecated_examples/glut_rigid_chain/Main.cpp b/examples/deprecated_examples/glut_rigid_chain/Main.cpp index 9f52b5cd26716..d6e16dcf20884 100644 --- a/examples/deprecated_examples/glut_rigid_chain/Main.cpp +++ b/examples/deprecated_examples/glut_rigid_chain/Main.cpp @@ -30,10 +30,11 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include +#include "MyWindow.hpp" + #include -#include "MyWindow.hpp" +#include int main(int argc, char* argv[]) { diff --git a/examples/deprecated_examples/glut_rigid_chain/MyWindow.hpp b/examples/deprecated_examples/glut_rigid_chain/MyWindow.hpp index e585feac1d09c..680de685def62 100644 --- a/examples/deprecated_examples/glut_rigid_chain/MyWindow.hpp +++ b/examples/deprecated_examples/glut_rigid_chain/MyWindow.hpp @@ -33,9 +33,10 @@ #ifndef EXAMPLES_FORWARDSIM_MYWINDOW_HPP_ #define EXAMPLES_FORWARDSIM_MYWINDOW_HPP_ -#include #include +#include + class MyWindow : public dart::gui::glut::SimWindow { public: diff --git a/examples/deprecated_examples/glut_rigid_cubes/MyWindow.hpp b/examples/deprecated_examples/glut_rigid_cubes/MyWindow.hpp index 2eaf9342a5435..c0c8e536d494d 100644 --- a/examples/deprecated_examples/glut_rigid_cubes/MyWindow.hpp +++ b/examples/deprecated_examples/glut_rigid_cubes/MyWindow.hpp @@ -33,9 +33,10 @@ #ifndef EXAMPLES_CUBES_MYWINDOW_HPP_ #define EXAMPLES_CUBES_MYWINDOW_HPP_ -#include #include +#include + class MyWindow : public dart::gui::glut::SimWindow { public: diff --git a/examples/deprecated_examples/glut_rigid_cubes/main.cpp b/examples/deprecated_examples/glut_rigid_cubes/main.cpp index 18397aec57ba5..7222ad6649204 100644 --- a/examples/deprecated_examples/glut_rigid_cubes/main.cpp +++ b/examples/deprecated_examples/glut_rigid_cubes/main.cpp @@ -30,12 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include +#include "MyWindow.hpp" -#include #include -#include "MyWindow.hpp" +#include + +#include int main(int argc, char* argv[]) { diff --git a/examples/deprecated_examples/glut_rigid_loop/Main.cpp b/examples/deprecated_examples/glut_rigid_loop/Main.cpp index 20d1ba068304f..9007f2d68bee7 100644 --- a/examples/deprecated_examples/glut_rigid_loop/Main.cpp +++ b/examples/deprecated_examples/glut_rigid_loop/Main.cpp @@ -30,10 +30,11 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include +#include "MyWindow.hpp" + #include -#include "MyWindow.hpp" +#include using namespace dart; using namespace math; diff --git a/examples/deprecated_examples/glut_rigid_loop/MyWindow.hpp b/examples/deprecated_examples/glut_rigid_loop/MyWindow.hpp index da6ca10557402..b34919b32fe3b 100644 --- a/examples/deprecated_examples/glut_rigid_loop/MyWindow.hpp +++ b/examples/deprecated_examples/glut_rigid_loop/MyWindow.hpp @@ -33,9 +33,10 @@ #ifndef EXAMPLES_CLOSEDLOOP_MYWINDOW_HPP_ #define EXAMPLES_CLOSEDLOOP_MYWINDOW_HPP_ -#include #include +#include + class MyWindow : public dart::gui::glut::SimWindow { public: diff --git a/examples/deprecated_examples/glut_rigid_shapes/Main.cpp b/examples/deprecated_examples/glut_rigid_shapes/Main.cpp index 714da1240e61d..29167b3253f5a 100644 --- a/examples/deprecated_examples/glut_rigid_shapes/Main.cpp +++ b/examples/deprecated_examples/glut_rigid_shapes/Main.cpp @@ -36,13 +36,15 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include +#include "MyWindow.hpp" -#include #include + +#include + #include -#include "MyWindow.hpp" +#include int main(int argc, char* argv[]) { diff --git a/examples/deprecated_examples/glut_rigid_shapes/MyWindow.hpp b/examples/deprecated_examples/glut_rigid_shapes/MyWindow.hpp index 790117431ba86..0119e11be093a 100644 --- a/examples/deprecated_examples/glut_rigid_shapes/MyWindow.hpp +++ b/examples/deprecated_examples/glut_rigid_shapes/MyWindow.hpp @@ -39,9 +39,10 @@ #ifndef EXAMPLES_RIGIDSHAPES_MYWINDOW_HPP_ #define EXAMPLES_RIGIDSHAPES_MYWINDOW_HPP_ -#include #include +#include + /// MyWindow class MyWindow : public dart::gui::glut::SimWindow { diff --git a/examples/deprecated_examples/glut_simple_frames/Main.cpp b/examples/deprecated_examples/glut_simple_frames/Main.cpp index 6426141b89cb8..10d7dd25fe92c 100644 --- a/examples/deprecated_examples/glut_simple_frames/Main.cpp +++ b/examples/deprecated_examples/glut_simple_frames/Main.cpp @@ -30,9 +30,10 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include #include +#include + using namespace dart::dynamics; int main(int argc, char* argv[]) diff --git a/examples/deprecated_examples/glut_soft_bodies/Main.cpp b/examples/deprecated_examples/glut_soft_bodies/Main.cpp index 33023d99cdc78..02ee5407da360 100644 --- a/examples/deprecated_examples/glut_soft_bodies/Main.cpp +++ b/examples/deprecated_examples/glut_soft_bodies/Main.cpp @@ -36,12 +36,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include +#include "MyWindow.hpp" -#include #include -#include "MyWindow.hpp" +#include + +#include int main(int argc, char* argv[]) { diff --git a/examples/deprecated_examples/glut_soft_bodies/MyWindow.hpp b/examples/deprecated_examples/glut_soft_bodies/MyWindow.hpp index 700b0e14ed555..d84393108c379 100644 --- a/examples/deprecated_examples/glut_soft_bodies/MyWindow.hpp +++ b/examples/deprecated_examples/glut_soft_bodies/MyWindow.hpp @@ -39,9 +39,10 @@ #ifndef EXAMPLES_SOFTBODIES_MYWINDOW_HPP_ #define EXAMPLES_SOFTBODIES_MYWINDOW_HPP_ -#include #include +#include + /// \brief class MyWindow : public dart::gui::glut::SoftSimWindow { diff --git a/examples/deprecated_examples/glut_vehicle/Main.cpp b/examples/deprecated_examples/glut_vehicle/Main.cpp index 74add84546144..a6ecca88d51e2 100644 --- a/examples/deprecated_examples/glut_vehicle/Main.cpp +++ b/examples/deprecated_examples/glut_vehicle/Main.cpp @@ -30,12 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include +#include "MyWindow.hpp" -#include #include -#include "MyWindow.hpp" +#include + +#include int main(int argc, char* argv[]) { diff --git a/examples/deprecated_examples/glut_vehicle/MyWindow.hpp b/examples/deprecated_examples/glut_vehicle/MyWindow.hpp index 8f9ec8ea8159e..7114dc3931746 100644 --- a/examples/deprecated_examples/glut_vehicle/MyWindow.hpp +++ b/examples/deprecated_examples/glut_vehicle/MyWindow.hpp @@ -33,9 +33,10 @@ #ifndef EXAMPLES_VEHICLE_MYWINDOW_HPP_ #define EXAMPLES_VEHICLE_MYWINDOW_HPP_ -#include #include +#include + /// \brief class MyWindow : public dart::gui::glut::SimWindow { diff --git a/examples/drag_and_drop/main.cpp b/examples/drag_and_drop/main.cpp index 73b65e38285f8..4d66dc32974d5 100644 --- a/examples/drag_and_drop/main.cpp +++ b/examples/drag_and_drop/main.cpp @@ -30,9 +30,10 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include #include +#include + using namespace dart::dynamics; int main() diff --git a/examples/empty/main.cpp b/examples/empty/main.cpp index c0967b2f518ae..5c74231d4cb0d 100644 --- a/examples/empty/main.cpp +++ b/examples/empty/main.cpp @@ -30,9 +30,10 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include #include +#include + //============================================================================== class CustomWorldNode : public dart::gui::osg::RealTimeWorldNode { diff --git a/examples/fetch/main.cpp b/examples/fetch/main.cpp index 55e97601f3af2..ac82615b0059f 100644 --- a/examples/fetch/main.cpp +++ b/examples/fetch/main.cpp @@ -30,11 +30,14 @@ * POSSIBILITY OF SUCH DAMAGE. */ +#include + +#include + #include + #include #include -#include -#include using namespace dart; diff --git a/examples/heightmap/main.cpp b/examples/heightmap/main.cpp index 8a38bcbb3e7be..cff4caf4e5fdf 100644 --- a/examples/heightmap/main.cpp +++ b/examples/heightmap/main.cpp @@ -30,14 +30,16 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include - -#include -#include #include + #include #include +#include +#include + +#include + using namespace dart; using namespace dart::common; using namespace dart::dynamics; diff --git a/examples/hello_world/main.cpp b/examples/hello_world/main.cpp index 19d0f446d969f..b58b25a948dbf 100644 --- a/examples/hello_world/main.cpp +++ b/examples/hello_world/main.cpp @@ -30,9 +30,10 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include #include +#include + using namespace dart; int main() diff --git a/examples/hubo_puppet/main.cpp b/examples/hubo_puppet/main.cpp index 18bba7a80f417..af905bf78a1da 100644 --- a/examples/hubo_puppet/main.cpp +++ b/examples/hubo_puppet/main.cpp @@ -30,11 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include #include + #include #include +#include + using namespace dart::math; using namespace dart::dynamics; using namespace dart::simulation; diff --git a/examples/imgui/main.cpp b/examples/imgui/main.cpp index 9ac9ac70c98a2..2e446a80188eb 100644 --- a/examples/imgui/main.cpp +++ b/examples/imgui/main.cpp @@ -30,9 +30,10 @@ * POSSIBILITY OF SUCH DAMAGE. */ +#include + #include #include -#include //============================================================================== class CustomWorldNode : public dart::gui::osg::WorldNode diff --git a/examples/operational_space_control/main.cpp b/examples/operational_space_control/main.cpp index 66551e1180c7d..d22bd80a5a2fd 100644 --- a/examples/operational_space_control/main.cpp +++ b/examples/operational_space_control/main.cpp @@ -30,11 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include #include + #include #include +#include + using namespace dart::common; using namespace dart::dynamics; using namespace dart::math; diff --git a/examples/point_cloud/main.cpp b/examples/point_cloud/main.cpp index bf81a4060b291..884c0ddb68111 100644 --- a/examples/point_cloud/main.cpp +++ b/examples/point_cloud/main.cpp @@ -30,14 +30,16 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include - -#include -#include #include + #include #include +#include +#include + +#include + using namespace dart; using namespace dart::common; using namespace dart::dynamics; diff --git a/examples/rigid_shapes/main.cpp b/examples/rigid_shapes/main.cpp index 0f7a0062c693e..8c65d15ef827a 100644 --- a/examples/rigid_shapes/main.cpp +++ b/examples/rigid_shapes/main.cpp @@ -30,11 +30,14 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include -#include #include + #include +#include + +#include + using namespace dart; int main() diff --git a/examples/soft_bodies/main.cpp b/examples/soft_bodies/main.cpp index de15bbce97ff3..98c17fb4239da 100644 --- a/examples/soft_bodies/main.cpp +++ b/examples/soft_bodies/main.cpp @@ -30,9 +30,12 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include #include + #include + +#include + #include using namespace dart::dynamics; diff --git a/examples/speed_test/main.cpp b/examples/speed_test/main.cpp index 05a6c2f874f80..3303967175704 100644 --- a/examples/speed_test/main.cpp +++ b/examples/speed_test/main.cpp @@ -30,12 +30,12 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include -#include +#include "dart/utils/utils.hpp" #include -#include "dart/utils/utils.hpp" +#include +#include double testForwardKinematicSpeed( dart::dynamics::SkeletonPtr skel, diff --git a/examples/tinkertoy/TinkertoyWidget.cpp b/examples/tinkertoy/TinkertoyWidget.cpp index 5f2f91cd5345d..6c9c1db55117e 100644 --- a/examples/tinkertoy/TinkertoyWidget.cpp +++ b/examples/tinkertoy/TinkertoyWidget.cpp @@ -38,9 +38,8 @@ #include "TinkertoyWidget.hpp" -#include "dart/external/imgui/imgui.h" - #include "TinkertoyWorldNode.hpp" +#include "dart/external/imgui/imgui.h" //============================================================================== TinkertoyWidget::TinkertoyWidget( diff --git a/examples/tinkertoy/TinkertoyWorldNode.hpp b/examples/tinkertoy/TinkertoyWorldNode.hpp index 3b4b50f935184..d198c30630053 100644 --- a/examples/tinkertoy/TinkertoyWorldNode.hpp +++ b/examples/tinkertoy/TinkertoyWorldNode.hpp @@ -33,10 +33,12 @@ #ifndef DART_EXAMPLE_OSG_OSGATLASSIMBICON_TINKERTOYWORLDNODE_HPP_ #define DART_EXAMPLE_OSG_OSGATLASSIMBICON_TINKERTOYWORLDNODE_HPP_ -#include #include + #include +#include + const double DefaultBlockLength = 0.5; const double DefaultBlockWidth = 0.075; const double DefaultJointRadius = 1.5 * DefaultBlockWidth / 2.0; diff --git a/examples/tinkertoy/main.cpp b/examples/tinkertoy/main.cpp index b2e4fdf9666bf..7e48d8b9dd1a6 100644 --- a/examples/tinkertoy/main.cpp +++ b/examples/tinkertoy/main.cpp @@ -30,12 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include -#include - #include "TinkertoyWidget.hpp" #include "TinkertoyWorldNode.hpp" +#include + +#include + //============================================================================== class TinkertoyInputHandler : public osgGA::GUIEventHandler { diff --git a/examples/wam_ikfast/Helpers.cpp b/examples/wam_ikfast/Helpers.cpp index 1419defab5c42..391653488127d 100644 --- a/examples/wam_ikfast/Helpers.cpp +++ b/examples/wam_ikfast/Helpers.cpp @@ -32,10 +32,10 @@ #include "Helpers.hpp" -#include - #include +#include + //============================================================================== dart::dynamics::SkeletonPtr createGround() { diff --git a/examples/wam_ikfast/Helpers.hpp b/examples/wam_ikfast/Helpers.hpp index 2ae8aa9c4ac13..a6e79e61b90d1 100644 --- a/examples/wam_ikfast/Helpers.hpp +++ b/examples/wam_ikfast/Helpers.hpp @@ -30,9 +30,10 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include #include +#include + dart::dynamics::SkeletonPtr createGround(); dart::dynamics::SkeletonPtr createWam(); diff --git a/examples/wam_ikfast/InputHandler.hpp b/examples/wam_ikfast/InputHandler.hpp index 692908a4c53eb..86d386b53c82c 100644 --- a/examples/wam_ikfast/InputHandler.hpp +++ b/examples/wam_ikfast/InputHandler.hpp @@ -30,9 +30,10 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include #include +#include + class WamWorld; class InputHandler : public ::osgGA::GUIEventHandler diff --git a/examples/wam_ikfast/WamWorld.hpp b/examples/wam_ikfast/WamWorld.hpp index d4982fe93a05b..fc95304fa9946 100644 --- a/examples/wam_ikfast/WamWorld.hpp +++ b/examples/wam_ikfast/WamWorld.hpp @@ -30,11 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include #include + #include #include +#include + using namespace dart::dynamics; using namespace dart::simulation; diff --git a/examples/wam_ikfast/osgWamIkFast.cpp b/examples/wam_ikfast/osgWamIkFast.cpp index f2fa7315df74f..422097d8c6d83 100644 --- a/examples/wam_ikfast/osgWamIkFast.cpp +++ b/examples/wam_ikfast/osgWamIkFast.cpp @@ -30,15 +30,16 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include - -#include -#include - #include "Helpers.hpp" #include "InputHandler.hpp" #include "WamWorld.hpp" +#include + +#include + +#include + int main() { // Create the world. diff --git a/python/dartpy/collision/BulletCollisionDetector.cpp b/python/dartpy/collision/BulletCollisionDetector.cpp index 2de738c48fe28..27690085f2dde 100644 --- a/python/dartpy/collision/BulletCollisionDetector.cpp +++ b/python/dartpy/collision/BulletCollisionDetector.cpp @@ -35,6 +35,7 @@ #if HAVE_BULLET #include + #include namespace py = pybind11; diff --git a/python/dartpy/collision/BulletCollisionGroup.cpp b/python/dartpy/collision/BulletCollisionGroup.cpp index c42c9712714ae..1cda350cbf381 100644 --- a/python/dartpy/collision/BulletCollisionGroup.cpp +++ b/python/dartpy/collision/BulletCollisionGroup.cpp @@ -35,6 +35,7 @@ #if HAVE_BULLET #include + #include namespace py = pybind11; diff --git a/python/dartpy/collision/CollisionDetector.cpp b/python/dartpy/collision/CollisionDetector.cpp index aab9ce0c381e1..68904c66e6f40 100644 --- a/python/dartpy/collision/CollisionDetector.cpp +++ b/python/dartpy/collision/CollisionDetector.cpp @@ -31,6 +31,7 @@ */ #include + #include namespace py = pybind11; diff --git a/python/dartpy/collision/CollisionFilter.cpp b/python/dartpy/collision/CollisionFilter.cpp index ae4d684d81acb..2861153740064 100644 --- a/python/dartpy/collision/CollisionFilter.cpp +++ b/python/dartpy/collision/CollisionFilter.cpp @@ -31,6 +31,7 @@ */ #include + #include namespace py = pybind11; diff --git a/python/dartpy/collision/CollisionGroup.cpp b/python/dartpy/collision/CollisionGroup.cpp index ac62eff0d03ec..fca4f4cf5f4b7 100644 --- a/python/dartpy/collision/CollisionGroup.cpp +++ b/python/dartpy/collision/CollisionGroup.cpp @@ -31,6 +31,7 @@ */ #include + #include #include diff --git a/python/dartpy/collision/CollisionObject.cpp b/python/dartpy/collision/CollisionObject.cpp index db08d694a9acb..bfac3936f98c0 100644 --- a/python/dartpy/collision/CollisionObject.cpp +++ b/python/dartpy/collision/CollisionObject.cpp @@ -31,6 +31,7 @@ */ #include + #include namespace py = pybind11; diff --git a/python/dartpy/collision/CollisionOption.cpp b/python/dartpy/collision/CollisionOption.cpp index eea4c8c7f289c..29549461ed05c 100644 --- a/python/dartpy/collision/CollisionOption.cpp +++ b/python/dartpy/collision/CollisionOption.cpp @@ -31,6 +31,7 @@ */ #include + #include namespace py = pybind11; diff --git a/python/dartpy/collision/CollisionResult.cpp b/python/dartpy/collision/CollisionResult.cpp index 66eecbe7c292d..e93a8c214267f 100644 --- a/python/dartpy/collision/CollisionResult.cpp +++ b/python/dartpy/collision/CollisionResult.cpp @@ -31,6 +31,7 @@ */ #include + #include #include diff --git a/python/dartpy/collision/Contact.cpp b/python/dartpy/collision/Contact.cpp index e55165ab1bea0..06aa8443a8bb7 100644 --- a/python/dartpy/collision/Contact.cpp +++ b/python/dartpy/collision/Contact.cpp @@ -31,6 +31,7 @@ */ #include + #include #include diff --git a/python/dartpy/collision/DARTCollisionDetector.cpp b/python/dartpy/collision/DARTCollisionDetector.cpp index 769e713297420..7dbc1f6ed14ba 100644 --- a/python/dartpy/collision/DARTCollisionDetector.cpp +++ b/python/dartpy/collision/DARTCollisionDetector.cpp @@ -31,6 +31,7 @@ */ #include + #include namespace py = pybind11; diff --git a/python/dartpy/collision/DARTCollisionGroup.cpp b/python/dartpy/collision/DARTCollisionGroup.cpp index 40ad3a7129e26..bf522bd1b84e0 100644 --- a/python/dartpy/collision/DARTCollisionGroup.cpp +++ b/python/dartpy/collision/DARTCollisionGroup.cpp @@ -31,6 +31,7 @@ */ #include + #include namespace py = pybind11; diff --git a/python/dartpy/collision/DistanceOption.cpp b/python/dartpy/collision/DistanceOption.cpp index c9af13281f332..3804b8c208351 100644 --- a/python/dartpy/collision/DistanceOption.cpp +++ b/python/dartpy/collision/DistanceOption.cpp @@ -31,6 +31,7 @@ */ #include + #include namespace py = pybind11; diff --git a/python/dartpy/collision/DistanceResult.cpp b/python/dartpy/collision/DistanceResult.cpp index 8e3eedf9a0c28..ccad62ef48f5e 100644 --- a/python/dartpy/collision/DistanceResult.cpp +++ b/python/dartpy/collision/DistanceResult.cpp @@ -31,6 +31,7 @@ */ #include + #include #include diff --git a/python/dartpy/collision/FCLCollisionDetector.cpp b/python/dartpy/collision/FCLCollisionDetector.cpp index e6116f7f3951d..13cf4f05d4b53 100644 --- a/python/dartpy/collision/FCLCollisionDetector.cpp +++ b/python/dartpy/collision/FCLCollisionDetector.cpp @@ -31,6 +31,7 @@ */ #include + #include namespace py = pybind11; diff --git a/python/dartpy/collision/FCLCollisionGroup.cpp b/python/dartpy/collision/FCLCollisionGroup.cpp index 88576962a0fcc..77d679088a351 100644 --- a/python/dartpy/collision/FCLCollisionGroup.cpp +++ b/python/dartpy/collision/FCLCollisionGroup.cpp @@ -31,6 +31,7 @@ */ #include + #include namespace py = pybind11; diff --git a/python/dartpy/collision/OdeCollisionDetector.cpp b/python/dartpy/collision/OdeCollisionDetector.cpp index 70247bb55ff34..79d4148f9f711 100644 --- a/python/dartpy/collision/OdeCollisionDetector.cpp +++ b/python/dartpy/collision/OdeCollisionDetector.cpp @@ -35,6 +35,7 @@ #if HAVE_ODE #include + #include namespace py = pybind11; diff --git a/python/dartpy/collision/OdeCollisionGroup.cpp b/python/dartpy/collision/OdeCollisionGroup.cpp index 54b1d9ee8e640..a6dd9468a189c 100644 --- a/python/dartpy/collision/OdeCollisionGroup.cpp +++ b/python/dartpy/collision/OdeCollisionGroup.cpp @@ -35,6 +35,7 @@ #if HAVE_ODE #include + #include namespace py = pybind11; diff --git a/python/dartpy/collision/RaycastOption.cpp b/python/dartpy/collision/RaycastOption.cpp index c04055d9a8725..349f8f826ed76 100644 --- a/python/dartpy/collision/RaycastOption.cpp +++ b/python/dartpy/collision/RaycastOption.cpp @@ -31,6 +31,7 @@ */ #include + #include namespace py = pybind11; diff --git a/python/dartpy/collision/RaycastResult.cpp b/python/dartpy/collision/RaycastResult.cpp index 36b1a6a0d1a5e..639e1ed98cc3a 100644 --- a/python/dartpy/collision/RaycastResult.cpp +++ b/python/dartpy/collision/RaycastResult.cpp @@ -31,6 +31,7 @@ */ #include + #include #include #include diff --git a/python/dartpy/collision/module.cpp b/python/dartpy/collision/module.cpp index ac539502ee1c2..19e8de561c2ad 100644 --- a/python/dartpy/collision/module.cpp +++ b/python/dartpy/collision/module.cpp @@ -31,6 +31,7 @@ */ #include + #include namespace py = pybind11; diff --git a/python/dartpy/common/Composite.cpp b/python/dartpy/common/Composite.cpp index ec8fe42a16802..c21618b06c8a8 100644 --- a/python/dartpy/common/Composite.cpp +++ b/python/dartpy/common/Composite.cpp @@ -31,6 +31,7 @@ */ #include + #include namespace py = pybind11; diff --git a/python/dartpy/common/Logging.cpp b/python/dartpy/common/Logging.cpp index dd916d389a67b..686daa53ea9dd 100644 --- a/python/dartpy/common/Logging.cpp +++ b/python/dartpy/common/Logging.cpp @@ -31,6 +31,7 @@ */ #include + #include namespace py = pybind11; diff --git a/python/dartpy/common/Observer.cpp b/python/dartpy/common/Observer.cpp index c139896d43d5c..0b5c32f4bd082 100644 --- a/python/dartpy/common/Observer.cpp +++ b/python/dartpy/common/Observer.cpp @@ -31,6 +31,7 @@ */ #include + #include namespace py = pybind11; diff --git a/python/dartpy/common/Resource.cpp b/python/dartpy/common/Resource.cpp index d3b5239f7537a..625743683834e 100644 --- a/python/dartpy/common/Resource.cpp +++ b/python/dartpy/common/Resource.cpp @@ -31,6 +31,7 @@ */ #include + #include namespace py = pybind11; diff --git a/python/dartpy/common/ResourceRetriever.cpp b/python/dartpy/common/ResourceRetriever.cpp index 78238b2dcfa4a..46fe3c53c9f93 100644 --- a/python/dartpy/common/ResourceRetriever.cpp +++ b/python/dartpy/common/ResourceRetriever.cpp @@ -31,6 +31,7 @@ */ #include + #include namespace py = pybind11; diff --git a/python/dartpy/common/Stopwatch.cpp b/python/dartpy/common/Stopwatch.cpp index 5e327689b2418..301db451e1d64 100644 --- a/python/dartpy/common/Stopwatch.cpp +++ b/python/dartpy/common/Stopwatch.cpp @@ -31,6 +31,7 @@ */ #include + #include #include diff --git a/python/dartpy/common/String.cpp b/python/dartpy/common/String.cpp index c86a5aad17bd8..17629e873b80b 100644 --- a/python/dartpy/common/String.cpp +++ b/python/dartpy/common/String.cpp @@ -31,6 +31,7 @@ */ #include + #include #include diff --git a/python/dartpy/common/Subject.cpp b/python/dartpy/common/Subject.cpp index 04824eb3d09ad..8c536185de265 100644 --- a/python/dartpy/common/Subject.cpp +++ b/python/dartpy/common/Subject.cpp @@ -31,6 +31,7 @@ */ #include + #include namespace py = pybind11; diff --git a/python/dartpy/common/Uri.cpp b/python/dartpy/common/Uri.cpp index 270fdbc357098..595ff4e417a4e 100644 --- a/python/dartpy/common/Uri.cpp +++ b/python/dartpy/common/Uri.cpp @@ -31,6 +31,7 @@ */ #include + #include namespace py = pybind11; diff --git a/python/dartpy/constraint/BoxedLcpConstraintSolver.cpp b/python/dartpy/constraint/BoxedLcpConstraintSolver.cpp index c2b645404c4a9..b470ab9e2732b 100644 --- a/python/dartpy/constraint/BoxedLcpConstraintSolver.cpp +++ b/python/dartpy/constraint/BoxedLcpConstraintSolver.cpp @@ -31,6 +31,7 @@ */ #include + #include namespace py = pybind11; diff --git a/python/dartpy/constraint/BoxedLcpSolver.cpp b/python/dartpy/constraint/BoxedLcpSolver.cpp index f4aeed5c2c310..1ae9f22325c23 100644 --- a/python/dartpy/constraint/BoxedLcpSolver.cpp +++ b/python/dartpy/constraint/BoxedLcpSolver.cpp @@ -31,6 +31,7 @@ */ #include + #include namespace py = pybind11; diff --git a/python/dartpy/constraint/ConstraintBase.cpp b/python/dartpy/constraint/ConstraintBase.cpp index 776d38760b080..f67957efb92b9 100644 --- a/python/dartpy/constraint/ConstraintBase.cpp +++ b/python/dartpy/constraint/ConstraintBase.cpp @@ -31,6 +31,7 @@ */ #include + #include namespace py = pybind11; diff --git a/python/dartpy/constraint/ConstraintSolver.cpp b/python/dartpy/constraint/ConstraintSolver.cpp index c99a4c4c9f774..a1ff7a6a5b7cd 100644 --- a/python/dartpy/constraint/ConstraintSolver.cpp +++ b/python/dartpy/constraint/ConstraintSolver.cpp @@ -31,6 +31,7 @@ */ #include + #include namespace py = pybind11; diff --git a/python/dartpy/constraint/DantzigBoxedLcpSolver.cpp b/python/dartpy/constraint/DantzigBoxedLcpSolver.cpp index 311605461b665..46d2c69ba6b55 100644 --- a/python/dartpy/constraint/DantzigBoxedLcpSolver.cpp +++ b/python/dartpy/constraint/DantzigBoxedLcpSolver.cpp @@ -31,6 +31,7 @@ */ #include + #include namespace py = pybind11; diff --git a/python/dartpy/constraint/DynamicJointConstraint.cpp b/python/dartpy/constraint/DynamicJointConstraint.cpp index d05e41e016174..b126279bd62b9 100644 --- a/python/dartpy/constraint/DynamicJointConstraint.cpp +++ b/python/dartpy/constraint/DynamicJointConstraint.cpp @@ -31,6 +31,7 @@ */ #include + #include #include diff --git a/python/dartpy/constraint/JointConstraint.cpp b/python/dartpy/constraint/JointConstraint.cpp index b69c4b0d2802b..e9fc2dce4cd14 100644 --- a/python/dartpy/constraint/JointConstraint.cpp +++ b/python/dartpy/constraint/JointConstraint.cpp @@ -31,6 +31,7 @@ */ #include + #include namespace py = pybind11; diff --git a/python/dartpy/constraint/JointCoulombFrictionConstraint.cpp b/python/dartpy/constraint/JointCoulombFrictionConstraint.cpp index cfa3380d05711..ef3d0ed4b31da 100644 --- a/python/dartpy/constraint/JointCoulombFrictionConstraint.cpp +++ b/python/dartpy/constraint/JointCoulombFrictionConstraint.cpp @@ -31,6 +31,7 @@ */ #include + #include namespace py = pybind11; diff --git a/python/dartpy/constraint/PgsBoxedLcpSolver.cpp b/python/dartpy/constraint/PgsBoxedLcpSolver.cpp index a2e40338ba1bc..d18648d3bbaf6 100644 --- a/python/dartpy/constraint/PgsBoxedLcpSolver.cpp +++ b/python/dartpy/constraint/PgsBoxedLcpSolver.cpp @@ -31,6 +31,7 @@ */ #include + #include namespace py = pybind11; diff --git a/python/dartpy/dartpy.cpp b/python/dartpy/dartpy.cpp index 5791f30483472..38b622c9004ba 100644 --- a/python/dartpy/dartpy.cpp +++ b/python/dartpy/dartpy.cpp @@ -31,6 +31,7 @@ */ #include + #include namespace py = pybind11; diff --git a/python/dartpy/dynamics/BallJoint.cpp b/python/dartpy/dynamics/BallJoint.cpp index 9a9aa905b0318..b6f3488e33783 100644 --- a/python/dartpy/dynamics/BallJoint.cpp +++ b/python/dartpy/dynamics/BallJoint.cpp @@ -31,6 +31,7 @@ */ #include + #include #include #include diff --git a/python/dartpy/dynamics/BodyNode.cpp b/python/dartpy/dynamics/BodyNode.cpp index 59191095a4a7c..73218c92ca04f 100644 --- a/python/dartpy/dynamics/BodyNode.cpp +++ b/python/dartpy/dynamics/BodyNode.cpp @@ -30,14 +30,15 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include -#include -#include - #include "eigen_geometry_pybind.h" #include "eigen_pybind.h" #include "pointers.hpp" +#include + +#include +#include + namespace py = pybind11; #define DARTPY_DEFINE_CREATE_CHILD_JOINT_AND_BODY_NODE_PAIR(joint_type) \ diff --git a/python/dartpy/dynamics/Chain.cpp b/python/dartpy/dynamics/Chain.cpp index a0392292e3ead..e45eae5ce3339 100644 --- a/python/dartpy/dynamics/Chain.cpp +++ b/python/dartpy/dynamics/Chain.cpp @@ -30,12 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include -#include - #include "eigen_geometry_pybind.h" #include "eigen_pybind.h" +#include + +#include + namespace py = pybind11; namespace dart { diff --git a/python/dartpy/dynamics/DegreeOfFreedom.cpp b/python/dartpy/dynamics/DegreeOfFreedom.cpp index aaab6168a9a34..a6d03ff59610d 100644 --- a/python/dartpy/dynamics/DegreeOfFreedom.cpp +++ b/python/dartpy/dynamics/DegreeOfFreedom.cpp @@ -30,12 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include -#include - #include "eigen_geometry_pybind.h" #include "eigen_pybind.h" +#include + +#include + namespace py = pybind11; namespace dart { diff --git a/python/dartpy/dynamics/Entity.cpp b/python/dartpy/dynamics/Entity.cpp index 8dc92cbd7cacf..f987b44e5a142 100644 --- a/python/dartpy/dynamics/Entity.cpp +++ b/python/dartpy/dynamics/Entity.cpp @@ -30,12 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include -#include - #include "eigen_geometry_pybind.h" #include "eigen_pybind.h" +#include + +#include + namespace py = pybind11; namespace dart { diff --git a/python/dartpy/dynamics/EulerJoint.cpp b/python/dartpy/dynamics/EulerJoint.cpp index 2138648c025bf..50072687fffa6 100644 --- a/python/dartpy/dynamics/EulerJoint.cpp +++ b/python/dartpy/dynamics/EulerJoint.cpp @@ -30,13 +30,14 @@ * POSSIBILITY OF SUCH DAMAGE. */ +#include "Joint.hpp" + #include + #include #include #include -#include "Joint.hpp" - namespace py = pybind11; namespace dart { diff --git a/python/dartpy/dynamics/Frame.cpp b/python/dartpy/dynamics/Frame.cpp index 8fcaeb1da90f9..0ac999759ac5e 100644 --- a/python/dartpy/dynamics/Frame.cpp +++ b/python/dartpy/dynamics/Frame.cpp @@ -30,12 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include -#include - #include "eigen_geometry_pybind.h" #include "eigen_pybind.h" +#include + +#include + namespace py = pybind11; namespace dart { diff --git a/python/dartpy/dynamics/FreeJoint.cpp b/python/dartpy/dynamics/FreeJoint.cpp index 5a8ec0823ddda..3c5f42b097302 100644 --- a/python/dartpy/dynamics/FreeJoint.cpp +++ b/python/dartpy/dynamics/FreeJoint.cpp @@ -30,12 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include -#include - #include "eigen_geometry_pybind.h" #include "eigen_pybind.h" +#include + +#include + namespace py = pybind11; namespace dart { diff --git a/python/dartpy/dynamics/GenericJoint.cpp b/python/dartpy/dynamics/GenericJoint.cpp index 248b5909fe6f2..73805e12ff2f6 100644 --- a/python/dartpy/dynamics/GenericJoint.cpp +++ b/python/dartpy/dynamics/GenericJoint.cpp @@ -31,6 +31,7 @@ */ #include + #include #include #include diff --git a/python/dartpy/dynamics/Inertia.cpp b/python/dartpy/dynamics/Inertia.cpp index ec97fca84e258..8657eb0332323 100644 --- a/python/dartpy/dynamics/Inertia.cpp +++ b/python/dartpy/dynamics/Inertia.cpp @@ -31,6 +31,7 @@ */ #include + #include // #include #include "eigen_geometry_pybind.h" diff --git a/python/dartpy/dynamics/InverseKinematics.cpp b/python/dartpy/dynamics/InverseKinematics.cpp index 644ed90a2ce99..5fd1471148d63 100644 --- a/python/dartpy/dynamics/InverseKinematics.cpp +++ b/python/dartpy/dynamics/InverseKinematics.cpp @@ -30,13 +30,14 @@ * POSSIBILITY OF SUCH DAMAGE. */ +#include "eigen_geometry_pybind.h" +#include "eigen_pybind.h" + #include + #include #include -#include "eigen_geometry_pybind.h" -#include "eigen_pybind.h" - namespace py = pybind11; namespace dart { diff --git a/python/dartpy/dynamics/JacobianNode.cpp b/python/dartpy/dynamics/JacobianNode.cpp index 06ef6c1cad853..5cd90cbdbb29a 100644 --- a/python/dartpy/dynamics/JacobianNode.cpp +++ b/python/dartpy/dynamics/JacobianNode.cpp @@ -30,12 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include -#include - #include "eigen_geometry_pybind.h" #include "eigen_pybind.h" +#include + +#include + namespace py = pybind11; namespace dart { diff --git a/python/dartpy/dynamics/Joint.cpp b/python/dartpy/dynamics/Joint.cpp index 5fcfc5b588eab..31a04a9b5ceb0 100644 --- a/python/dartpy/dynamics/Joint.cpp +++ b/python/dartpy/dynamics/Joint.cpp @@ -31,6 +31,7 @@ */ #include + #include #include #include diff --git a/python/dartpy/dynamics/Joint.hpp b/python/dartpy/dynamics/Joint.hpp index 606398704cc5e..1d3a7fadd264e 100644 --- a/python/dartpy/dynamics/Joint.hpp +++ b/python/dartpy/dynamics/Joint.hpp @@ -31,6 +31,7 @@ */ #include + #include #include #include diff --git a/python/dartpy/dynamics/Linkage.cpp b/python/dartpy/dynamics/Linkage.cpp index 41454cac7fe27..c30bc578c9090 100644 --- a/python/dartpy/dynamics/Linkage.cpp +++ b/python/dartpy/dynamics/Linkage.cpp @@ -30,12 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include -#include - #include "eigen_geometry_pybind.h" #include "eigen_pybind.h" +#include + +#include + namespace py = pybind11; namespace dart { diff --git a/python/dartpy/dynamics/MetaSkeleton.cpp b/python/dartpy/dynamics/MetaSkeleton.cpp index e15e71a22585c..0972bc65ced70 100644 --- a/python/dartpy/dynamics/MetaSkeleton.cpp +++ b/python/dartpy/dynamics/MetaSkeleton.cpp @@ -30,13 +30,14 @@ * POSSIBILITY OF SUCH DAMAGE. */ +#include "eigen_geometry_pybind.h" +#include "eigen_pybind.h" + #include + #include #include -#include "eigen_geometry_pybind.h" -#include "eigen_pybind.h" - namespace py = pybind11; namespace dart { diff --git a/python/dartpy/dynamics/Node.cpp b/python/dartpy/dynamics/Node.cpp index 9d0836d767ad5..29471710d665b 100644 --- a/python/dartpy/dynamics/Node.cpp +++ b/python/dartpy/dynamics/Node.cpp @@ -30,14 +30,15 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include -#include -#include - #include "eigen_geometry_pybind.h" #include "eigen_pybind.h" #include "pointers.hpp" +#include + +#include +#include + namespace py = pybind11; namespace dart { diff --git a/python/dartpy/dynamics/PlanarJoint.cpp b/python/dartpy/dynamics/PlanarJoint.cpp index 5a5a0fc3f6d0a..6069a65a837de 100644 --- a/python/dartpy/dynamics/PlanarJoint.cpp +++ b/python/dartpy/dynamics/PlanarJoint.cpp @@ -30,13 +30,14 @@ * POSSIBILITY OF SUCH DAMAGE. */ +#include "Joint.hpp" + #include + #include #include #include -#include "Joint.hpp" - namespace py = pybind11; namespace dart { diff --git a/python/dartpy/dynamics/PrismaticJoint.cpp b/python/dartpy/dynamics/PrismaticJoint.cpp index 33d4ce79b10b1..85aec7535b1eb 100644 --- a/python/dartpy/dynamics/PrismaticJoint.cpp +++ b/python/dartpy/dynamics/PrismaticJoint.cpp @@ -30,13 +30,14 @@ * POSSIBILITY OF SUCH DAMAGE. */ +#include "Joint.hpp" + #include + #include #include #include -#include "Joint.hpp" - namespace py = pybind11; namespace dart { diff --git a/python/dartpy/dynamics/ReferentialSkeleton.cpp b/python/dartpy/dynamics/ReferentialSkeleton.cpp index dbba52935449e..535536269f8fc 100644 --- a/python/dartpy/dynamics/ReferentialSkeleton.cpp +++ b/python/dartpy/dynamics/ReferentialSkeleton.cpp @@ -30,12 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include -#include - #include "eigen_geometry_pybind.h" #include "eigen_pybind.h" +#include + +#include + namespace py = pybind11; namespace dart { diff --git a/python/dartpy/dynamics/RevoluteJoint.cpp b/python/dartpy/dynamics/RevoluteJoint.cpp index 3e193aa835a3b..27b1b2b72b55f 100644 --- a/python/dartpy/dynamics/RevoluteJoint.cpp +++ b/python/dartpy/dynamics/RevoluteJoint.cpp @@ -30,13 +30,14 @@ * POSSIBILITY OF SUCH DAMAGE. */ +#include "Joint.hpp" + #include + #include #include #include -#include "Joint.hpp" - namespace py = pybind11; namespace dart { diff --git a/python/dartpy/dynamics/ScrewJoint.cpp b/python/dartpy/dynamics/ScrewJoint.cpp index 6df7f5f98f0ce..8e5218d81be74 100644 --- a/python/dartpy/dynamics/ScrewJoint.cpp +++ b/python/dartpy/dynamics/ScrewJoint.cpp @@ -30,13 +30,14 @@ * POSSIBILITY OF SUCH DAMAGE. */ +#include "Joint.hpp" + #include + #include #include #include -#include "Joint.hpp" - namespace py = pybind11; namespace dart { diff --git a/python/dartpy/dynamics/Shape.cpp b/python/dartpy/dynamics/Shape.cpp index e30b3aef0d1b8..bf39f02360cce 100644 --- a/python/dartpy/dynamics/Shape.cpp +++ b/python/dartpy/dynamics/Shape.cpp @@ -30,13 +30,14 @@ * POSSIBILITY OF SUCH DAMAGE. */ +#include "eigen_geometry_pybind.h" +#include "eigen_pybind.h" + #include + #include #include -#include "eigen_geometry_pybind.h" -#include "eigen_pybind.h" - namespace py = pybind11; namespace dart { diff --git a/python/dartpy/dynamics/ShapeFrame.cpp b/python/dartpy/dynamics/ShapeFrame.cpp index 9402a3e2abbf6..9dc39876792c6 100644 --- a/python/dartpy/dynamics/ShapeFrame.cpp +++ b/python/dartpy/dynamics/ShapeFrame.cpp @@ -30,12 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include -#include - #include "eigen_geometry_pybind.h" #include "eigen_pybind.h" +#include + +#include + namespace py = pybind11; #define DARTPY_DEFINE_SPECIALIZED_ASPECT(name) \ diff --git a/python/dartpy/dynamics/ShapeNode.cpp b/python/dartpy/dynamics/ShapeNode.cpp index e85040e6fd368..be319f0bb1eb0 100644 --- a/python/dartpy/dynamics/ShapeNode.cpp +++ b/python/dartpy/dynamics/ShapeNode.cpp @@ -30,12 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include -#include - #include "eigen_geometry_pybind.h" #include "eigen_pybind.h" +#include + +#include + namespace py = pybind11; namespace dart { diff --git a/python/dartpy/dynamics/SimpleFrame.cpp b/python/dartpy/dynamics/SimpleFrame.cpp index bde4ab7a4a1a2..97802673933da 100644 --- a/python/dartpy/dynamics/SimpleFrame.cpp +++ b/python/dartpy/dynamics/SimpleFrame.cpp @@ -30,12 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include -#include - #include "eigen_geometry_pybind.h" #include "eigen_pybind.h" +#include + +#include + namespace py = pybind11; namespace dart { diff --git a/python/dartpy/dynamics/Skeleton.cpp b/python/dartpy/dynamics/Skeleton.cpp index 98f00911a82b4..47bf9f35c6887 100644 --- a/python/dartpy/dynamics/Skeleton.cpp +++ b/python/dartpy/dynamics/Skeleton.cpp @@ -30,13 +30,14 @@ * POSSIBILITY OF SUCH DAMAGE. */ +#include "eigen_geometry_pybind.h" +#include "eigen_pybind.h" + #include + #include #include -#include "eigen_geometry_pybind.h" -#include "eigen_pybind.h" - namespace py = pybind11; #define DARTPY_DEFINE_CREATE_JOINT_AND_BODY_NODE_PAIR(joint_type) \ diff --git a/python/dartpy/dynamics/TranslationalJoint.cpp b/python/dartpy/dynamics/TranslationalJoint.cpp index 7d06eed303345..4a86addcb6f98 100644 --- a/python/dartpy/dynamics/TranslationalJoint.cpp +++ b/python/dartpy/dynamics/TranslationalJoint.cpp @@ -30,13 +30,14 @@ * POSSIBILITY OF SUCH DAMAGE. */ +#include "Joint.hpp" + #include + #include #include #include -#include "Joint.hpp" - namespace py = pybind11; namespace dart { diff --git a/python/dartpy/dynamics/TranslationalJoint2D.cpp b/python/dartpy/dynamics/TranslationalJoint2D.cpp index 91d2fd98ce211..7f7705a679424 100644 --- a/python/dartpy/dynamics/TranslationalJoint2D.cpp +++ b/python/dartpy/dynamics/TranslationalJoint2D.cpp @@ -30,13 +30,14 @@ * POSSIBILITY OF SUCH DAMAGE. */ +#include "Joint.hpp" + #include + #include #include #include -#include "Joint.hpp" - namespace py = pybind11; namespace dart { diff --git a/python/dartpy/dynamics/UniversalJoint.cpp b/python/dartpy/dynamics/UniversalJoint.cpp index 4784a670a2891..cf45f75b06e8f 100644 --- a/python/dartpy/dynamics/UniversalJoint.cpp +++ b/python/dartpy/dynamics/UniversalJoint.cpp @@ -30,13 +30,14 @@ * POSSIBILITY OF SUCH DAMAGE. */ +#include "Joint.hpp" + #include + #include #include #include -#include "Joint.hpp" - namespace py = pybind11; namespace dart { diff --git a/python/dartpy/dynamics/WeldJoint.cpp b/python/dartpy/dynamics/WeldJoint.cpp index 3be37afadc0c5..a0016cb29f86d 100644 --- a/python/dartpy/dynamics/WeldJoint.cpp +++ b/python/dartpy/dynamics/WeldJoint.cpp @@ -30,13 +30,14 @@ * POSSIBILITY OF SUCH DAMAGE. */ +#include "Joint.hpp" + #include + #include #include #include -#include "Joint.hpp" - namespace py = pybind11; namespace dart { diff --git a/python/dartpy/dynamics/ZeroDofJoint.cpp b/python/dartpy/dynamics/ZeroDofJoint.cpp index 89314fb9a22ea..fc2dc49c72f9c 100644 --- a/python/dartpy/dynamics/ZeroDofJoint.cpp +++ b/python/dartpy/dynamics/ZeroDofJoint.cpp @@ -30,13 +30,14 @@ * POSSIBILITY OF SUCH DAMAGE. */ +#include "Joint.hpp" + #include + #include #include #include -#include "Joint.hpp" - namespace py = pybind11; namespace dart { diff --git a/python/dartpy/dynamics/pointers.hpp b/python/dartpy/dynamics/pointers.hpp index 49e599c827fe0..fd766f30fdefc 100644 --- a/python/dartpy/dynamics/pointers.hpp +++ b/python/dartpy/dynamics/pointers.hpp @@ -33,6 +33,7 @@ #pragma once #include + #include PYBIND11_DECLARE_HOLDER_TYPE(T, dart::dynamics::TemplateBodyNodePtr, true); diff --git a/python/dartpy/gui/osg/DragAndDrop.cpp b/python/dartpy/gui/osg/DragAndDrop.cpp index 905aa43933251..0a8f405cc8430 100644 --- a/python/dartpy/gui/osg/DragAndDrop.cpp +++ b/python/dartpy/gui/osg/DragAndDrop.cpp @@ -30,8 +30,10 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include #include + +#include + #include #include diff --git a/python/dartpy/gui/osg/GUIEventHandler.cpp b/python/dartpy/gui/osg/GUIEventHandler.cpp index 64970ec03aa50..2c18d7da5e4c4 100644 --- a/python/dartpy/gui/osg/GUIEventHandler.cpp +++ b/python/dartpy/gui/osg/GUIEventHandler.cpp @@ -30,8 +30,10 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include #include + +#include + #include #include diff --git a/python/dartpy/gui/osg/GridVisual.cpp b/python/dartpy/gui/osg/GridVisual.cpp index f1848c46ec078..744f591be8339 100644 --- a/python/dartpy/gui/osg/GridVisual.cpp +++ b/python/dartpy/gui/osg/GridVisual.cpp @@ -31,6 +31,7 @@ */ #include + #include #include diff --git a/python/dartpy/gui/osg/ImGuiHandler.cpp b/python/dartpy/gui/osg/ImGuiHandler.cpp index 69fed3873756c..9a9ea224e40ff 100644 --- a/python/dartpy/gui/osg/ImGuiHandler.cpp +++ b/python/dartpy/gui/osg/ImGuiHandler.cpp @@ -30,8 +30,10 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include #include + +#include + #include #include diff --git a/python/dartpy/gui/osg/ImGuiViewer.cpp b/python/dartpy/gui/osg/ImGuiViewer.cpp index d8ed472f8e5ba..4f33091110390 100644 --- a/python/dartpy/gui/osg/ImGuiViewer.cpp +++ b/python/dartpy/gui/osg/ImGuiViewer.cpp @@ -30,8 +30,10 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include #include + +#include + #include #include diff --git a/python/dartpy/gui/osg/ImGuiWidget.cpp b/python/dartpy/gui/osg/ImGuiWidget.cpp index 79766b73f9fb8..438106177b1c7 100644 --- a/python/dartpy/gui/osg/ImGuiWidget.cpp +++ b/python/dartpy/gui/osg/ImGuiWidget.cpp @@ -30,8 +30,10 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include #include + +#include + #include #include diff --git a/python/dartpy/gui/osg/InteractiveFrame.cpp b/python/dartpy/gui/osg/InteractiveFrame.cpp index e26540cca152a..542ae79a762ea 100644 --- a/python/dartpy/gui/osg/InteractiveFrame.cpp +++ b/python/dartpy/gui/osg/InteractiveFrame.cpp @@ -30,8 +30,10 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include #include + +#include + #include #include #include diff --git a/python/dartpy/gui/osg/RealTimeWorldNode.cpp b/python/dartpy/gui/osg/RealTimeWorldNode.cpp index a162f160fee18..355059a9e8ebe 100644 --- a/python/dartpy/gui/osg/RealTimeWorldNode.cpp +++ b/python/dartpy/gui/osg/RealTimeWorldNode.cpp @@ -30,8 +30,10 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include #include + +#include + #include PYBIND11_DECLARE_HOLDER_TYPE(T, ::osg::ref_ptr, true); diff --git a/python/dartpy/gui/osg/ShadowTechnique.cpp b/python/dartpy/gui/osg/ShadowTechnique.cpp index b7cac993d35e3..c332fa7aba50c 100644 --- a/python/dartpy/gui/osg/ShadowTechnique.cpp +++ b/python/dartpy/gui/osg/ShadowTechnique.cpp @@ -30,8 +30,10 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include #include + +#include + #include #include #include diff --git a/python/dartpy/gui/osg/Viewer.cpp b/python/dartpy/gui/osg/Viewer.cpp index 990a8f83587c5..06cb6a2c54199 100644 --- a/python/dartpy/gui/osg/Viewer.cpp +++ b/python/dartpy/gui/osg/Viewer.cpp @@ -30,8 +30,10 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include #include + +#include + #include #include diff --git a/python/dartpy/gui/osg/ViewerAttachment.cpp b/python/dartpy/gui/osg/ViewerAttachment.cpp index 7fdd7eaa81faf..3eb7aeb1cafa4 100644 --- a/python/dartpy/gui/osg/ViewerAttachment.cpp +++ b/python/dartpy/gui/osg/ViewerAttachment.cpp @@ -30,8 +30,10 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include #include + +#include + #include #include diff --git a/python/dartpy/gui/osg/WorldNode.cpp b/python/dartpy/gui/osg/WorldNode.cpp index 7a8d24f3779ff..111ed05940196 100644 --- a/python/dartpy/gui/osg/WorldNode.cpp +++ b/python/dartpy/gui/osg/WorldNode.cpp @@ -30,8 +30,10 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include #include + +#include + #include #include diff --git a/python/dartpy/math/Geometry.cpp b/python/dartpy/math/Geometry.cpp index d7a3f4567647e..28ef8f2aef36b 100644 --- a/python/dartpy/math/Geometry.cpp +++ b/python/dartpy/math/Geometry.cpp @@ -30,12 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include -#include - #include "eigen_geometry_pybind.h" #include "eigen_pybind.h" +#include + +#include + // TODO(JS): For some reason, passing const reference causes segfault errors. // Use "pass-by-value" for now. #define DARTPY_DEFINE_EULAERTOMATRIX(order) \ diff --git a/python/dartpy/math/Random.cpp b/python/dartpy/math/Random.cpp index 7c9db8cd4813c..fc0cd2fe58e83 100644 --- a/python/dartpy/math/Random.cpp +++ b/python/dartpy/math/Random.cpp @@ -30,12 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include -#include - #include "eigen_geometry_pybind.h" #include "eigen_pybind.h" +#include + +#include + namespace py = pybind11; namespace dart { diff --git a/python/dartpy/optimizer/Function.cpp b/python/dartpy/optimizer/Function.cpp index 0369f95a566c1..f5a0e25244807 100644 --- a/python/dartpy/optimizer/Function.cpp +++ b/python/dartpy/optimizer/Function.cpp @@ -30,13 +30,14 @@ * POSSIBILITY OF SUCH DAMAGE. */ +#include "eigen_geometry_pybind.h" +#include "eigen_pybind.h" + #include + #include #include -#include "eigen_geometry_pybind.h" -#include "eigen_pybind.h" - namespace py = pybind11; namespace dart { diff --git a/python/dartpy/optimizer/GradientDescentSolver.cpp b/python/dartpy/optimizer/GradientDescentSolver.cpp index 88a8ab9f50a3b..76a8f16a9ebf3 100644 --- a/python/dartpy/optimizer/GradientDescentSolver.cpp +++ b/python/dartpy/optimizer/GradientDescentSolver.cpp @@ -30,12 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include -#include - #include "eigen_geometry_pybind.h" #include "eigen_pybind.h" +#include + +#include + namespace py = pybind11; namespace dart { diff --git a/python/dartpy/optimizer/NloptSolver.cpp b/python/dartpy/optimizer/NloptSolver.cpp index a7714b9a7a621..fba30c57af4b6 100644 --- a/python/dartpy/optimizer/NloptSolver.cpp +++ b/python/dartpy/optimizer/NloptSolver.cpp @@ -33,11 +33,13 @@ #include #if HAVE_NLOPT - #include + #include "eigen_pybind.h" + #include - #include - #include "eigen_pybind.h" + #include + + #include namespace py = pybind11; diff --git a/python/dartpy/optimizer/Problem.cpp b/python/dartpy/optimizer/Problem.cpp index d8897de93588b..0061d8cb03d9a 100644 --- a/python/dartpy/optimizer/Problem.cpp +++ b/python/dartpy/optimizer/Problem.cpp @@ -30,13 +30,14 @@ * POSSIBILITY OF SUCH DAMAGE. */ +#include "eigen_geometry_pybind.h" +#include "eigen_pybind.h" + #include + #include #include -#include "eigen_geometry_pybind.h" -#include "eigen_pybind.h" - namespace py = pybind11; namespace dart { diff --git a/python/dartpy/optimizer/Solver.cpp b/python/dartpy/optimizer/Solver.cpp index 6d1cb2b29aaba..8c9d509a29e7a 100644 --- a/python/dartpy/optimizer/Solver.cpp +++ b/python/dartpy/optimizer/Solver.cpp @@ -30,10 +30,11 @@ * POSSIBILITY OF SUCH DAMAGE. */ +#include "eigen_pybind.h" + #include -#include -#include "eigen_pybind.h" +#include namespace py = pybind11; diff --git a/python/dartpy/optimizer/module.cpp b/python/dartpy/optimizer/module.cpp index 741578548608a..d29c7fef37071 100644 --- a/python/dartpy/optimizer/module.cpp +++ b/python/dartpy/optimizer/module.cpp @@ -31,6 +31,7 @@ */ #include + #include namespace py = pybind11; diff --git a/python/dartpy/simulation/World.cpp b/python/dartpy/simulation/World.cpp index 7c350bce3d6e9..b391156d46a94 100644 --- a/python/dartpy/simulation/World.cpp +++ b/python/dartpy/simulation/World.cpp @@ -30,8 +30,10 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include #include + +#include + #include #include diff --git a/python/dartpy/utils/DartLoader.cpp b/python/dartpy/utils/DartLoader.cpp index 56f0c0bc8a608..2804dbaa0ebe6 100644 --- a/python/dartpy/utils/DartLoader.cpp +++ b/python/dartpy/utils/DartLoader.cpp @@ -30,8 +30,10 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include #include + +#include + #include namespace py = pybind11; diff --git a/python/dartpy/utils/MjcfParser.cpp b/python/dartpy/utils/MjcfParser.cpp index 7bbfeb6aadcc2..96cec7c240daa 100644 --- a/python/dartpy/utils/MjcfParser.cpp +++ b/python/dartpy/utils/MjcfParser.cpp @@ -30,8 +30,10 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include #include + +#include + #include namespace py = pybind11; diff --git a/python/dartpy/utils/ResourceRetriever.cpp b/python/dartpy/utils/ResourceRetriever.cpp index 6f8bb1c3c07c2..9b60436350e37 100644 --- a/python/dartpy/utils/ResourceRetriever.cpp +++ b/python/dartpy/utils/ResourceRetriever.cpp @@ -30,8 +30,10 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include #include + +#include + #include namespace py = pybind11; diff --git a/python/dartpy/utils/SdfParser.cpp b/python/dartpy/utils/SdfParser.cpp index 31c10df2f6957..36cc45ab8939e 100644 --- a/python/dartpy/utils/SdfParser.cpp +++ b/python/dartpy/utils/SdfParser.cpp @@ -30,8 +30,10 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include #include + +#include + #include namespace py = pybind11; diff --git a/python/dartpy/utils/SkelParser.cpp b/python/dartpy/utils/SkelParser.cpp index fdb7a072d2a36..c214cd5b625d0 100644 --- a/python/dartpy/utils/SkelParser.cpp +++ b/python/dartpy/utils/SkelParser.cpp @@ -30,8 +30,10 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include #include + +#include + #include namespace py = pybind11; diff --git a/tests/GTestUtils.hpp b/tests/GTestUtils.hpp index 73bf432809f3c..416fe1ac8d5f6 100644 --- a/tests/GTestUtils.hpp +++ b/tests/GTestUtils.hpp @@ -33,12 +33,12 @@ #ifndef DART_UNITTESTS_GTESTUTILS_HPP_ #define DART_UNITTESTS_GTESTUTILS_HPP_ -#include -#include - #include "dart/math/Geometry.hpp" #include "dart/math/MathTypes.hpp" +#include +#include + //============================================================================== #define EXPECT_VECTOR_DOUBLE_EQ(vec1, vec2) \ if (!::dart::test::equals(vec1, vec2)) \ diff --git a/tests/integration/GeneratedWamIkFast.cpp b/tests/integration/GeneratedWamIkFast.cpp index 256967475d258..aa86a5e70258b 100644 --- a/tests/integration/GeneratedWamIkFast.cpp +++ b/tests/integration/GeneratedWamIkFast.cpp @@ -28,11 +28,12 @@ using namespace ikfast; IKFAST_COMPILE_ASSERT(IKFAST_VERSION == 71); #include -#include #include #include #include +#include + #define IKFAST_STRINGIZE2(s) #s #define IKFAST_STRINGIZE(s) IKFAST_STRINGIZE2(s) diff --git a/tests/integration/SharedLibraryWamIkFast.cpp b/tests/integration/SharedLibraryWamIkFast.cpp index b36e4a6c87cc6..02cdb37160cdf 100644 --- a/tests/integration/SharedLibraryWamIkFast.cpp +++ b/tests/integration/SharedLibraryWamIkFast.cpp @@ -40,11 +40,12 @@ using namespace ikfast; IKFAST_COMPILE_ASSERT(IKFAST_VERSION == 71); #include -#include #include #include #include +#include + #define IKFAST_STRINGIZE2(s) #s #define IKFAST_STRINGIZE(s) IKFAST_STRINGIZE2(s) diff --git a/tests/integration/test_Aspect.cpp b/tests/integration/test_Aspect.cpp index 7dc9b30b71a7e..fbc5e9100cfc2 100644 --- a/tests/integration/test_Aspect.cpp +++ b/tests/integration/test_Aspect.cpp @@ -35,8 +35,7 @@ // should NOT be used anywhere outside of this file (testAspect.cpp). #define DART_UNITTEST_SPECIALIZED_ASPECT_ACCESS -#include - +#include "TestHelpers.hpp" #include "dart/common/Composite.hpp" #include "dart/common/EmbeddedAspect.hpp" #include "dart/common/SpecializedForAspect.hpp" @@ -45,7 +44,7 @@ #include "dart/dynamics/BoxShape.hpp" #include "dart/dynamics/EulerJoint.hpp" -#include "TestHelpers.hpp" +#include using namespace dart::common; diff --git a/tests/integration/test_Building.cpp b/tests/integration/test_Building.cpp index dab03c0b08ad0..cc994b9f200c4 100644 --- a/tests/integration/test_Building.cpp +++ b/tests/integration/test_Building.cpp @@ -30,17 +30,16 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include - -#include - +#include "TestHelpers.hpp" #include "dart/dynamics/BodyNode.hpp" #include "dart/dynamics/RevoluteJoint.hpp" #include "dart/dynamics/Skeleton.hpp" #include "dart/math/Geometry.hpp" #include "dart/simulation/World.hpp" -#include "TestHelpers.hpp" +#include + +#include using namespace dart; using namespace math; diff --git a/tests/integration/test_Collision.cpp b/tests/integration/test_Collision.cpp index cd50a24c7cd1c..56508dfd346cf 100644 --- a/tests/integration/test_Collision.cpp +++ b/tests/integration/test_Collision.cpp @@ -30,27 +30,26 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include - -#include - #include "dart/collision/collision.hpp" #include "dart/collision/fcl/fcl.hpp" #include "dart/common/common.hpp" #include "dart/config.hpp" #include "dart/dynamics/dynamics.hpp" #include "dart/math/math.hpp" + +#include + +#include #if HAVE_ODE #include "dart/collision/ode/ode.hpp" #endif #if HAVE_BULLET #include "dart/collision/bullet/bullet.hpp" #endif +#include "TestHelpers.hpp" #include "dart/simulation/simulation.hpp" #include "dart/utils/utils.hpp" -#include "TestHelpers.hpp" - using namespace dart; using namespace common; using namespace math; diff --git a/tests/integration/test_CollisionGroups.cpp b/tests/integration/test_CollisionGroups.cpp index fa31f87e069ba..d41884f570110 100644 --- a/tests/integration/test_CollisionGroups.cpp +++ b/tests/integration/test_CollisionGroups.cpp @@ -30,17 +30,18 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include - -#include -#include - #include "dart/constraint/ConstraintSolver.hpp" #include "dart/dynamics/BoxShape.hpp" #include "dart/dynamics/FreeJoint.hpp" #include "dart/dynamics/Skeleton.hpp" #include "dart/simulation/World.hpp" +#include + +#include + +#include + class CollisionGroupsTest : public testing::Test, public testing::WithParamInterface { diff --git a/tests/integration/test_Common.cpp b/tests/integration/test_Common.cpp index 4a843df67eaee..40d0be553bac8 100644 --- a/tests/integration/test_Common.cpp +++ b/tests/integration/test_Common.cpp @@ -30,10 +30,10 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include - #include "dart/common/Timer.hpp" +#include + using namespace dart::common; //============================================================================== diff --git a/tests/integration/test_CompositeResourceRetriever.cpp b/tests/integration/test_CompositeResourceRetriever.cpp index 059f8f5a841d1..e7f5580e3feb4 100644 --- a/tests/integration/test_CompositeResourceRetriever.cpp +++ b/tests/integration/test_CompositeResourceRetriever.cpp @@ -30,11 +30,10 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include - +#include "TestHelpers.hpp" #include "dart/utils/CompositeResourceRetriever.hpp" -#include "TestHelpers.hpp" +#include using dart::common::Resource; using dart::common::ResourcePtr; diff --git a/tests/integration/test_Concurrency.cpp b/tests/integration/test_Concurrency.cpp index d36ddb500cf3d..7372672eabe53 100644 --- a/tests/integration/test_Concurrency.cpp +++ b/tests/integration/test_Concurrency.cpp @@ -30,14 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include -#include +#include "TestHelpers.hpp" +#include "dart/simulation/World.hpp" #include -#include "dart/simulation/World.hpp" - -#include "TestHelpers.hpp" +#include +#include using namespace dart; using namespace dynamics; diff --git a/tests/integration/test_Constraint.cpp b/tests/integration/test_Constraint.cpp index b0dae507ede44..4d1ffa3d0be4c 100644 --- a/tests/integration/test_Constraint.cpp +++ b/tests/integration/test_Constraint.cpp @@ -30,11 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include - -#include -#include - +#include "TestHelpers.hpp" #include "dart/collision/dart/DARTCollisionDetector.hpp" #include "dart/common/Console.hpp" #include "dart/dynamics/BodyNode.hpp" @@ -45,7 +41,10 @@ #include "dart/simulation/World.hpp" #include "dart/utils/SkelParser.hpp" -#include "TestHelpers.hpp" +#include +#include + +#include //============================================================================== class ConstraintTest : public ::testing::Test diff --git a/tests/integration/test_ConstraintSolver.cpp b/tests/integration/test_ConstraintSolver.cpp index 2a2362e15c912..886b7f2fa2f20 100644 --- a/tests/integration/test_ConstraintSolver.cpp +++ b/tests/integration/test_ConstraintSolver.cpp @@ -30,13 +30,12 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include - +#include "TestHelpers.hpp" #include "dart/constraint/ConstraintSolver.hpp" #include "dart/constraint/ContactSurface.hpp" #include "dart/simulation/World.hpp" -#include "TestHelpers.hpp" +#include using namespace dart; diff --git a/tests/integration/test_ContactConstraint.cpp b/tests/integration/test_ContactConstraint.cpp index a8fbaf96fead8..0dc3bb122c909 100644 --- a/tests/integration/test_ContactConstraint.cpp +++ b/tests/integration/test_ContactConstraint.cpp @@ -30,14 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include - +#include "TestHelpers.hpp" #include "dart/common/common.hpp" #include "dart/constraint/constraint.hpp" #include "dart/dynamics/dynamics.hpp" #include "dart/simulation/World.hpp" -#include "TestHelpers.hpp" +#include using namespace dart; diff --git a/tests/integration/test_DartLoader.cpp b/tests/integration/test_DartLoader.cpp index 1784ccc55f782..62bf6f88f7ead 100644 --- a/tests/integration/test_DartLoader.cpp +++ b/tests/integration/test_DartLoader.cpp @@ -30,16 +30,15 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include - -#include - +#include "TestHelpers.hpp" #include "dart/dynamics/FreeJoint.hpp" #include "dart/dynamics/MeshShape.hpp" #include "dart/dynamics/WeldJoint.hpp" #include "dart/utils/urdf/DartLoader.hpp" -#include "TestHelpers.hpp" +#include + +#include using namespace dart; using dart::common::Uri; diff --git a/tests/integration/test_DartResourceRetriever.cpp b/tests/integration/test_DartResourceRetriever.cpp index e215d6cd4c985..4f5564fa3d0e3 100644 --- a/tests/integration/test_DartResourceRetriever.cpp +++ b/tests/integration/test_DartResourceRetriever.cpp @@ -30,12 +30,12 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include +#include "dart/config.hpp" +#include "dart/utils/DartResourceRetriever.hpp" #include -#include "dart/config.hpp" -#include "dart/utils/DartResourceRetriever.hpp" +#include using namespace dart; diff --git a/tests/integration/test_Distance.cpp b/tests/integration/test_Distance.cpp index e2608049da5a9..9906cb4d9351d 100644 --- a/tests/integration/test_Distance.cpp +++ b/tests/integration/test_Distance.cpp @@ -30,10 +30,10 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include - #include "dart/collision/fcl/fcl.hpp" #include "dart/dart.hpp" + +#include #if HAVE_BULLET #include "dart/collision/bullet/bullet.hpp" #endif diff --git a/tests/integration/test_Dynamics.cpp b/tests/integration/test_Dynamics.cpp index 18a795b94792c..6f47fed32ef4e 100644 --- a/tests/integration/test_Dynamics.cpp +++ b/tests/integration/test_Dynamics.cpp @@ -30,11 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include - -#include -#include - +#include "TestHelpers.hpp" #include "dart/common/Console.hpp" #include "dart/dynamics/BodyNode.hpp" #include "dart/dynamics/SimpleFrame.hpp" @@ -45,7 +41,10 @@ #include "dart/simulation/World.hpp" #include "dart/utils/SkelParser.hpp" -#include "TestHelpers.hpp" +#include +#include + +#include using namespace Eigen; using namespace dart; diff --git a/tests/integration/test_FileInfoWorld.cpp b/tests/integration/test_FileInfoWorld.cpp index 11acc338b4655..015c2fb751e71 100644 --- a/tests/integration/test_FileInfoWorld.cpp +++ b/tests/integration/test_FileInfoWorld.cpp @@ -30,11 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include -#include - -#include - +#include "TestHelpers.hpp" #include "dart/dynamics/BodyNode.hpp" #include "dart/dynamics/RevoluteJoint.hpp" #include "dart/dynamics/Skeleton.hpp" @@ -43,7 +39,10 @@ #include "dart/utils/FileInfoWorld.hpp" #include "dart/utils/SkelParser.hpp" -#include "TestHelpers.hpp" +#include + +#include +#include using namespace dart; using namespace math; diff --git a/tests/integration/test_ForceDependentSlip.cpp b/tests/integration/test_ForceDependentSlip.cpp index 2b14486e645cf..1783a18648a2c 100644 --- a/tests/integration/test_ForceDependentSlip.cpp +++ b/tests/integration/test_ForceDependentSlip.cpp @@ -30,8 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include - +#include "TestHelpers.hpp" #include "dart/collision/ode/OdeCollisionDetector.hpp" #include "dart/constraint/ConstraintSolver.hpp" #include "dart/dynamics/SimpleFrame.hpp" @@ -39,7 +38,7 @@ #include "dart/math/Helpers.hpp" #include "dart/math/Random.hpp" -#include "TestHelpers.hpp" +#include using namespace dart; using namespace dynamics; diff --git a/tests/integration/test_ForwardKinematics.cpp b/tests/integration/test_ForwardKinematics.cpp index dcea45b7dec5b..16aa111d702d3 100644 --- a/tests/integration/test_ForwardKinematics.cpp +++ b/tests/integration/test_ForwardKinematics.cpp @@ -30,13 +30,12 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include +#include "TestHelpers.hpp" +#include "dart/utils/urdf/DartLoader.hpp" #include -#include "dart/utils/urdf/DartLoader.hpp" - -#include "TestHelpers.hpp" +#include std::vector twoLinkIndices; diff --git a/tests/integration/test_Frames.cpp b/tests/integration/test_Frames.cpp index e484c865a3a6b..536edf302e9cb 100644 --- a/tests/integration/test_Frames.cpp +++ b/tests/integration/test_Frames.cpp @@ -30,14 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include - +#include "GTestUtils.hpp" +#include "TestHelpers.hpp" #include "dart/dynamics/SimpleFrame.hpp" #include "dart/math/Helpers.hpp" #include "dart/math/Random.hpp" -#include "GTestUtils.hpp" -#include "TestHelpers.hpp" +#include using namespace dart; using namespace dynamics; diff --git a/tests/integration/test_Friction.cpp b/tests/integration/test_Friction.cpp index 86ec84b84c7a8..03d14556c06c5 100644 --- a/tests/integration/test_Friction.cpp +++ b/tests/integration/test_Friction.cpp @@ -30,13 +30,12 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include - +#include "TestHelpers.hpp" #include "dart/dynamics/SimpleFrame.hpp" #include "dart/math/Helpers.hpp" #include "dart/math/Random.hpp" -#include "TestHelpers.hpp" +#include using namespace dart; using namespace dynamics; diff --git a/tests/integration/test_GenericJoints.cpp b/tests/integration/test_GenericJoints.cpp index 062f0812cfcaf..8f124d08015ae 100644 --- a/tests/integration/test_GenericJoints.cpp +++ b/tests/integration/test_GenericJoints.cpp @@ -30,13 +30,12 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include +#include "TestHelpers.hpp" +#include "dart/dart.hpp" #include -#include "dart/dart.hpp" - -#include "TestHelpers.hpp" +#include using namespace dart; using namespace dynamics; diff --git a/tests/integration/test_IkFast.cpp b/tests/integration/test_IkFast.cpp index 7b282476513e5..859197229eec7 100644 --- a/tests/integration/test_IkFast.cpp +++ b/tests/integration/test_IkFast.cpp @@ -30,13 +30,15 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include +#include "TestHelpers.hpp" -#include #include + +#include + #include -#include "TestHelpers.hpp" +#include using namespace dart; diff --git a/tests/integration/test_Inertia.cpp b/tests/integration/test_Inertia.cpp index 462fcec8e2c73..d2de39e174d23 100644 --- a/tests/integration/test_Inertia.cpp +++ b/tests/integration/test_Inertia.cpp @@ -30,11 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ +#include "TestHelpers.hpp" + #include + #include -#include -#include "TestHelpers.hpp" +#include using namespace dart; diff --git a/tests/integration/test_InverseKinematics.cpp b/tests/integration/test_InverseKinematics.cpp index d35deb975ad9a..0ad1446c57459 100644 --- a/tests/integration/test_InverseKinematics.cpp +++ b/tests/integration/test_InverseKinematics.cpp @@ -30,14 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include - -#include - +#include "TestHelpers.hpp" #include "dart/config.hpp" #include "dart/math/Helpers.hpp" -#include "TestHelpers.hpp" +#include + +#include using namespace Eigen; using namespace dart; diff --git a/tests/integration/test_JointForceTorque.cpp b/tests/integration/test_JointForceTorque.cpp index 9d3d531fee20f..c397eadc17f4a 100644 --- a/tests/integration/test_JointForceTorque.cpp +++ b/tests/integration/test_JointForceTorque.cpp @@ -33,12 +33,11 @@ // The tests in this file are inspired by the tests in: // https://github.com/osrf/gazebo/blob/01b395a5fa92eb054c72f9a2027cdcfd35f287f4/test/integration/joint_force_torque.cc -#include - +#include "TestHelpers.hpp" #include "dart/dart.hpp" #include "dart/utils/sdf/sdf.hpp" -#include "TestHelpers.hpp" +#include using namespace dart; using namespace dart::math; diff --git a/tests/integration/test_Joints.cpp b/tests/integration/test_Joints.cpp index 6fa584da0eb76..7447645823b2a 100644 --- a/tests/integration/test_Joints.cpp +++ b/tests/integration/test_Joints.cpp @@ -30,11 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include -#include - -#include - +#include "TestHelpers.hpp" #include "dart/dynamics/BallJoint.hpp" #include "dart/dynamics/BodyNode.hpp" #include "dart/dynamics/EulerJoint.hpp" @@ -53,7 +49,10 @@ #include "dart/simulation/World.hpp" #include "dart/utils/SkelParser.hpp" -#include "TestHelpers.hpp" +#include + +#include +#include using namespace dart; using namespace dart::math; diff --git a/tests/integration/test_Lemke.cpp b/tests/integration/test_Lemke.cpp index 072a43d778cc7..2ed6bdb0f6667 100644 --- a/tests/integration/test_Lemke.cpp +++ b/tests/integration/test_Lemke.cpp @@ -30,11 +30,10 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include - +#include "TestHelpers.hpp" #include "dart/lcpsolver/Lemke.hpp" -#include "TestHelpers.hpp" +#include //============================================================================== TEST(Lemke, Lemke_1D) diff --git a/tests/integration/test_LocalResourceRetriever.cpp b/tests/integration/test_LocalResourceRetriever.cpp index ccfe50b2c1416..1907fbc865731 100644 --- a/tests/integration/test_LocalResourceRetriever.cpp +++ b/tests/integration/test_LocalResourceRetriever.cpp @@ -30,11 +30,10 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include - +#include "TestHelpers.hpp" #include "dart/common/LocalResourceRetriever.hpp" -#include "TestHelpers.hpp" +#include using dart::common::LocalResourceRetriever; using dart::common::Resource; diff --git a/tests/integration/test_MetaSkeleton.cpp b/tests/integration/test_MetaSkeleton.cpp index 5eb13551367f0..852b3e82f01ff 100644 --- a/tests/integration/test_MetaSkeleton.cpp +++ b/tests/integration/test_MetaSkeleton.cpp @@ -30,10 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include - -#include - +#include "TestHelpers.hpp" #include "dart/common/sub_ptr.hpp" #include "dart/dynamics/BodyNode.hpp" #include "dart/dynamics/RevoluteJoint.hpp" @@ -42,7 +39,9 @@ #include "dart/simulation/World.hpp" #include "dart/utils/SkelParser.hpp" -#include "TestHelpers.hpp" +#include + +#include using namespace dart; using namespace math; diff --git a/tests/integration/test_MjcfParser.cpp b/tests/integration/test_MjcfParser.cpp index 45292077ae0b2..ff36fcd185b3c 100644 --- a/tests/integration/test_MjcfParser.cpp +++ b/tests/integration/test_MjcfParser.cpp @@ -30,17 +30,16 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include - -#include - +#include "TestHelpers.hpp" #include "dart/dart.hpp" #include "dart/utils/mjcf/detail/MujocoModel.hpp" #include "dart/utils/mjcf/detail/Types.hpp" #include "dart/utils/mjcf/detail/Utils.hpp" #include "dart/utils/utils.hpp" -#include "TestHelpers.hpp" +#include + +#include using namespace dart; using namespace utils::MjcfParser::detail; diff --git a/tests/integration/test_NameManagement.cpp b/tests/integration/test_NameManagement.cpp index 60effe8486bc0..ff9b597461318 100644 --- a/tests/integration/test_NameManagement.cpp +++ b/tests/integration/test_NameManagement.cpp @@ -30,13 +30,12 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include +#include "TestHelpers.hpp" +#include "dart/dynamics/SoftBodyNode.hpp" #include -#include "dart/dynamics/SoftBodyNode.hpp" - -#include "TestHelpers.hpp" +#include using namespace dart; using namespace math; diff --git a/tests/integration/test_Optimizer.cpp b/tests/integration/test_Optimizer.cpp index 488ba8e3c7ffa..3316fdd741688 100644 --- a/tests/integration/test_Optimizer.cpp +++ b/tests/integration/test_Optimizer.cpp @@ -31,14 +31,7 @@ */ // For problem -#include -#include -#include -#include - -#include -#include - +#include "TestHelpers.hpp" #include "dart/common/Console.hpp" #include "dart/config.hpp" #include "dart/dynamics/FreeJoint.hpp" @@ -48,7 +41,14 @@ #include "dart/optimizer/GradientDescentSolver.hpp" #include "dart/optimizer/Problem.hpp" -#include "TestHelpers.hpp" +#include +#include + +#include +#include +#include + +#include #if HAVE_NLOPT #include "dart/optimizer/nlopt/NloptSolver.hpp" #endif diff --git a/tests/integration/test_PackageResourceRetriever.cpp b/tests/integration/test_PackageResourceRetriever.cpp index 791b787153e5a..695701e0eea20 100644 --- a/tests/integration/test_PackageResourceRetriever.cpp +++ b/tests/integration/test_PackageResourceRetriever.cpp @@ -30,12 +30,11 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include - +#include "TestHelpers.hpp" #include "dart/config.hpp" #include "dart/utils/PackageResourceRetriever.hpp" -#include "TestHelpers.hpp" +#include using dart::common::Resource; using dart::common::ResourcePtr; diff --git a/tests/integration/test_Raycast.cpp b/tests/integration/test_Raycast.cpp index b2044d1d79933..a35e59f2f8a36 100644 --- a/tests/integration/test_Raycast.cpp +++ b/tests/integration/test_Raycast.cpp @@ -30,10 +30,10 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include - #include "dart/collision/fcl/fcl.hpp" #include "dart/dart.hpp" + +#include #if HAVE_BULLET #include "dart/collision/bullet/bullet.hpp" #endif diff --git a/tests/integration/test_ScrewJoint.cpp b/tests/integration/test_ScrewJoint.cpp index ba683346459cd..f464456cf9c60 100644 --- a/tests/integration/test_ScrewJoint.cpp +++ b/tests/integration/test_ScrewJoint.cpp @@ -30,11 +30,11 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include +#include "dart/dart.hpp" #include -#include "dart/dart.hpp" +#include using namespace dart; diff --git a/tests/integration/test_SdfParser.cpp b/tests/integration/test_SdfParser.cpp index 47b917c4ebcac..feab3f758715f 100644 --- a/tests/integration/test_SdfParser.cpp +++ b/tests/integration/test_SdfParser.cpp @@ -30,10 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include - -#include - +#include "TestHelpers.hpp" #include "dart/dynamics/PlanarJoint.hpp" #include "dart/dynamics/RevoluteJoint.hpp" #include "dart/dynamics/Skeleton.hpp" @@ -41,7 +38,9 @@ #include "dart/simulation/World.hpp" #include "dart/utils/sdf/SdfParser.hpp" -#include "TestHelpers.hpp" +#include + +#include using namespace dart; using namespace math; diff --git a/tests/integration/test_Signal.cpp b/tests/integration/test_Signal.cpp index a92a0595cd171..cd49332b4765d 100644 --- a/tests/integration/test_Signal.cpp +++ b/tests/integration/test_Signal.cpp @@ -30,11 +30,11 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include +#include "dart/dart.hpp" #include -#include "dart/dart.hpp" +#include using namespace std; using namespace Eigen; diff --git a/tests/integration/test_SkelParser.cpp b/tests/integration/test_SkelParser.cpp index b91b36852fc95..d2daeffc84d14 100644 --- a/tests/integration/test_SkelParser.cpp +++ b/tests/integration/test_SkelParser.cpp @@ -30,15 +30,14 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include - -#include - +#include "GTestUtils.hpp" +#include "TestHelpers.hpp" #include "dart/dart.hpp" #include "dart/utils/utils.hpp" -#include "GTestUtils.hpp" -#include "TestHelpers.hpp" +#include + +#include using namespace dart; using namespace math; diff --git a/tests/integration/test_Skeleton.cpp b/tests/integration/test_Skeleton.cpp index e2fb881f54b1a..33091c015234d 100644 --- a/tests/integration/test_Skeleton.cpp +++ b/tests/integration/test_Skeleton.cpp @@ -30,10 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include - -#include - +#include "TestHelpers.hpp" #include "dart/common/sub_ptr.hpp" #include "dart/dynamics/BodyNode.hpp" #include "dart/dynamics/RevoluteJoint.hpp" @@ -42,7 +39,9 @@ #include "dart/simulation/World.hpp" #include "dart/utils/SkelParser.hpp" -#include "TestHelpers.hpp" +#include + +#include using namespace dart; using namespace math; diff --git a/tests/integration/test_SoftDynamics.cpp b/tests/integration/test_SoftDynamics.cpp index 953c887dced37..4ccc6ee40e784 100644 --- a/tests/integration/test_SoftDynamics.cpp +++ b/tests/integration/test_SoftDynamics.cpp @@ -30,12 +30,6 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include -#include - -#include -#include - #include "dart/common/Console.hpp" #include "dart/dynamics/Joint.hpp" #include "dart/dynamics/PointMass.hpp" @@ -45,6 +39,12 @@ #include "dart/simulation/World.hpp" #include "dart/utils/SkelParser.hpp" +#include +#include + +#include +#include + using namespace std; using namespace Eigen; using namespace dart; diff --git a/tests/integration/test_Subscriptions.cpp b/tests/integration/test_Subscriptions.cpp index a3e801ffeee17..dc2affae7440e 100644 --- a/tests/integration/test_Subscriptions.cpp +++ b/tests/integration/test_Subscriptions.cpp @@ -30,12 +30,12 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include - #include "dart/common/sub_ptr.hpp" #include "dart/dynamics/BoxShape.hpp" #include "dart/dynamics/SimpleFrame.hpp" +#include + using namespace dart; using namespace dynamics; diff --git a/tests/integration/test_VskParser.cpp b/tests/integration/test_VskParser.cpp index 7e68db27f697c..b46af93cd5f6b 100644 --- a/tests/integration/test_VskParser.cpp +++ b/tests/integration/test_VskParser.cpp @@ -30,10 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include - -#include - +#include "TestHelpers.hpp" #include "dart/config.hpp" #include "dart/dynamics/PlanarJoint.hpp" #include "dart/dynamics/RevoluteJoint.hpp" @@ -42,7 +39,9 @@ #include "dart/simulation/World.hpp" #include "dart/utils/VskParser.hpp" -#include "TestHelpers.hpp" +#include + +#include using namespace dart; using namespace math; diff --git a/tests/integration/test_World.cpp b/tests/integration/test_World.cpp index 3154c7a3d4a8b..281f8361cfe9f 100644 --- a/tests/integration/test_World.cpp +++ b/tests/integration/test_World.cpp @@ -30,10 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include - -#include - +#include "TestHelpers.hpp" #include "dart/collision/collision.hpp" #include "dart/dynamics/BodyNode.hpp" #include "dart/dynamics/RevoluteJoint.hpp" @@ -41,7 +38,9 @@ #include "dart/math/Geometry.hpp" #include "dart/utils/SkelParser.hpp" -#include "TestHelpers.hpp" +#include + +#include #if HAVE_BULLET #include "dart/collision/bullet/bullet.hpp" #endif diff --git a/tests/regression/test_Issue000Template.cpp b/tests/regression/test_Issue000Template.cpp index 053db9ab94c9a..41d49a7117892 100644 --- a/tests/regression/test_Issue000Template.cpp +++ b/tests/regression/test_Issue000Template.cpp @@ -30,8 +30,9 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include #include + +#include #include using namespace dart; diff --git a/tests/regression/test_Issue1184.cpp b/tests/regression/test_Issue1184.cpp index 10e08102eed47..bbc58a14d1bbf 100644 --- a/tests/regression/test_Issue1184.cpp +++ b/tests/regression/test_Issue1184.cpp @@ -30,15 +30,18 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include +#include + #include + #include #include #include #include #include #include -#include + +#include #include //============================================================================== diff --git a/tests/regression/test_Issue1193.cpp b/tests/regression/test_Issue1193.cpp index e60009f765404..d3ac9e639086a 100644 --- a/tests/regression/test_Issue1193.cpp +++ b/tests/regression/test_Issue1193.cpp @@ -30,12 +30,11 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include - +#include "TestHelpers.hpp" #include "dart/dart.hpp" #include "dart/utils/sdf/SdfParser.hpp" -#include "TestHelpers.hpp" +#include using namespace dart::math; using namespace dart::collision; diff --git a/tests/regression/test_Issue1231.cpp b/tests/regression/test_Issue1231.cpp index b84945d381b8a..a1f3a4a814483 100644 --- a/tests/regression/test_Issue1231.cpp +++ b/tests/regression/test_Issue1231.cpp @@ -30,13 +30,16 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include +#include + #include + #include #include #include #include -#include + +#include #include //============================================================================== diff --git a/tests/regression/test_Issue1234.cpp b/tests/regression/test_Issue1234.cpp index 7186c692a8f47..faeca909e7511 100644 --- a/tests/regression/test_Issue1234.cpp +++ b/tests/regression/test_Issue1234.cpp @@ -30,18 +30,23 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include +#include + +#include + +#include + #include #include -#include + #include #include #include #include #include #include -#include -#include + +#include #include //============================================================================== diff --git a/tests/regression/test_Issue1243.cpp b/tests/regression/test_Issue1243.cpp index bd38a020ce1f2..740ac0d0a5384 100644 --- a/tests/regression/test_Issue1243.cpp +++ b/tests/regression/test_Issue1243.cpp @@ -30,8 +30,9 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include #include + +#include #include dart::dynamics::SkeletonPtr create_box( diff --git a/tests/regression/test_Issue1445.cpp b/tests/regression/test_Issue1445.cpp index dc864fdad994f..2f3542dd790fb 100644 --- a/tests/regression/test_Issue1445.cpp +++ b/tests/regression/test_Issue1445.cpp @@ -30,9 +30,11 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include -#include #include + +#include + +#include #include // This test is adapted from @azeey's work here: diff --git a/tests/regression/test_Issue1583.cpp b/tests/regression/test_Issue1583.cpp index a44a60e4a19ea..995dde9a66b32 100644 --- a/tests/regression/test_Issue1583.cpp +++ b/tests/regression/test_Issue1583.cpp @@ -30,9 +30,11 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include -#include #include + +#include + +#include #include //======================================================================================== diff --git a/tests/regression/test_Issue1596.cpp b/tests/regression/test_Issue1596.cpp index 596b56de84a17..ea610e59050b7 100644 --- a/tests/regression/test_Issue1596.cpp +++ b/tests/regression/test_Issue1596.cpp @@ -30,9 +30,11 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include -#include #include + +#include + +#include #include //======================================================================================== diff --git a/tests/regression/test_Issue1624.cpp b/tests/regression/test_Issue1624.cpp index 29d1625acad87..addbeb94bc75e 100644 --- a/tests/regression/test_Issue1624.cpp +++ b/tests/regression/test_Issue1624.cpp @@ -30,13 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include -#include - +#include "TestHelpers.hpp" #include "dart/dart.hpp" #include "dart/utils/sdf/SdfParser.hpp" -#include "TestHelpers.hpp" +#include + +#include using namespace dart::math; using namespace dart::collision; diff --git a/tests/regression/test_Issue838.cpp b/tests/regression/test_Issue838.cpp index a41e9844f5884..16703cd621028 100644 --- a/tests/regression/test_Issue838.cpp +++ b/tests/regression/test_Issue838.cpp @@ -30,9 +30,11 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include -#include #include + +#include + +#include #include //============================================================================== diff --git a/tests/regression/test_Issue892.cpp b/tests/regression/test_Issue892.cpp index a9389c0a2c0dd..b3c8fc5d93c9b 100644 --- a/tests/regression/test_Issue892.cpp +++ b/tests/regression/test_Issue892.cpp @@ -30,9 +30,11 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include -#include #include + +#include + +#include #include using namespace dart::collision; diff --git a/tests/regression/test_Issue895.cpp b/tests/regression/test_Issue895.cpp index d39fb4ba0944f..0c07cb544ce6b 100644 --- a/tests/regression/test_Issue895.cpp +++ b/tests/regression/test_Issue895.cpp @@ -30,9 +30,11 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include -#include #include + +#include + +#include #include //============================================================================== diff --git a/tests/regression/test_Issue986.cpp b/tests/regression/test_Issue986.cpp index d95a753d5c590..ab5219b069201 100644 --- a/tests/regression/test_Issue986.cpp +++ b/tests/regression/test_Issue986.cpp @@ -30,9 +30,11 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include -#include #include + +#include + +#include #include //============================================================================== diff --git a/tests/unit/common/test_CAllocator.cpp b/tests/unit/common/test_CAllocator.cpp index 07ab3c96ec197..4facae84608fa 100644 --- a/tests/unit/common/test_CAllocator.cpp +++ b/tests/unit/common/test_CAllocator.cpp @@ -30,10 +30,11 @@ * POSSIBILITY OF SUCH DAMAGE. */ +#include "TestHelpers.hpp" + #include -#include -#include "TestHelpers.hpp" +#include using namespace dart; diff --git a/tests/unit/common/test_Factory.cpp b/tests/unit/common/test_Factory.cpp index 56b54eccc41df..8078bb7d36e05 100644 --- a/tests/unit/common/test_Factory.cpp +++ b/tests/unit/common/test_Factory.cpp @@ -30,10 +30,11 @@ * POSSIBILITY OF SUCH DAMAGE. */ +#include "TestHelpers.hpp" + #include -#include -#include "TestHelpers.hpp" +#include using namespace dart; diff --git a/tests/unit/common/test_FreeListAllocator.cpp b/tests/unit/common/test_FreeListAllocator.cpp index f0e24f76987ba..810d93def1688 100644 --- a/tests/unit/common/test_FreeListAllocator.cpp +++ b/tests/unit/common/test_FreeListAllocator.cpp @@ -30,10 +30,11 @@ * POSSIBILITY OF SUCH DAMAGE. */ +#include "TestHelpers.hpp" + #include -#include -#include "TestHelpers.hpp" +#include using namespace dart; using namespace common; diff --git a/tests/unit/common/test_Logging.cpp b/tests/unit/common/test_Logging.cpp index 6bdb7c1cb6dd0..4595a768b54f2 100644 --- a/tests/unit/common/test_Logging.cpp +++ b/tests/unit/common/test_Logging.cpp @@ -30,10 +30,11 @@ * POSSIBILITY OF SUCH DAMAGE. */ +#include "TestHelpers.hpp" + #include -#include -#include "TestHelpers.hpp" +#include using namespace dart; diff --git a/tests/unit/common/test_MemoryManager.cpp b/tests/unit/common/test_MemoryManager.cpp index 9e7b5b003e0dc..237331049e512 100644 --- a/tests/unit/common/test_MemoryManager.cpp +++ b/tests/unit/common/test_MemoryManager.cpp @@ -30,10 +30,11 @@ * POSSIBILITY OF SUCH DAMAGE. */ +#include "TestHelpers.hpp" + #include -#include -#include "TestHelpers.hpp" +#include using namespace dart; using namespace common; diff --git a/tests/unit/common/test_PoolAllocator.cpp b/tests/unit/common/test_PoolAllocator.cpp index 8d67d735f55fd..e9a02a3be5f8f 100644 --- a/tests/unit/common/test_PoolAllocator.cpp +++ b/tests/unit/common/test_PoolAllocator.cpp @@ -30,10 +30,11 @@ * POSSIBILITY OF SUCH DAMAGE. */ +#include "TestHelpers.hpp" + #include -#include -#include "TestHelpers.hpp" +#include using namespace dart; using namespace common; diff --git a/tests/unit/common/test_StlAllocator.cpp b/tests/unit/common/test_StlAllocator.cpp index d679f0704f34a..cb67450b13a24 100644 --- a/tests/unit/common/test_StlAllocator.cpp +++ b/tests/unit/common/test_StlAllocator.cpp @@ -30,10 +30,11 @@ * POSSIBILITY OF SUCH DAMAGE. */ +#include "TestHelpers.hpp" + #include -#include -#include "TestHelpers.hpp" +#include using namespace dart; using namespace common; diff --git a/tests/unit/common/test_Stopwatch.cpp b/tests/unit/common/test_Stopwatch.cpp index 5af3e1f9303f1..fd62d5f86941f 100644 --- a/tests/unit/common/test_Stopwatch.cpp +++ b/tests/unit/common/test_Stopwatch.cpp @@ -30,10 +30,11 @@ * POSSIBILITY OF SUCH DAMAGE. */ +#include "TestHelpers.hpp" + #include -#include -#include "TestHelpers.hpp" +#include using namespace dart; using namespace common; diff --git a/tests/unit/common/test_String.cpp b/tests/unit/common/test_String.cpp index 2bc5946f7a58b..87e7624e84215 100644 --- a/tests/unit/common/test_String.cpp +++ b/tests/unit/common/test_String.cpp @@ -31,6 +31,7 @@ */ #include + #include using namespace dart; diff --git a/tests/unit/common/test_Uri.cpp b/tests/unit/common/test_Uri.cpp index 62ae73241e321..31b8becb8d3ed 100644 --- a/tests/unit/common/test_Uri.cpp +++ b/tests/unit/common/test_Uri.cpp @@ -30,11 +30,10 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include - +#include "TestHelpers.hpp" #include "dart/common/Uri.hpp" -#include "TestHelpers.hpp" +#include using dart::common::Uri; diff --git a/tests/unit/common/test_ecs.cpp b/tests/unit/common/test_ecs.cpp index 9f82f1b8fbad7..86bde93793874 100644 --- a/tests/unit/common/test_ecs.cpp +++ b/tests/unit/common/test_ecs.cpp @@ -31,6 +31,7 @@ */ #include + #include namespace { diff --git a/tests/unit/math/test_Geometry.cpp b/tests/unit/math/test_Geometry.cpp index 0f698bb33b30b..55c7a3376fd71 100644 --- a/tests/unit/math/test_Geometry.cpp +++ b/tests/unit/math/test_Geometry.cpp @@ -30,14 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include - -#include - +#include "TestHelpers.hpp" #include "dart/math/Geometry.hpp" #include "dart/math/Helpers.hpp" -#include "TestHelpers.hpp" +#include + +#include using namespace dart; using namespace math; diff --git a/tests/unit/math/test_Icosphere.cpp b/tests/unit/math/test_Icosphere.cpp index 3d30fca145209..f7fd462d18f86 100644 --- a/tests/unit/math/test_Icosphere.cpp +++ b/tests/unit/math/test_Icosphere.cpp @@ -30,11 +30,10 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include - +#include "TestHelpers.hpp" #include "dart/math/Icosphere.hpp" -#include "TestHelpers.hpp" +#include using namespace dart; using namespace math; diff --git a/tests/unit/math/test_Math.cpp b/tests/unit/math/test_Math.cpp index d20b3dd1c5a1f..38342beb4b368 100644 --- a/tests/unit/math/test_Math.cpp +++ b/tests/unit/math/test_Math.cpp @@ -30,10 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include - -#include - +#include "TestHelpers.hpp" #include "dart/common/Stopwatch.hpp" #include "dart/dynamics/RevoluteJoint.hpp" #include "dart/dynamics/Skeleton.hpp" @@ -41,7 +38,9 @@ #include "dart/math/Helpers.hpp" #include "dart/simulation/World.hpp" -#include "TestHelpers.hpp" +#include + +#include using namespace dart; using namespace common; diff --git a/tests/unit/math/test_Random.cpp b/tests/unit/math/test_Random.cpp index 5761f159f494e..8a139e4c9fa42 100644 --- a/tests/unit/math/test_Random.cpp +++ b/tests/unit/math/test_Random.cpp @@ -30,10 +30,11 @@ * POSSIBILITY OF SUCH DAMAGE. */ +#include "TestHelpers.hpp" + #include -#include -#include "TestHelpers.hpp" +#include using namespace dart; using namespace dart::math; diff --git a/tests/unit/math/test_TriMesh.cpp b/tests/unit/math/test_TriMesh.cpp index 450551c54dd9c..ac9c6e2b73c42 100644 --- a/tests/unit/math/test_TriMesh.cpp +++ b/tests/unit/math/test_TriMesh.cpp @@ -30,11 +30,10 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include - +#include "TestHelpers.hpp" #include "dart/math/TriMesh.hpp" -#include "TestHelpers.hpp" +#include using namespace dart; using namespace math; diff --git a/tutorials/tutorial_biped/main.cpp b/tutorials/tutorial_biped/main.cpp index 32ee3ed637efa..541bb98a1cb42 100644 --- a/tutorials/tutorial_biped/main.cpp +++ b/tutorials/tutorial_biped/main.cpp @@ -30,10 +30,12 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include #include + #include +#include + const double default_speed_increment = 0.5; [[maybe_unused]] const int default_ik_iterations = 4500; diff --git a/tutorials/tutorial_biped_finished/main.cpp b/tutorials/tutorial_biped_finished/main.cpp index 5e4543f4f9820..005c2a69b1f6a 100644 --- a/tutorials/tutorial_biped_finished/main.cpp +++ b/tutorials/tutorial_biped_finished/main.cpp @@ -30,10 +30,12 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include #include + #include +#include + const double default_speed_increment = 0.5; const int default_ik_iterations = 4500; diff --git a/tutorials/tutorial_collisions/main.cpp b/tutorials/tutorial_collisions/main.cpp index 8c1d260b58551..8ab1715675d85 100644 --- a/tutorials/tutorial_collisions/main.cpp +++ b/tutorials/tutorial_collisions/main.cpp @@ -30,10 +30,11 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include +#include #include -#include + +#include [[maybe_unused]] const double default_shape_density = 1000; // kg/m^3 [[maybe_unused]] const double default_shape_height = 0.1; // m diff --git a/tutorials/tutorial_collisions_finished/main.cpp b/tutorials/tutorial_collisions_finished/main.cpp index 84e19f5657e1d..0c41b7163db85 100644 --- a/tutorials/tutorial_collisions_finished/main.cpp +++ b/tutorials/tutorial_collisions_finished/main.cpp @@ -30,10 +30,11 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include +#include #include -#include + +#include const double default_shape_density = 1000; // kg/m^3 const double default_shape_height = 0.1; // m diff --git a/tutorials/tutorial_dominoes/main.cpp b/tutorials/tutorial_dominoes/main.cpp index 5c93039791e14..a88fa95353031 100644 --- a/tutorials/tutorial_dominoes/main.cpp +++ b/tutorials/tutorial_dominoes/main.cpp @@ -30,9 +30,10 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include #include +#include + const double default_domino_height = 0.3; const double default_domino_width = 0.4 * default_domino_height; const double default_domino_depth = default_domino_width / 5.0; diff --git a/tutorials/tutorial_dominoes_finished/main.cpp b/tutorials/tutorial_dominoes_finished/main.cpp index 07fd232618b03..a4fae7400ebbf 100644 --- a/tutorials/tutorial_dominoes_finished/main.cpp +++ b/tutorials/tutorial_dominoes_finished/main.cpp @@ -30,10 +30,12 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include #include + #include +#include + const double default_domino_height = 0.3; const double default_domino_width = 0.4 * default_domino_height; const double default_domino_depth = default_domino_width / 5.0; diff --git a/tutorials/tutorial_multi_pendulum/main.cpp b/tutorials/tutorial_multi_pendulum/main.cpp index ead6b9bcfc52b..b385eef7e210e 100644 --- a/tutorials/tutorial_multi_pendulum/main.cpp +++ b/tutorials/tutorial_multi_pendulum/main.cpp @@ -30,9 +30,10 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include #include +#include + const double default_height = 1.0; // m const double default_width = 0.2; // m const double default_depth = 0.2; // m diff --git a/tutorials/tutorial_multi_pendulum_finished/main.cpp b/tutorials/tutorial_multi_pendulum_finished/main.cpp index 542054ccafb90..fee432442c122 100644 --- a/tutorials/tutorial_multi_pendulum_finished/main.cpp +++ b/tutorials/tutorial_multi_pendulum_finished/main.cpp @@ -30,9 +30,10 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include #include +#include + const double default_height = 1.0; // m const double default_width = 0.2; // m const double default_depth = 0.2; // m