Ros2 humble

.github/workflows/industrial_ci_action.yml

@@ -0,0 +1,15 @@
+name: CI
+
+on: [push, pull_request]
+
+jobs:
+  industrial_ci:
+    strategy:
+      matrix:
+        env:
+          - {ROS_DISTRO: humble, ROS_REPO: main, AMENT_CPPCHECK_ALLOW_SLOW_VERSIONS: true}
+    runs-on: ubuntu-22.04
+    steps:
+      - uses: actions/checkout@v1
+      - uses: 'ros-industrial/industrial_ci@master'
+        env: ${{matrix.env}}

.gitignore

@@ -7,4 +7,6 @@ docs/_templates/*
 .vscode/*
 */.vscode
 .history
-*/.history
+*/.history
+**/.idea/
+**/cmake-build-debug/

.travis.yml

@@ -1,13 +1,12 @@
-language:
-  - cpp
-  - python
+language: generic 
 services:
   - docker
+cache:
+  directories:
+    - $HOME/.ccache
 env:
-  global:
-    - CCACHE_DIR=$HOME/.ccache
   matrix:
-    - ROS_DISTRO="eloquent" #ROS_REPOSITORY_PATH=http://packages.ros.org/ros/ubuntu BEFORE_SCRIPT='./scripts/ci_prebuild.sh' AFTER_SCRIPT='./scripts/ci_postbuild.sh'
+    - ROS_DISTRO="foxy" BEFORE_SCRIPT='./scripts/ci_prebuild.sh' AFTER_SCRIPT='./scripts/ci_postbuild.sh'
 install:
   - git clone --quiet --depth 1 https://github.com/ros-industrial/industrial_ci.git .industrial_ci -b master
 script: 

flatland_box2d/CMakeLists.txt

@@ -0,0 +1,174 @@
+
+set(BOX2D_Collision_SRCS
+	src/Collision/b2BroadPhase.cpp
+	src/Collision/b2CollideCircle.cpp
+	src/Collision/b2CollideEdge.cpp
+	src/Collision/b2CollidePolygon.cpp
+	src/Collision/b2Collision.cpp
+	src/Collision/b2Distance.cpp
+	src/Collision/b2DynamicTree.cpp
+	src/Collision/b2TimeOfImpact.cpp
+)
+set(BOX2D_Collision_HDRS
+
+	include/Box2D/Collision/b2Collision.h
+	include/Box2D/Collision/b2Distance.h
+	include/Box2D/Collision/b2DynamicTree.h
+	include/Box2D/Collision/b2TimeOfImpact.h
+)
+set(BOX2D_Shapes_SRCS
+	src/Collision/Shapes/b2CircleShape.cpp
+	src/Collision/Shapes/b2EdgeShape.cpp
+	src/Collision/Shapes/b2ChainShape.cpp
+	src/Collision/Shapes/b2PolygonShape.cpp
+)
+set(BOX2D_Shapes_HDRS
+	include/Box2D/Collision/Shapes/b2CircleShape.h
+	include/Box2D/Collision/Shapes/b2EdgeShape.h
+	include/Box2D/Collision/Shapes/b2ChainShape.h
+	include/Box2D/Collision/Shapes/b2PolygonShape.h
+	include/Box2D/Collision/Shapes/b2Shape.h
+)
+set(BOX2D_Common_SRCS
+	src/Common/b2BlockAllocator.cpp
+	src/Common/b2Draw.cpp
+	src/Common/b2Math.cpp
+	src/Common/b2Settings.cpp
+	src/Common/b2StackAllocator.cpp
+	src/Common/b2Timer.cpp
+)
+set(BOX2D_Common_HDRS
+	include/Box2D/Common/b2BlockAllocator.h
+	include/Box2D/Common/b2Draw.h
+	include/Box2D/Common/b2GrowableStack.h
+	include/Box2D/Common/b2Math.h
+	include/Box2D/Common/b2Settings.h
+	include/Box2D/Common/b2StackAllocator.h
+	include/Box2D/Common/b2Timer.h
+)
+set(BOX2D_Dynamics_SRCS
+	src/Dynamics/b2Body.cpp
+	src/Dynamics/b2ContactManager.cpp
+	src/Dynamics/b2Fixture.cpp
+	src/Dynamics/b2Island.cpp
+	src/Dynamics/b2World.cpp
+	src/Dynamics/b2WorldCallbacks.cpp
+)
+set(BOX2D_Dynamics_HDRS
+	include/Box2D/Dynamics/b2Body.h
+	include/Box2D/Dynamics/b2ContactManager.h
+	include/Box2D/Dynamics/b2Fixture.h
+	include/Box2D/Dynamics/b2Island.h
+	include/Box2D/Dynamics/b2TimeStep.h
+	include/Box2D/Dynamics/b2World.h
+	include/Box2D/Dynamics/b2WorldCallbacks.h
+)
+set(BOX2D_Contacts_SRCS
+	src/Dynamics/Contacts/b2CircleContact.cpp
+	src/Dynamics/Contacts/b2Contact.cpp
+	src/Dynamics/Contacts/b2ContactSolver.cpp
+	src/Dynamics/Contacts/b2PolygonAndCircleContact.cpp
+	src/Dynamics/Contacts/b2EdgeAndCircleContact.cpp
+	src/Dynamics/Contacts/b2EdgeAndPolygonContact.cpp
+	src/Dynamics/Contacts/b2ChainAndCircleContact.cpp
+	src/Dynamics/Contacts/b2ChainAndPolygonContact.cpp
+	src/Dynamics/Contacts/b2PolygonContact.cpp
+)
+set(BOX2D_Contacts_HDRS
+	include/Box2D/Dynamics/Contacts/b2CircleContact.h
+	include/Box2D/Dynamics/Contacts/b2Contact.h
+	include/Box2D/Dynamics/Contacts/b2ContactSolver.h
+	include/Box2D/Dynamics/Contacts/b2PolygonAndCircleContact.h
+	include/Box2D/Dynamics/Contacts/b2EdgeAndCircleContact.h
+	include/Box2D/Dynamics/Contacts/b2EdgeAndPolygonContact.h
+	include/Box2D/Dynamics/Contacts/b2ChainAndCircleContact.h
+	include/Box2D/Dynamics/Contacts/b2ChainAndPolygonContact.h
+	include/Box2D/Dynamics/Contacts/b2PolygonContact.h
+)
+set(BOX2D_Joints_SRCS
+	src/Dynamics/Joints/b2DistanceJoint.cpp
+	src/Dynamics/Joints/b2FrictionJoint.cpp
+	src/Dynamics/Joints/b2GearJoint.cpp
+	src/Dynamics/Joints/b2Joint.cpp
+	src/Dynamics/Joints/b2MotorJoint.cpp
+	src/Dynamics/Joints/b2MouseJoint.cpp
+	src/Dynamics/Joints/b2PrismaticJoint.cpp
+	src/Dynamics/Joints/b2PulleyJoint.cpp
+	src/Dynamics/Joints/b2RevoluteJoint.cpp
+	src/Dynamics/Joints/b2RopeJoint.cpp
+	src/Dynamics/Joints/b2WeldJoint.cpp
+	src/Dynamics/Joints/b2WheelJoint.cpp
+)
+set(BOX2D_Joints_HDRS
+	include/Box2D/Dynamics/Joints/b2DistanceJoint.h
+	include/Box2D/Dynamics/Joints/b2FrictionJoint.h
+	include/Box2D/Dynamics/Joints/b2GearJoint.h
+	include/Box2D/Dynamics/Joints/b2Joint.h
+	include/Box2D/Dynamics/Joints/b2MotorJoint.h
+	include/Box2D/Dynamics/Joints/b2MouseJoint.h
+	include/Box2D/Dynamics/Joints/b2PrismaticJoint.h
+	include/Box2D/Dynamics/Joints/b2PulleyJoint.h
+	include/Box2D/Dynamics/Joints/b2RevoluteJoint.h
+	include/Box2D/Dynamics/Joints/b2RopeJoint.h
+	include/Box2D/Dynamics/Joints/b2WeldJoint.h
+	include/Box2D/Dynamics/Joints/b2WheelJoint.h
+)
+set(BOX2D_Rope_SRCS
+	src/Rope/b2Rope.cpp
+)
+set(BOX2D_Rope_HDRS
+	include/Box2D/Rope/b2Rope.h
+)
+set(BOX2D_General_HDRS
+	include/Box2D/Box2D.h
+)
+
+cmake_minimum_required(VERSION 3.5)
+project(flatland_box2d)
+
+find_package(ament_cmake REQUIRED)
+
+include_directories(include)
+
+add_library(flatland_box2d_lib SHARED
+	${BOX2D_General_HDRS}
+	${BOX2D_Joints_SRCS}
+	${BOX2D_Joints_HDRS}
+	${BOX2D_Contacts_SRCS}
+	${BOX2D_Contacts_HDRS}
+	${BOX2D_Dynamics_SRCS}
+	${BOX2D_Dynamics_HDRS}
+	${BOX2D_Common_SRCS}
+	${BOX2D_Common_HDRS}
+	${BOX2D_Shapes_SRCS}
+	${BOX2D_Shapes_HDRS}
+	${BOX2D_Collision_SRCS}
+	${BOX2D_Collision_HDRS}
+	${BOX2D_Rope_SRCS}
+	${BOX2D_Rope_HDRS}
+)
+set_target_properties(flatland_box2d_lib PROPERTIES
+	GIT_COMMIT_HASH f655c603ba9d83f07fc566d38d2654ba35739102
+)
+
+ament_export_targets(export_flatland_box2d HAS_LIBRARY_TARGET)
+ament_export_libraries(flatland_box2d_lib)
+ament_export_include_directories(include)
+
+ament_package()
+
+install( 
+  TARGETS flatland_box2d_lib
+  EXPORT export_flatland_box2d
+  LIBRARY DESTINATION lib
+  ARCHIVE DESTINATION lib
+  RUNTIME DESTINATION bin
+  INCLUDES DESTINATION include
+)
+
+# Mark cpp header files for installation
+install(
+  DIRECTORY include/
+  DESTINATION include
+  FILES_MATCHING PATTERN "*.h"
+)

flatland_server/thirdparty/Box2D/Box2D.h → flatland_box2d/include/Box2D/Box2D.h

@@ -1,20 +1,20 @@
 /*
-* Copyright (c) 2006-2009 Erin Catto http://www.box2d.org
-*
-* This software is provided 'as-is', without any express or implied
-* warranty.  In no event will the authors be held liable for any damages
-* arising from the use of this software.
-* Permission is granted to anyone to use this software for any purpose,
-* including commercial applications, and to alter it and redistribute it
-* freely, subject to the following restrictions:
-* 1. The origin of this software must not be misrepresented; you must not
-* claim that you wrote the original software. If you use this software
-* in a product, an acknowledgment in the product documentation would be
-* appreciated but is not required.
-* 2. Altered source versions must be plainly marked as such, and must not be
-* misrepresented as being the original software.
-* 3. This notice may not be removed or altered from any source distribution.
-*/
+ * Copyright (c) 2006-2009 Erin Catto http://www.box2d.org
+ *
+ * This software is provided 'as-is', without any express or implied
+ * warranty.  In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 3. This notice may not be removed or altered from any source distribution.
+ */
 
 #ifndef BOX2D_H
 #define BOX2D_H
@@ -31,28 +31,18 @@ For discussion please visit http://box2d.org/forum
 
 // These include files constitute the main Box2D API
 
-#include "Box2D/Common/b2Settings.h"
-#include "Box2D/Common/b2Draw.h"
-#include "Box2D/Common/b2Timer.h"
-
+#include "Box2D/Collision/Shapes/b2ChainShape.h"
 #include "Box2D/Collision/Shapes/b2CircleShape.h"
 #include "Box2D/Collision/Shapes/b2EdgeShape.h"
-#include "Box2D/Collision/Shapes/b2ChainShape.h"
 #include "Box2D/Collision/Shapes/b2PolygonShape.h"
-
 #include "Box2D/Collision/b2BroadPhase.h"
 #include "Box2D/Collision/b2Distance.h"
 #include "Box2D/Collision/b2DynamicTree.h"
 #include "Box2D/Collision/b2TimeOfImpact.h"
-
-#include "Box2D/Dynamics/b2Body.h"
-#include "Box2D/Dynamics/b2Fixture.h"
-#include "Box2D/Dynamics/b2WorldCallbacks.h"
-#include "Box2D/Dynamics/b2TimeStep.h"
-#include "Box2D/Dynamics/b2World.h"
-
+#include "Box2D/Common/b2Draw.h"
+#include "Box2D/Common/b2Settings.h"
+#include "Box2D/Common/b2Timer.h"
 #include "Box2D/Dynamics/Contacts/b2Contact.h"
-
 #include "Box2D/Dynamics/Joints/b2DistanceJoint.h"
 #include "Box2D/Dynamics/Joints/b2FrictionJoint.h"
 #include "Box2D/Dynamics/Joints/b2GearJoint.h"
@@ -64,5 +54,10 @@ For discussion please visit http://box2d.org/forum
 #include "Box2D/Dynamics/Joints/b2RopeJoint.h"
 #include "Box2D/Dynamics/Joints/b2WeldJoint.h"
 #include "Box2D/Dynamics/Joints/b2WheelJoint.h"
+#include "Box2D/Dynamics/b2Body.h"
+#include "Box2D/Dynamics/b2Fixture.h"
+#include "Box2D/Dynamics/b2TimeStep.h"
+#include "Box2D/Dynamics/b2World.h"
+#include "Box2D/Dynamics/b2WorldCallbacks.h"
 
 #endif