Skip to content

Commit ea88fdb

Browse files
johnwasonLevi-Armstrong
authored andcommitted
Python package updates for command language
1 parent 39ed5e8 commit ea88fdb

File tree

260 files changed

+5609
-5213
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

260 files changed

+5609
-5213
lines changed

.github/workflows/bionic_build.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ jobs:
2424
ROSDEP_SKIP_KEYS: "bullet3 cmake_common_scripts iwyu fcl taskflow"
2525
DOCKER_IMAGE: "rosindustrial/tesseract:melodic"
2626
CCACHE_DIR: "/home/runner/work/tesseract/tesseract/Bionic-Build/.ccache"
27+
PARALLEL_BUILDS: false
2728
PARALLEL_TESTS: false
2829
UPSTREAM_CMAKE_ARGS: "-DCMAKE_BUILD_TYPE=Release"
2930
TARGET_CMAKE_ARGS: "-DCMAKE_BUILD_TYPE=Debug -DTESSERACT_ENABLE_TESTING=ON"

.github/workflows/focal_build.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ jobs:
2525
DOCKER_IMAGE: "rosindustrial/tesseract:noetic"
2626
CCACHE_DIR: "/home/runner/work/tesseract/tesseract/Focal-Build/.ccache"
2727
PARALLEL_TESTS: false
28+
PARALLEL_BUILDS: false
2829
BEFORE_RUN_TARGET_TEST_EMBED: "source /root/target_ws/install/setup.bash"
2930
UPSTREAM_CMAKE_ARGS: "-DCMAKE_BUILD_TYPE=Release"
3031
TARGET_CMAKE_ARGS: "-DCMAKE_BUILD_TYPE=Debug -DTESSERACT_ENABLE_TESTING=ON"

.github/workflows/windows_noetic_build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,6 @@ jobs:
3737
3838
rosdep install -q --from-paths . --ignore-src -y
3939
40-
catkin_make_isolated --install --force-cmake --only-pkg-with-deps tesseract_collision tesseract_common tesseract_environment tesseract_geometry tesseract_kinematics tesseract_scene_graph tesseract_support tesseract_urdf tesseract_visualization tesseract_motion_planners tesseract_process_managers tesseract_time_parameterization --cmake-args -DCMAKE_BUILD_TYPE=Release -DINSTALL_OMPL=ON -DINSTALL_OMPL_TAG=master
40+
catkin_make_isolated --install --force-cmake --only-pkg-with-deps tesseract_collision tesseract_common tesseract_environment tesseract_geometry tesseract_kinematics tesseract_scene_graph tesseract_support tesseract_urdf tesseract_visualization tesseract_motion_planners tesseract_process_managers tesseract_time_parameterization tesseract_python --cmake-args -DCMAKE_BUILD_TYPE=Release -DINSTALL_OMPL=ON -DINSTALL_OMPL_TAG=master
4141
call "D:\a\tesseract\tesseract\install_isolated\setup.bat"
4242
catkin_make_isolated --install --force-cmake --pkg tesseract_collision tesseract_common tesseract_environment tesseract_geometry tesseract_kinematics tesseract_scene_graph tesseract_support tesseract_urdf tesseract_visualization tesseract_motion_planners tesseract_process_managers tesseract_time_parameterization --cmake-args -DCMAKE_BUILD_TYPE=Release -DTESSERACT_ENABLE_TESTING=ON -DINSTALL_OMPL=ON -DINSTALL_OMPL_TAG=master

tesseract/tesseract_collision/include/tesseract_collision/bullet/bullet_cast_bvh_manager.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,10 @@
4545
#include <tesseract_collision/core/continuous_contact_manager.h>
4646
#include <tesseract_collision/bullet/tesseract_collision_configuration.h>
4747

48+
#ifdef SWIG
49+
%shared_ptr(tesseract_collision::tesseract_collision_bullet::BulletCastBVHManager)
50+
#endif // SWIG
51+
4852
namespace tesseract_collision
4953
{
5054
namespace tesseract_collision_bullet
@@ -129,11 +133,13 @@ class BulletCastBVHManager : public ContinuousContactManager
129133

130134
void contactTest(ContactResultMap& collisions, const ContactRequest& request) override;
131135

136+
#ifndef SWIG
132137
/**
133138
* @brief A a bullet collision object to the manager
134139
* @param cow The tesseract bullet collision object
135140
*/
136141
void addCollisionObject(COW::Ptr cow);
142+
#endif // SWIG
137143

138144
private:
139145
std::vector<std::string> active_; /**< @brief A list of the active collision objects */

tesseract/tesseract_collision/include/tesseract_collision/bullet/bullet_cast_simple_manager.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,10 @@
4545
#include <tesseract_collision/core/continuous_contact_manager.h>
4646
#include <tesseract_collision/bullet/tesseract_collision_configuration.h>
4747

48+
#ifdef SWIG
49+
%shared_ptr(tesseract_collision::tesseract_collision_bullet::BulletCastSimpleManager)
50+
#endif // SWIG
51+
4852
namespace tesseract_collision
4953
{
5054
namespace tesseract_collision_bullet
@@ -129,11 +133,13 @@ class BulletCastSimpleManager : public ContinuousContactManager
129133

130134
void contactTest(ContactResultMap& collisions, const ContactRequest& request) override;
131135

136+
#ifndef SWIG
132137
/**
133138
* @brief A a bullet collision object to the manager
134139
* @param cow The tesseract bullet collision object
135140
*/
136141
void addCollisionObject(COW::Ptr cow);
142+
#endif // SWIG
137143

138144
private:
139145
std::vector<std::string> active_; /**< @brief A list of the active collision objects */

tesseract/tesseract_collision/include/tesseract_collision/bullet/bullet_discrete_bvh_manager.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,10 @@
4545
#include <tesseract_collision/core/discrete_contact_manager.h>
4646
#include <tesseract_collision/bullet/tesseract_collision_configuration.h>
4747

48+
#ifdef SWIG
49+
%shared_ptr(tesseract_collision::tesseract_collision_bullet::BulletDiscreteBVHManager)
50+
#endif // SWIG
51+
4852
namespace tesseract_collision
4953
{
5054
namespace tesseract_collision_bullet
@@ -118,11 +122,13 @@ class BulletDiscreteBVHManager : public DiscreteContactManager
118122

119123
void contactTest(ContactResultMap& collisions, const ContactRequest& request) override;
120124

125+
#ifndef SWIG
121126
/**
122127
* @brief A a bullet collision object to the manager
123128
* @param cow The tesseract bullet collision object
124129
*/
125130
void addCollisionObject(COW::Ptr cow);
131+
#endif // SWIG
126132

127133
private:
128134
std::vector<std::string> active_; /**< @brief A list of the active collision objects */

tesseract/tesseract_collision/include/tesseract_collision/bullet/bullet_discrete_simple_manager.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,10 @@
4545
#include <tesseract_collision/core/discrete_contact_manager.h>
4646
#include <tesseract_collision/bullet/tesseract_collision_configuration.h>
4747

48+
#ifdef SWIG
49+
%shared_ptr(tesseract_collision::tesseract_collision_bullet::BulletDiscreteSimpleManager)
50+
#endif // SWIG
51+
4852
namespace tesseract_collision
4953
{
5054
namespace tesseract_collision_bullet
@@ -118,11 +122,13 @@ class BulletDiscreteSimpleManager : public DiscreteContactManager
118122

119123
void contactTest(ContactResultMap& collisions, const ContactRequest& request) override;
120124

125+
#ifndef SWIG
121126
/**
122127
* @brief A a bullet collision object to the manager
123128
* @param cow The tesseract bullet collision object
124129
*/
125130
void addCollisionObject(COW::Ptr cow);
131+
#endif // SWIG
126132

127133
private:
128134
std::vector<std::string> active_; /**< @brief A list of the active collision objects */

tesseract/tesseract_collision/include/tesseract_collision/core/continuous_contact_manager.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,10 @@ TESSERACT_COMMON_IGNORE_WARNINGS_POP
3535

3636
#include <tesseract_collision/core/types.h>
3737

38+
#ifdef SWIG
39+
%shared_ptr(tesseract_collision::ContinuousContactManager)
40+
#endif // SWIG
41+
3842
namespace tesseract_collision
3943
{
4044
class ContinuousContactManager

tesseract/tesseract_collision/include/tesseract_collision/core/continuous_contact_manager_factory.h

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,19 @@
2929

3030
#include <tesseract_collision/core/continuous_contact_manager.h>
3131

32+
#ifdef SWIG
33+
%shared_ptr(tesseract_collision::ContinuousContactManagerFactory)
34+
#endif // SWIG
35+
3236
namespace tesseract_collision
3337
{
38+
using ContinuousContactManagerFactoryCreateMethod = std::function<ContinuousContactManager::Ptr()>;
3439
class ContinuousContactManagerFactory
3540
{
3641
public:
37-
using CreateMethod = std::function<ContinuousContactManager::Ptr()>;
3842
ContinuousContactManagerFactory() = default;
3943

40-
bool registar(const std::string& name, CreateMethod create_function)
44+
bool registar(const std::string& name, ContinuousContactManagerFactoryCreateMethod create_function)
4145
{
4246
auto it = continuous_types.find(name);
4347
if (it == continuous_types.end())
@@ -61,7 +65,7 @@ class ContinuousContactManagerFactory
6165
const std::vector<std::string>& getAvailableManagers() const { return keys_; }
6266

6367
private:
64-
std::unordered_map<std::string, CreateMethod> continuous_types;
68+
std::unordered_map<std::string, ContinuousContactManagerFactoryCreateMethod> continuous_types;
6569
std::vector<std::string> keys_;
6670
};
6771
} // namespace tesseract_collision

tesseract/tesseract_collision/include/tesseract_collision/core/discrete_contact_manager.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,10 @@ TESSERACT_COMMON_IGNORE_WARNINGS_POP
3535

3636
#include <tesseract_collision/core/types.h>
3737

38+
#ifdef SWIG
39+
%shared_ptr(tesseract_collision::DiscreteContactManager)
40+
#endif // SWIG
41+
3842
namespace tesseract_collision
3943
{
4044
class DiscreteContactManager

0 commit comments

Comments
 (0)