diff --git a/CMakeLists.txt b/CMakeLists.txt index 69582af7f0..fd853cb328 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -68,7 +68,7 @@ set(IGN_MSGS_VER ${ignition-msgs8_VERSION_MAJOR}) #-------------------------------------- # Find ignition-common # Always use the profiler component to get the headers, regardless of status. -ign_find_package(ignition-common4 VERSION 4.2 +ign_find_package(ignition-common4 VERSION 4.4 COMPONENTS profiler events diff --git a/examples/worlds/actor.sdf b/examples/worlds/actor.sdf index 2c8c3c5679..fc6af99daa 100644 --- a/examples/worlds/actor.sdf +++ b/examples/worlds/actor.sdf @@ -165,5 +165,59 @@ + + + https://fuel.ignitionrobotics.org/1.0/Mingfei/models/actor/tip/files/meshes/walk.dae + 1.0 + + + https://fuel.ignitionrobotics.org/1.0/Mingfei/models/actor/tip/files/meshes/walk.dae + true + + + + diff --git a/src/rendering/SceneManager.cc b/src/rendering/SceneManager.cc index 42ed3d82e9..dae751a09a 100644 --- a/src/rendering/SceneManager.cc +++ b/src/rendering/SceneManager.cc @@ -894,7 +894,7 @@ rendering::VisualPtr SceneManager::CreateActor(Entity _id, static_cast(point->Time()*1000))); waypoints[pointTp] = point->Pose(); } - trajInfo.SetWaypoints(waypoints); + trajInfo.SetWaypoints(waypoints, trajSdf->Tension()); // Animations are offset by 1 because index 0 is taken by the mesh name auto animation = _actor.AnimationByIndex(trajInfo.AnimIndex()-1);