feat: use rviz_2d_overlay_plugins package for OverlayObject class (#29)

* feat: use rviz_2d_overlay_plugins package for OverlayObject class

Signed-off-by: Ryohsuke Mitsudome <ryohsuke.mitsudome@tier4.jp>

* style(pre-commit): autofix

---------

Signed-off-by: Ryohsuke Mitsudome <ryohsuke.mitsudome@tier4.jp>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

Author: mitsudome-r

autoware_overlay_rviz_plugin/autoware_mission_details_overlay_rviz_plugin/CMakeLists.txt

@@ -20,7 +20,6 @@ endforeach()
 
 set(
   display_source_files
-  src/overlay_utils.cpp
   src/mission_details_display.cpp
   src/remaining_distance_time_display.cpp
 )
@@ -59,6 +58,8 @@ pluginlib_export_plugin_description_file(rviz_common plugins_description.xml)
 ament_target_dependencies(
   ${PROJECT_NAME}
   PUBLIC
+  rviz_2d_overlay_plugins
+  rviz_2d_overlay_msgs
   rviz_common
   rviz_rendering
   autoware_internal_msgs
@@ -67,6 +68,8 @@ ament_target_dependencies(
 ament_export_include_directories(include)
 ament_export_targets(${PROJECT_NAME} HAS_LIBRARY_TARGET)
 ament_export_dependencies(
+  rviz_2d_overlay_plugins
+  rviz_2d_overlay_msgs
   rviz_common
   rviz_ogre_vendor
 )

autoware_overlay_rviz_plugin/autoware_mission_details_overlay_rviz_plugin/LICENSE

@@ -25,10 +25,6 @@ The mission details display is aligned with top right corner of the screen.
 
 Similar to [autoware_overlay_rviz_plugin](../autoware_overlay_rviz_plugin/README.md)
 
-## Credits
-
-Based on the [jsk_visualization](https://github.com/jsk-ros-pkg/jsk_visualization) package.
-
 ### Icons
 
 - <https://fonts.google.com/icons?selected=Material+Symbols+Outlined:conversion_path:FILL@1;wght@400;GRAD@200;opsz@20&icon.size=20&icon.color=%23e8eaed&icon.query=path>

autoware_overlay_rviz_plugin/autoware_mission_details_overlay_rviz_plugin/README.md

@@ -15,11 +15,11 @@
 #ifndef MISSION_DETAILS_DISPLAY_HPP_
 #define MISSION_DETAILS_DISPLAY_HPP_
 #ifndef Q_MOC_RUN
-#include "overlay_utils.hpp"
 #include "remaining_distance_time_display.hpp"
 
 #include <QImage>
 #include <QString>
+#include <rviz_2d_overlay_plugins/overlay_utils.hpp>
 #include <rviz_common/display.hpp>
 #include <rviz_common/properties/color_property.hpp>
 #include <rviz_common/properties/float_property.hpp>
@@ -56,7 +56,7 @@ private Q_SLOTS:
 
 private:
   std::mutex mutex_;
-  autoware::mission_details_overlay_rviz_plugin::OverlayObject::SharedPtr overlay_;
+  rviz_2d_overlay_plugins::OverlayObject::SharedPtr overlay_;
   rviz_common::properties::IntProperty * property_width_;
   rviz_common::properties::IntProperty * property_height_;
   rviz_common::properties::IntProperty * property_right_;

autoware_overlay_rviz_plugin/autoware_mission_details_overlay_rviz_plugin/include/mission_details_display.hpp

@@ -14,7 +14,6 @@
 
 #ifndef REMAINING_DISTANCE_TIME_DISPLAY_HPP_
 #define REMAINING_DISTANCE_TIME_DISPLAY_HPP_
-#include "overlay_utils.hpp"
 
 #include <QImage>
 #include <QString>

autoware_overlay_rviz_plugin/autoware_mission_details_overlay_rviz_plugin/include/overlay_utils.hpp

@@ -3,16 +3,15 @@
 <package format="3">
   <name>autoware_mission_details_overlay_rviz_plugin</name>
   <version>0.3.0</version>
-  <description>
-    RViz2 plugin for 2D overlays for mission details in the 3D view. Mainly a port of the JSK overlay plugin
-        (https://github.com/jsk-ros-pkg/jsk_visualization).
-  </description>
+  <description>RViz2 plugin for 2D overlays for mission details in the 3D view.</description>
   <maintainer email="ahmed.ebrahim@leodrive.ai">Ahmed Ebrahim</maintainer>
 
-  <license>BSD-3-Clause</license>
+  <license>Apache License 2.0</license>
 
   <depend>autoware_internal_msgs</depend>
   <depend>boost</depend>
+  <depend>rviz_2d_overlay_msgs</depend>
+  <depend>rviz_2d_overlay_plugins</depend>
   <depend>rviz_common</depend>
   <depend>rviz_ogre_vendor</depend>
   <depend>rviz_rendering</depend>

autoware_overlay_rviz_plugin/autoware_mission_details_overlay_rviz_plugin/include/remaining_distance_time_display.hpp

@@ -28,7 +28,6 @@
 
 namespace autoware::mission_details_overlay_rviz_plugin
 {
-
 MissionDetailsDisplay::MissionDetailsDisplay()
 {
   property_width_ = new rviz_common::properties::IntProperty(
@@ -59,8 +58,7 @@ void MissionDetailsDisplay::onInitialize()
   static int count = 0;
   std::stringstream ss;
   ss << "MissionDetailsDisplay" << count++;
-  overlay_ =
-    std::make_shared<autoware::mission_details_overlay_rviz_plugin::OverlayObject>(ss.str());
+  overlay_ = std::make_shared<rviz_2d_overlay_plugins::OverlayObject>(ss.str());
   overlay_->show();
   update_size();
 
@@ -108,7 +106,7 @@ void MissionDetailsDisplay::update(float wall_dt, float ros_dt)
   if (!overlay_) {
     return;
   }
-  autoware::mission_details_overlay_rviz_plugin::ScopedPixelBuffer buffer = overlay_->getBuffer();
+  rviz_2d_overlay_plugins::ScopedPixelBuffer buffer = overlay_->getBuffer();
   QImage hud = buffer.getQImage(*overlay_);
   hud.fill(Qt::transparent);
   draw_widget(hud);
@@ -194,8 +192,9 @@ void MissionDetailsDisplay::update_size()
   overlay_->updateTextureSize(property_width_->getInt(), property_height_->getInt());
   overlay_->setDimensions(overlay_->getTextureWidth(), overlay_->getTextureHeight());
   overlay_->setPosition(
-    property_right_->getInt(), property_top_->getInt(), HorizontalAlignment::RIGHT,
-    VerticalAlignment::TOP);
+    property_right_->getInt(), property_top_->getInt(),
+    rviz_2d_overlay_plugins::HorizontalAlignment::RIGHT,
+    rviz_2d_overlay_plugins::VerticalAlignment::TOP);
   queueRender();
 }