From a1a8f8b3b1c1cf2f95c0acf35220009bbbb334b4 Mon Sep 17 00:00:00 2001 From: Louise Poubel Date: Wed, 23 Jun 2021 15:45:40 -0700 Subject: [PATCH] Migrate Bullet to ign-physics4 (#271) Signed-off-by: Louise Poubel --- bullet/src/EntityManagementFeatures.hh | 2 +- bullet/src/FreeGroupFeatures.cc | 2 +- bullet/src/FreeGroupFeatures.hh | 2 +- examples/simple_plugin/CMakeLists.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bullet/src/EntityManagementFeatures.hh b/bullet/src/EntityManagementFeatures.hh index 35865b05d..cf6e90dd7 100644 --- a/bullet/src/EntityManagementFeatures.hh +++ b/bullet/src/EntityManagementFeatures.hh @@ -32,7 +32,7 @@ namespace physics { namespace bullet { struct EntityManagementFeatureList : ignition::physics::FeatureList< - RemoveEntities, + RemoveModelFromWorld, ConstructEmptyWorldFeature > { }; diff --git a/bullet/src/FreeGroupFeatures.cc b/bullet/src/FreeGroupFeatures.cc index ff98ebcc7..5df46da6b 100644 --- a/bullet/src/FreeGroupFeatures.cc +++ b/bullet/src/FreeGroupFeatures.cc @@ -51,7 +51,7 @@ Identity FreeGroupFeatures::FindFreeGroupForLink( } ///////////////////////////////////////////////// -Identity FreeGroupFeatures::GetFreeGroupCanonicalLink( +Identity FreeGroupFeatures::GetFreeGroupRootLink( const Identity &_groupID) const { (void) _groupID; diff --git a/bullet/src/FreeGroupFeatures.hh b/bullet/src/FreeGroupFeatures.hh index cf00d7776..1a4c58f4d 100644 --- a/bullet/src/FreeGroupFeatures.hh +++ b/bullet/src/FreeGroupFeatures.hh @@ -40,7 +40,7 @@ class FreeGroupFeatures Identity FindFreeGroupForLink(const Identity &_linkID) const override; - Identity GetFreeGroupCanonicalLink(const Identity &_groupID) const override; + Identity GetFreeGroupRootLink(const Identity &_groupID) const override; // ----- SetFreeGroupWorldPose ----- void SetFreeGroupWorldPose( diff --git a/examples/simple_plugin/CMakeLists.txt b/examples/simple_plugin/CMakeLists.txt index 0eb1b1d52..5cd41a446 100644 --- a/examples/simple_plugin/CMakeLists.txt +++ b/examples/simple_plugin/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.5 FATAL_ERROR) set(IGN_PLUGIN_VER 1) find_package(ignition-plugin${IGN_PLUGIN_VER} 1.1 REQUIRED COMPONENTS all) -set(IGN_PHYSICS_VER 2) +set(IGN_PHYSICS_VER 4) find_package(ignition-physics${IGN_PHYSICS_VER} REQUIRED) add_library(SimplePlugin SHARED plugin.cc EntityManagementFeatures.cc)