From dc268fe633d69ec69bfdadf3279df672a9c05f7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20Hern=C3=A1ndez=20Cordero?= Date: Tue, 1 Mar 2022 09:31:11 +0100 Subject: [PATCH] Removed unused code in MinimalScene plugin (#359) Signed-off-by: ahcorde --- src/plugins/minimal_scene/MinimalScene.cc | 52 ----------------------- src/plugins/minimal_scene/MinimalScene.hh | 40 ----------------- 2 files changed, 92 deletions(-) diff --git a/src/plugins/minimal_scene/MinimalScene.cc b/src/plugins/minimal_scene/MinimalScene.cc index 8240ed487..f8aaac17a 100644 --- a/src/plugins/minimal_scene/MinimalScene.cc +++ b/src/plugins/minimal_scene/MinimalScene.cc @@ -965,30 +965,6 @@ void RenderWindowItem::SetCameraFarClip(double _far) this->dataPtr->renderThread->ignRenderer.cameraFarClip = _far; } -///////////////////////////////////////////////// -void RenderWindowItem::SetSceneService(const std::string &_service) -{ - this->dataPtr->renderThread->ignRenderer.sceneService = _service; -} - -///////////////////////////////////////////////// -void RenderWindowItem::SetPoseTopic(const std::string &_topic) -{ - this->dataPtr->renderThread->ignRenderer.poseTopic = _topic; -} - -///////////////////////////////////////////////// -void RenderWindowItem::SetDeletionTopic(const std::string &_topic) -{ - this->dataPtr->renderThread->ignRenderer.deletionTopic = _topic; -} - -///////////////////////////////////////////////// -void RenderWindowItem::SetSceneTopic(const std::string &_topic) -{ - this->dataPtr->renderThread->ignRenderer.sceneTopic = _topic; -} - ///////////////////////////////////////////////// void RenderWindowItem::SetSkyEnabled(const bool &_sky) { @@ -1105,34 +1081,6 @@ void MinimalScene::LoadConfig(const tinyxml2::XMLElement *_pluginElem) } } - elem = _pluginElem->FirstChildElement("service"); - if (nullptr != elem && nullptr != elem->GetText()) - { - std::string service = elem->GetText(); - renderWindow->SetSceneService(service); - } - - elem = _pluginElem->FirstChildElement("pose_topic"); - if (nullptr != elem && nullptr != elem->GetText()) - { - std::string topic = elem->GetText(); - renderWindow->SetPoseTopic(topic); - } - - elem = _pluginElem->FirstChildElement("deletion_topic"); - if (nullptr != elem && nullptr != elem->GetText()) - { - std::string topic = elem->GetText(); - renderWindow->SetDeletionTopic(topic); - } - - elem = _pluginElem->FirstChildElement("scene_topic"); - if (nullptr != elem && nullptr != elem->GetText()) - { - std::string topic = elem->GetText(); - renderWindow->SetSceneTopic(topic); - } - elem = _pluginElem->FirstChildElement("sky"); if (nullptr != elem && nullptr != elem->GetText()) { diff --git a/src/plugins/minimal_scene/MinimalScene.hh b/src/plugins/minimal_scene/MinimalScene.hh index 49b72198b..a1cd3648c 100644 --- a/src/plugins/minimal_scene/MinimalScene.hh +++ b/src/plugins/minimal_scene/MinimalScene.hh @@ -205,23 +205,6 @@ namespace plugins /// \brief Flag to indicate texture size has changed. public: bool textureDirty = false; - /// \brief Scene service. If not empty, a request will be made to get the - /// scene information using this service and the renderer will populate the - /// scene based on the response data - public: std::string sceneService; - - /// \brief Scene pose topic. If not empty, a node will subcribe to this - /// topic to get pose updates of objects in the scene - public: std::string poseTopic; - - /// \brief Ign-transport deletion topic name - public: std::string deletionTopic; - - /// \brief Ign-transport scene topic name - /// New scene messages will be published to this topic when an entities are - /// added - public: std::string sceneTopic; - /// \brief True if sky is enabled; public: bool skyEnable = false; @@ -304,29 +287,6 @@ namespace plugins /// \param[in] _far Far clipping plane distance public: void SetCameraFarClip(double _far); - /// \brief Set scene service to use in this render window - /// A service call will be made using ign-transport to get scene - /// data using this service - /// \param[in] _service Scene service name - public: void SetSceneService(const std::string &_service); - - /// \brief Set pose topic to use for updating objects in the scene - /// The renderer will subscribe to this topic to get pose messages of - /// visuals in the scene - /// \param[in] _topic Pose topic - public: void SetPoseTopic(const std::string &_topic); - - /// \brief Set deletion topic to use for deleting objects from the scene - /// The renderer will subscribe to this topic to get notified when entities - /// in the scene get deleted - /// \param[in] _topic Deletion topic - public: void SetDeletionTopic(const std::string &_topic); - - /// \brief Set the scene topic to use for updating objects in the scene - /// The renderer will subscribe to this topic to get updates scene messages - /// \param[in] _topic Scene topic - public: void SetSceneTopic(const std::string &_topic); - /// \brief Called when the mouse hovers to a new position. /// \param[in] _hoverPos 2D coordinates of the hovered mouse position on /// the render window.