diff --git a/src/SdfEntityCreator.cc b/src/SdfEntityCreator.cc index afe266c5cd..501414782e 100644 --- a/src/SdfEntityCreator.cc +++ b/src/SdfEntityCreator.cc @@ -337,7 +337,7 @@ void SdfEntityCreator::CreateEntities(const sdf::World *_world, levelEntityNames.find(model->Name()) != levelEntityNames.end()) { - Entity modelEntity = this->CreateEntities(model, false); + Entity modelEntity = this->CreateEntities(model); this->SetParent(modelEntity, _worldEntity); } @@ -387,7 +387,7 @@ void SdfEntityCreator::CreateEntities(const sdf::World *_world, if (_world->ModelNameExists(_ref->Data())) { const sdf::Model *model = _world->ModelByName(_ref->Data()); - Entity modelEntity = this->CreateEntities(model, false); + Entity modelEntity = this->CreateEntities(model); this->SetParent(modelEntity, _worldEntity); this->SetParent(_entity, modelEntity); } @@ -450,7 +450,6 @@ void SdfEntityCreator::CreateEntities(const sdf::World *_world, this->dataPtr->ecm->CreateComponent( _worldEntity, components::WorldSdf(*_world)); - // Load world plugins first. this->dataPtr->eventManager->Emit(_worldEntity, _world->Plugins()); @@ -458,9 +457,6 @@ void SdfEntityCreator::CreateEntities(const sdf::World *_world, this->dataPtr->eventManager->Emit(_worldEntity, _world->ToElement()); GZ_UTILS_WARN_RESUME__DEPRECATED_DECLARATION - - // Load model plugins after the world plugin. - this->LoadModelPlugins(); } ////////////////////////////////////////////////// diff --git a/src/systems/logical_audio_sensor_plugin/LogicalAudioSensorPlugin.cc b/src/systems/logical_audio_sensor_plugin/LogicalAudioSensorPlugin.cc index fab58be000..c0836401dd 100644 --- a/src/systems/logical_audio_sensor_plugin/LogicalAudioSensorPlugin.cc +++ b/src/systems/logical_audio_sensor_plugin/LogicalAudioSensorPlugin.cc @@ -405,7 +405,7 @@ void LogicalAudioSensorPluginPrivate::CreateAudioSource( }; // create services for this source - const auto validName = topicFromScopedName(entity, _ecm, true); + const auto validName = topicFromScopedName(entity, _ecm, false); if (validName.empty()) { gzerr << "Failed to create valid topics with entity scoped name [" @@ -503,7 +503,7 @@ void LogicalAudioSensorPluginPrivate::CreateMicrophone( // create the detection publisher for this microphone auto pub = this->node.Advertise( - topicFromScopedName(entity, _ecm, true) + "/detection"); + topicFromScopedName(entity, _ecm, false) + "/detection"); if (!pub) { gzerr << "Error creating a detection publisher for microphone " diff --git a/src/systems/pose_publisher/PosePublisher.cc b/src/systems/pose_publisher/PosePublisher.cc index d4c9bc0d39..fd167a882e 100644 --- a/src/systems/pose_publisher/PosePublisher.cc +++ b/src/systems/pose_publisher/PosePublisher.cc @@ -250,7 +250,7 @@ void PosePublisher::Configure(const Entity &_entity, this->dataPtr->usePoseV = _sdf->Get("use_pose_vector_msg", this->dataPtr->usePoseV).first; - std::string poseTopic = topicFromScopedName(_entity, _ecm, true) + "/pose"; + std::string poseTopic = topicFromScopedName(_entity, _ecm, false) + "/pose"; if (poseTopic.empty()) { poseTopic = "/pose";