Migrate Bullet to ign-physics4 (#271)

Signed-off-by: Louise Poubel <[email protected]>
gazebosim · Jun 24, 2021 · a1a8f8b · a1a8f8b
1 parent 583aef1
commit a1a8f8b
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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)