Ogre 1.12.10 upgrade (#878)

* Upgrade to OGRE 1.12.10 Signed-off-by: Kenji Brameld <kenjibrameld@gmail.com> Signed-off-by: Chris Lalancette <clalancette@openrobotics.org>
ros2 · Aug 2, 2022 · 4e976dc · 4e976dc
1 parent 1ee274d
commit 4e976dc
Show file tree

Hide file tree

Showing 90 changed files with 236 additions and 124 deletions.
diff --git a/rviz_common/include/rviz_common/frame_manager_iface.hpp b/rviz_common/include/rviz_common/frame_manager_iface.hpp
@@ -42,7 +42,7 @@
 #pragma clang diagnostic ignored "-Wkeyword-macro"
 #endif
 
-#include <OgreVector3.h>
+#include <OgreVector.h>
 #include <OgreQuaternion.h>
 
 #ifdef __clang__

diff --git a/rviz_common/include/rviz_common/frame_position_tracking_view_controller.hpp b/rviz_common/include/rviz_common/frame_position_tracking_view_controller.hpp
@@ -32,7 +32,7 @@
 #define RVIZ_COMMON__FRAME_POSITION_TRACKING_VIEW_CONTROLLER_HPP_
 
 #include <OgreQuaternion.h>
-#include <OgreVector3.h>
+#include <OgreVector.h>
 
 #include "rviz_common/view_controller.hpp"
 #include "rviz_common/visibility_control.hpp"

diff --git a/rviz_common/include/rviz_common/interaction/selection_renderer.hpp b/rviz_common/include/rviz_common/interaction/selection_renderer.hpp
@@ -100,7 +100,7 @@ class SelectionRenderer
   ~SelectionRenderer() override = default;
 
   RVIZ_COMMON_PUBLIC
-  virtual void initialize(Ogre::Camera * camera, Ogre::SceneManager * scene_manager);
+  virtual void initialize(Ogre::Camera * camera);
 
   RVIZ_COMMON_PUBLIC
   virtual void render(
@@ -160,7 +160,7 @@ class SelectionRenderer
   rviz_common::DisplayContext * context_;
 
   Ogre::Camera * camera_;
-  Ogre::SceneManager * scene_manager_;
+  Ogre::SceneNode * camera_node_;
 
   Ogre::MaterialPtr fallback_pick_material_;
   Ogre::Technique * fallback_pick_technique_;

diff --git a/rviz_common/include/rviz_common/interaction/view_picker.hpp b/rviz_common/include/rviz_common/interaction/view_picker.hpp
@@ -39,7 +39,7 @@
 
 #include <OgreMaterialManager.h>
 #include <OgreRenderQueueListener.h>
-#include <OgreVector3.h>
+#include <OgreVector.h>
 
 #include <QObject>  // NOLINT: cpplint is unable to handle the include order here
 

diff --git a/rviz_common/include/rviz_common/interaction/view_picker_iface.hpp b/rviz_common/include/rviz_common/interaction/view_picker_iface.hpp
@@ -33,7 +33,7 @@
 
 #include <vector>
 
-#include <OgreVector3.h>
+#include <OgreVector.h>
 
 #include "rviz_common/visibility_control.hpp"
 

diff --git a/rviz_common/include/rviz_common/msg_conversions.hpp b/rviz_common/include/rviz_common/msg_conversions.hpp
@@ -30,7 +30,7 @@
 #ifndef RVIZ_COMMON__MSG_CONVERSIONS_HPP_
 #define RVIZ_COMMON__MSG_CONVERSIONS_HPP_
 
-#include <OgreVector3.h>
+#include <OgreVector.h>
 #include <OgreQuaternion.h>
 
 #include "geometry_msgs/msg/point.hpp"

diff --git a/rviz_common/include/rviz_common/properties/vector_property.hpp b/rviz_common/include/rviz_common/properties/vector_property.hpp
@@ -31,7 +31,7 @@
 #ifndef RVIZ_COMMON__PROPERTIES__VECTOR_PROPERTY_HPP_
 #define RVIZ_COMMON__PROPERTIES__VECTOR_PROPERTY_HPP_
 
-#include <OgreVector3.h>
+#include <OgreVector.h>
 
 #include "rviz_common/properties/property.hpp"
 #include "rviz_common/visibility_control.hpp"

diff --git a/rviz_common/include/rviz_common/render_panel.hpp b/rviz_common/include/rviz_common/render_panel.hpp
@@ -36,7 +36,7 @@
 #include <mutex>
 #include <vector>
 
-#include <OgreVector3.h>
+#include <OgreVector.h>
 
 #include <QWidget>  // NOLINT: cpplint is unable to handle the include order here
 

diff --git a/rviz_common/include/rviz_common/validate_floats.hpp b/rviz_common/include/rviz_common/validate_floats.hpp
@@ -34,7 +34,7 @@
 #include <cmath>
 #include <vector>
 
-#include <OgreVector3.h>
+#include <OgreVector.h>
 #include <OgreQuaternion.h>
 
 #include "geometry_msgs/msg/point_stamped.hpp"

diff --git a/rviz_common/include/rviz_common/view_controller.hpp b/rviz_common/include/rviz_common/view_controller.hpp
@@ -33,7 +33,7 @@
 
 #include <string>
 
-#include <OgreVector3.h>
+#include <OgreVector.h>
 
 #include <QCursor>  // NOLINT: cpplint is unable to handle the include order here
 #include <QMap>  // NOLINT: cpplint is unable to handle the include order here

diff --git a/rviz_common/src/rviz_common/frame_manager.hpp b/rviz_common/src/rviz_common/frame_manager.hpp
@@ -37,7 +37,7 @@
 #include <string>
 #include <vector>
 
-#include <OgreVector3.h>
+#include <OgreVector.h>
 #include <OgreQuaternion.h>
 
 #include <QObject>  // NOLINT: cpplint is unable to handle the include order here

diff --git a/rviz_common/src/rviz_common/interaction/selection_manager.cpp b/rviz_common/src/rviz_common/interaction/selection_manager.cpp
@@ -176,8 +176,10 @@ void SelectionManager::initialize()
 
   // create picking camera
   camera_ = scene_manager->createCamera(name + "_camera");
+  auto camera_node = scene_manager->getRootSceneNode()->createChildSceneNode();
+  camera_node->attachObject(camera_);
 
-  renderer_->initialize(camera_, scene_manager);
+  renderer_->initialize(camera_);
 
   handler_manager_ = context_->getHandlerManager();
   handler_manager_->addListener(this);

diff --git a/rviz_common/src/rviz_common/interaction/selection_renderer.cpp b/rviz_common/src/rviz_common/interaction/selection_renderer.cpp
@@ -60,13 +60,13 @@ namespace interaction
 SelectionRenderer::SelectionRenderer(rviz_common::DisplayContext * context)
 : context_(context),
   camera_(nullptr),
-  scene_manager_(nullptr)
+  camera_node_(nullptr)
 {}
 
-void SelectionRenderer::initialize(Ogre::Camera * camera, Ogre::SceneManager * scene_manager)
+void SelectionRenderer::initialize(Ogre::Camera * camera)
 {
   camera_ = camera;
-  scene_manager_ = scene_manager;
+  camera_node_ = camera_->getParentSceneNode();
 
   fallback_pick_material_ = Ogre::MaterialManager::getSingleton().getByName(
     "rviz/DefaultPickAndDepth");
@@ -165,8 +165,8 @@ void SelectionRenderer::configureCamera(
 
   camera_->setCustomProjectionMatrix(true, scale_matrix * trans_matrix * proj_matrix);
 
-  camera_->setPosition(viewport->getCamera()->getDerivedPosition());
-  camera_->setOrientation(viewport->getCamera()->getDerivedOrientation());
+  camera_node_->setPosition(viewport->getCamera()->getDerivedPosition());
+  camera_node_->setOrientation(viewport->getCamera()->getDerivedOrientation());
 }
 
 float SelectionRenderer::getRelativeCoordinate(float coordinate, int dimension) const

diff --git a/rviz_common/src/rviz_common/interaction/view_picker.cpp b/rviz_common/src/rviz_common/interaction/view_picker.cpp
@@ -43,7 +43,7 @@
 #include <OgreSceneNode.h>
 #include <OgreTextureManager.h>
 #include <OgreViewport.h>
-#include <OgreVector3.h>
+#include <OgreVector.h>
 
 #include "rviz_common/logging.hpp"
 
@@ -80,8 +80,10 @@ void ViewPicker::initialize()
   auto scene_manager = context_->getSceneManager();
 
   camera_ = scene_manager->createCamera("ViewPicker_camera");
+  auto camera_node = scene_manager->getRootSceneNode()->createChildSceneNode();
+  camera_node->attachObject(camera_);
 
-  renderer_->initialize(camera_, scene_manager);
+  renderer_->initialize(camera_);
 
   handler_manager_ = context_->getHandlerManager();
 }

diff --git a/rviz_common/src/rviz_common/render_panel.cpp b/rviz_common/src/rviz_common/render_panel.cpp
@@ -102,17 +102,22 @@ void RenderPanel::initialize(DisplayContext * context, bool use_main_scene)
   context_ = context;
 
   if (use_main_scene) {
+    Ogre::SceneManager * scene_manager = context_->getSceneManager();
+
     rviz_rendering::RenderWindowOgreAdapter::setSceneManager(
-      render_window_, context_->getSceneManager());
+      render_window_, scene_manager);
     std::string camera_name;
     static int count = 0;
     camera_name = "RenderPanelCamera" + std::to_string(count++);
-    auto default_camera_ = context_->getSceneManager()->createCamera(camera_name);
-    default_camera_->setNearClipDistance(0.01f);
-    default_camera_->setPosition(default_camera_pose_);
-    default_camera_->lookAt(Ogre::Vector3(0, 0, 0));
+    auto default_camera = scene_manager->createCamera(camera_name);
+    default_camera->setNearClipDistance(0.01f);
+
+    auto camera_node = scene_manager->getRootSceneNode()->createChildSceneNode();
+    camera_node->attachObject(default_camera);
+    camera_node->setPosition(default_camera_pose_);
+    camera_node->lookAt(Ogre::Vector3(0, 0, 0), Ogre::Node::TS_WORLD);
 
-    rviz_rendering::RenderWindowOgreAdapter::setOgreCamera(render_window_, default_camera_);
+    rviz_rendering::RenderWindowOgreAdapter::setOgreCamera(render_window_, default_camera);
   }
   // scene_manager_ = scene_manager;
   // scene_manager_->addListener(this);

diff --git a/rviz_common/src/rviz_common/visualization_manager.cpp b/rviz_common/src/rviz_common/visualization_manager.cpp
@@ -438,8 +438,8 @@ void VisualizationManager::onUpdate()
     view_manager_->getCurrent() &&
     view_manager_->getCurrent()->getCamera())
   {
-    using rviz_rendering::RenderWindowOgreAdapter;
-    RenderWindowOgreAdapter::getDirectionalLight(render_panel_->getRenderWindow())->setDirection(
+    rviz_rendering::RenderWindowOgreAdapter::setDirectionalLightDirection(
+      render_panel_->getRenderWindow(),
       view_manager_->getCurrent()->getCamera()->getDerivedDirection());
   }
 

diff --git a/..._plugins/include/rviz_default_plugins/displays/interactive_markers/interactive_marker.hpp b/..._plugins/include/rviz_default_plugins/displays/interactive_markers/interactive_marker.hpp
@@ -39,7 +39,7 @@
 #include <thread>
 #include <vector>
 
-#include <OgreVector3.h>
+#include <OgreVector.h>
 #include <OgreQuaternion.h>
 #endif
 

diff --git a/.../include/rviz_default_plugins/displays/interactive_markers/interactive_marker_control.hpp b/.../include/rviz_default_plugins/displays/interactive_markers/interactive_marker_control.hpp
@@ -38,7 +38,7 @@
 #include <vector>
 
 #include <OgreRay.h>
-#include <OgreVector3.h>
+#include <OgreVector.h>
 #include <OgreQuaternion.h>
 #include <OgreSceneManager.h>
 #endif

diff --git a/rviz_default_plugins/include/rviz_default_plugins/displays/map/map_display.hpp b/rviz_default_plugins/include/rviz_default_plugins/displays/map/map_display.hpp
@@ -39,7 +39,7 @@
 
 #include <OgreTexture.h>
 #include <OgreMaterial.h>
-#include <OgreVector3.h>
+#include <OgreVector.h>
 #include <OgreSharedPtr.h>
 
 #endif  // Q_MOC_RUN

diff --git a/rviz_default_plugins/include/rviz_default_plugins/displays/marker/markers/marker_base.hpp b/rviz_default_plugins/include/rviz_default_plugins/displays/marker/markers/marker_base.hpp
@@ -36,7 +36,7 @@
 #include <string>
 #include <utility>
 
-#include <OgreVector3.h>
+#include <OgreVector.h>
 
 #include "visualization_msgs/msg/marker.hpp"
 #include "rclcpp/rclcpp.hpp"

diff --git a/...ault_plugins/include/rviz_default_plugins/displays/pointcloud/point_cloud_transformer.hpp b/...ault_plugins/include/rviz_default_plugins/displays/pointcloud/point_cloud_transformer.hpp
@@ -35,7 +35,7 @@
 #include <QObject>  // NOLINT
 
 #ifndef Q_MOC_RUN
-#include <OgreVector3.h>
+#include <OgreVector.h>
 #include <OgreColourValue.h>
 
 #include "sensor_msgs/msg/point_cloud2.hpp"

diff --git a/rviz_default_plugins/include/rviz_default_plugins/displays/pose_array/flat_arrows_array.hpp b/rviz_default_plugins/include/rviz_default_plugins/displays/pose_array/flat_arrows_array.hpp
@@ -36,7 +36,7 @@
 #include <OgreManualObject.h>
 #include <OgreMaterialManager.h>
 #include <OgreSceneNode.h>
-#include <OgreVector3.h>
+#include <OgreVector.h>
 #include <OgreQuaternion.h>
 
 #include "rviz_default_plugins/displays/pose_array/pose_array_display.hpp"

diff --git a/...default_plugins/include/rviz_default_plugins/displays/robot_model/robot_model_display.hpp b/...default_plugins/include/rviz_default_plugins/displays/robot_model/robot_model_display.hpp
@@ -34,7 +34,7 @@
 #include <memory>
 #include <string>
 
-#include <OgreVector3.h>
+#include <OgreVector.h>
 
 #include "std_msgs/msg/string.hpp"
 

diff --git a/rviz_default_plugins/include/rviz_default_plugins/displays/tf/tf_display.hpp b/rviz_default_plugins/include/rviz_default_plugins/displays/tf/tf_display.hpp
@@ -38,7 +38,7 @@
 #include <vector>
 
 #include <OgreQuaternion.h>
-#include <OgreVector3.h>
+#include <OgreVector.h>
 
 #include "geometry_msgs/msg/transform_stamped.hpp"
 #include "tf2/exceptions.h"

diff --git a/rviz_default_plugins/include/rviz_default_plugins/robot/link_updater.hpp b/rviz_default_plugins/include/rviz_default_plugins/robot/link_updater.hpp
@@ -32,7 +32,7 @@
 
 #include <string>
 
-#include <OgreVector3.h>
+#include <OgreVector.h>
 
 #include "rviz_common/properties/status_property.hpp"
 

diff --git a/rviz_default_plugins/include/rviz_default_plugins/robot/robot.hpp b/rviz_default_plugins/include/rviz_default_plugins/robot/robot.hpp
@@ -34,7 +34,7 @@
 #include <string>
 #include <map>
 
-#include <OgreVector3.h>
+#include <OgreVector.h>
 #include <OgreQuaternion.h>
 #include <OgreAny.h>
 

diff --git a/rviz_default_plugins/include/rviz_default_plugins/robot/robot_element_base_class.hpp b/rviz_default_plugins/include/rviz_default_plugins/robot/robot_element_base_class.hpp
@@ -36,7 +36,7 @@
 #include <string>
 #include <vector>
 
-#include <OgreVector3.h>
+#include <OgreVector.h>
 #include <OgreQuaternion.h>
 #include <OgreSceneNode.h>
 

diff --git a/rviz_default_plugins/include/rviz_default_plugins/robot/robot_joint.hpp b/rviz_default_plugins/include/rviz_default_plugins/robot/robot_joint.hpp
@@ -37,7 +37,7 @@
 
 #ifndef Q_MOC_RUN
 
-#include <OgreVector3.h>
+#include <OgreVector.h>
 #include <OgreQuaternion.h>
 #include <OgreAny.h>
 #include <OgreMaterial.h>

diff --git a/rviz_default_plugins/include/rviz_default_plugins/robot/robot_link.hpp b/rviz_default_plugins/include/rviz_default_plugins/robot/robot_link.hpp
@@ -38,7 +38,7 @@
 
 #ifndef Q_MOC_RUN
 
-#include <OgreVector3.h>
+#include <OgreVector.h>
 #include <OgreQuaternion.h>
 #include <OgreAny.h>
 #include <OgreMaterial.h>

diff --git a/rviz_default_plugins/include/rviz_default_plugins/tools/measure/measure_tool.hpp b/rviz_default_plugins/include/rviz_default_plugins/tools/measure/measure_tool.hpp
@@ -41,7 +41,7 @@
 
 #include <QCursor>  // NOLINT cpplint cannot handle include order
 
-#include <OgreVector3.h>
+#include <OgreVector.h>
 
 #include "rviz_common/tool.hpp"
 

diff --git a/rviz_default_plugins/include/rviz_default_plugins/tools/point/point_tool.hpp b/rviz_default_plugins/include/rviz_default_plugins/tools/point/point_tool.hpp
@@ -30,7 +30,7 @@
 #ifndef RVIZ_DEFAULT_PLUGINS__TOOLS__POINT__POINT_TOOL_HPP_
 #define RVIZ_DEFAULT_PLUGINS__TOOLS__POINT__POINT_TOOL_HPP_
 
-#include <OgreVector3.h>
+#include <OgreVector.h>
 
 #include <QCursor>  // NOLINT cpplint cannot handle the include order here
 #include <QObject>  // NOLINT cpplint cannot handle the include order here

diff --git a/rviz_default_plugins/include/rviz_default_plugins/tools/pose/pose_tool.hpp b/rviz_default_plugins/include/rviz_default_plugins/tools/pose/pose_tool.hpp
@@ -34,7 +34,7 @@
 #include <string>
 #include <utility>
 
-#include <OgreVector3.h>
+#include <OgreVector.h>
 
 #include <QCursor>  // NOLINT cpplint cannot handle include order here
 

diff --git a/rviz_default_plugins/include/rviz_default_plugins/transformation/tf_frame_transformer.hpp b/rviz_default_plugins/include/rviz_default_plugins/transformation/tf_frame_transformer.hpp
@@ -34,7 +34,7 @@
 #include <string>
 #include <vector>
 
-#include <OgreVector3.h>
+#include <OgreVector.h>
 #include <OgreQuaternion.h>
 
 #include "rviz_common/transformation/frame_transformer.hpp"

diff --git a/.../rviz_default_plugins/view_controllers/follower/third_person_follower_view_controller.hpp b/.../rviz_default_plugins/view_controllers/follower/third_person_follower_view_controller.hpp
@@ -31,7 +31,7 @@
 #ifndef RVIZ_DEFAULT_PLUGINS__VIEW_CONTROLLERS__FOLLOWER__THIRD_PERSON_FOLLOWER_VIEW_CONTROLLER_HPP_
 #define RVIZ_DEFAULT_PLUGINS__VIEW_CONTROLLERS__FOLLOWER__THIRD_PERSON_FOLLOWER_VIEW_CONTROLLER_HPP_
 
-#include <OgreVector3.h>
+#include <OgreVector.h>
 
 #include "rviz_default_plugins/view_controllers/xy_orbit/xy_orbit_view_controller.hpp"
 

diff --git a/...default_plugins/include/rviz_default_plugins/view_controllers/fps/fps_view_controller.hpp b/...default_plugins/include/rviz_default_plugins/view_controllers/fps/fps_view_controller.hpp
@@ -36,7 +36,7 @@
 # pragma clang diagnostic ignored "-Wkeyword-macro"
 #endif
 
-#include <OgreVector3.h>
+#include <OgreVector.h>
 #include <OgreQuaternion.h>
 
 #ifdef __clang__

diff --git a/...ult_plugins/include/rviz_default_plugins/view_controllers/orbit/orbit_view_controller.hpp b/...ult_plugins/include/rviz_default_plugins/view_controllers/orbit/orbit_view_controller.hpp
@@ -34,7 +34,7 @@
 
 #include <memory>
 
-#include <OgreVector3.h>
+#include <OgreVector.h>
 
 #include <QCursor>  // NOLINT(build/include_order)
 

diff --git a/...ugins/include/rviz_default_plugins/view_controllers/xy_orbit/xy_orbit_view_controller.hpp b/...ugins/include/rviz_default_plugins/view_controllers/xy_orbit/xy_orbit_view_controller.hpp
@@ -39,7 +39,7 @@
 #endif
 
 #include <OgreRay.h>
-#include <OgreVector3.h>
+#include <OgreVector.h>
 
 #ifdef __clang__
 # pragma clang diagnostic pop