Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

OgreVector3.h is deprecated in favor of OgreVector.h #1741

Merged
merged 1 commit into from
May 21, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/rviz/default_plugin/covariance_visual.h
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@

#include <Eigen/Dense>

#include <OgreVector3.h>
#include <rviz/ogre_helpers/ogre_vector.h>
#include <OgreColourValue.h>

namespace Ogre
Expand Down
2 changes: 1 addition & 1 deletion src/rviz/default_plugin/effort_visual.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include <OgreVector3.h>
#include <rviz/ogre_helpers/ogre_vector.h>
#include <OgreSceneNode.h>
#include <OgreSceneManager.h>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
#include <boost/thread/recursive_mutex.hpp>
#include <boost/thread/thread.hpp>

#include <OgreVector3.h>
#include <rviz/ogre_helpers/ogre_vector.h>
#include <OgreQuaternion.h>
#endif

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
#include <boost/enable_shared_from_this.hpp>

#include <OgreRay.h>
#include <OgreVector3.h>
#include <rviz/ogre_helpers/ogre_vector.h>
#include <OgreQuaternion.h>
#include <OgreSceneManager.h>
#endif
Expand Down
2 changes: 1 addition & 1 deletion src/rviz/default_plugin/map_display.h
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@

#include <OgreTexture.h>
#include <OgreMaterial.h>
#include <OgreVector3.h>
#include <rviz/ogre_helpers/ogre_vector.h>
#include <OgreSharedPtr.h>
#endif

Expand Down
2 changes: 1 addition & 1 deletion src/rviz/default_plugin/markers/arrow_marker.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/

#include <OgreVector3.h>
#include <rviz/ogre_helpers/ogre_vector.h>
#include <OgreQuaternion.h>
#include <OgreSceneNode.h>
#include <OgreSceneManager.h>
Expand Down
2 changes: 1 addition & 1 deletion src/rviz/default_plugin/markers/line_list_marker.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@

#include <rviz/ogre_helpers/billboard_line.h>

#include <OgreVector3.h>
#include <rviz/ogre_helpers/ogre_vector.h>
#include <OgreQuaternion.h>
#include <OgreSceneNode.h>

Expand Down
2 changes: 1 addition & 1 deletion src/rviz/default_plugin/markers/line_strip_marker.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@

#include <rviz/ogre_helpers/billboard_line.h>

#include <OgreVector3.h>
#include <rviz/ogre_helpers/ogre_vector.h>
#include <OgreQuaternion.h>
#include <OgreSceneNode.h>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
*/

#include <OgreQuaternion.h>
#include <OgreVector3.h>
#include <rviz/ogre_helpers/ogre_vector.h>

#include <rviz/default_plugin/interactive_markers/interactive_marker_control.h>
#include <rviz/default_plugin/marker_display.h>
Expand Down
2 changes: 1 addition & 1 deletion src/rviz/default_plugin/markers/points_marker.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@

#include <rviz/ogre_helpers/point_cloud.h>

#include <OgreVector3.h>
#include <rviz/ogre_helpers/ogre_vector.h>
#include <OgreQuaternion.h>
#include <OgreSceneNode.h>
#include <OgreSceneManager.h>
Expand Down
2 changes: 1 addition & 1 deletion src/rviz/default_plugin/point_cloud_transformer.h
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
#include <ros/message_forward.h>

#ifndef Q_MOC_RUN
#include <OgreVector3.h>
#include <rviz/ogre_helpers/ogre_vector.h>
#include <OgreColourValue.h>

#include <rviz/ogre_helpers/point_cloud.h>
Expand Down
2 changes: 1 addition & 1 deletion src/rviz/default_plugin/point_cloud_transformers.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

#include <OgreColourValue.h>
#include <OgreMatrix4.h>
#include <OgreVector3.h>
#include <rviz/ogre_helpers/ogre_vector.h>

#include <rviz/properties/bool_property.h>
#include <rviz/properties/color_property.h>
Expand Down
2 changes: 1 addition & 1 deletion src/rviz/default_plugin/point_visual.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include <OgreVector3.h>
#include <rviz/ogre_helpers/ogre_vector.h>
#include <OgreSceneNode.h>
#include <OgreSceneManager.h>

Expand Down
2 changes: 1 addition & 1 deletion src/rviz/default_plugin/robot_model_display.h
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@

#include <rviz/display.h>

#include <OgreVector3.h>
#include <rviz/ogre_helpers/ogre_vector.h>

#include <map>

Expand Down
2 changes: 1 addition & 1 deletion src/rviz/default_plugin/screw_visual.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include <OgreVector3.h>
#include <rviz/ogre_helpers/ogre_vector.h>
#include <OgreSceneNode.h>
#include <OgreSceneManager.h>

Expand Down
2 changes: 1 addition & 1 deletion src/rviz/default_plugin/tf_display.h
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
#include <set>

#include <OgreQuaternion.h>
#include <OgreVector3.h>
#include <rviz/ogre_helpers/ogre_vector.h>

#include <rviz/selection/forwards.h>

Expand Down
2 changes: 1 addition & 1 deletion src/rviz/default_plugin/tools/focus_tool.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
*/

#include <OgreRay.h>
#include <OgreVector3.h>
#include <rviz/ogre_helpers/ogre_vector.h>
#include <OgreViewport.h>
#include <OgreCamera.h>

Expand Down
2 changes: 1 addition & 1 deletion src/rviz/default_plugin/tools/measure_tool.h
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@

#include <rviz/tool.h>

#include <OgreVector3.h>
#include <rviz/ogre_helpers/ogre_vector.h>

namespace rviz
{
Expand Down
2 changes: 1 addition & 1 deletion src/rviz/default_plugin/tools/point_tool.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
*/

#include <OgreRay.h>
#include <OgreVector3.h>
#include <rviz/ogre_helpers/ogre_vector.h>

#include <rviz/viewport_mouse_event.h>
#include <rviz/load_resource.h>
Expand Down
2 changes: 1 addition & 1 deletion src/rviz/default_plugin/tools/pose_tool.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
#ifndef RVIZ_POSE_TOOL_H
#define RVIZ_POSE_TOOL_H

#include <OgreVector3.h>
#include <rviz/ogre_helpers/ogre_vector.h>

#include <QCursor>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
#include <OgreQuaternion.h>
#include <OgreSceneManager.h>
#include <OgreSceneNode.h>
#include <OgreVector3.h>
#include <rviz/ogre_helpers/ogre_vector.h>
#include <OgreViewport.h>

#include <rviz/display_context.h>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
#include <OgreQuaternion.h>
#include <OgreSceneManager.h>
#include <OgreSceneNode.h>
#include <OgreVector3.h>
#include <rviz/ogre_helpers/ogre_vector.h>
#include <OgreViewport.h>

#include <rviz/display_context.h>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
#ifndef RVIZ_ORBIT_VIEW_CONTROLLER_H
#define RVIZ_ORBIT_VIEW_CONTROLLER_H

#include <OgreVector3.h>
#include <rviz/ogre_helpers/ogre_vector.h>

#include <QCursor>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
#include <OgreQuaternion.h>
#include <OgreRay.h>
#include <OgreSceneNode.h>
#include <OgreVector3.h>
#include <rviz/ogre_helpers/ogre_vector.h>
#include <OgreViewport.h>
#include <OgreMath.h>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@

#include <rviz/default_plugin/view_controllers/orbit_view_controller.h>

#include <OgreVector3.h>
#include <rviz/ogre_helpers/ogre_vector.h>

namespace Ogre
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
#include <OgreQuaternion.h>
#include <OgreRay.h>
#include <OgreSceneNode.h>
#include <OgreVector3.h>
#include <rviz/ogre_helpers/ogre_vector.h>
#include <OgreViewport.h>

#include <rviz/display_context.h>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@

#include <rviz/default_plugin/view_controllers/orbit_view_controller.h>

#include <OgreVector3.h>
#include <rviz/ogre_helpers/ogre_vector.h>

namespace Ogre
{
Expand Down
2 changes: 1 addition & 1 deletion src/rviz/frame_manager.h
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
#include <tf2_ros/buffer.h>
#include <geometry_msgs/Pose.h>

#include <OgreVector3.h>
#include <rviz/ogre_helpers/ogre_vector.h>
#include <OgreQuaternion.h>

#include <boost/thread/mutex.hpp>
Expand Down
2 changes: 1 addition & 1 deletion src/rviz/frame_position_tracking_view_controller.h
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
#define RVIZ_FRAME_POSITION_TRACKING_VIEW_CONTROLLER_H

#include <OgreQuaternion.h>
#include <OgreVector3.h>
#include <rviz/ogre_helpers/ogre_vector.h>

#include <rviz/view_controller.h>
#include <rviz/rviz_export.h>
Expand Down
2 changes: 1 addition & 1 deletion src/rviz/msg_conversions.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
#ifndef MSG_CONVERSIONS_H
#define MSG_CONVERSIONS_H

#include <OgreVector3.h>
#include <rviz/ogre_helpers/ogre_vector.h>
#include <OgreQuaternion.h>

#include <geometry_msgs/Point.h>
Expand Down
2 changes: 1 addition & 1 deletion src/rviz/ogre_helpers/arrow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@

#include <OgreSceneManager.h>
#include <OgreSceneNode.h>
#include <OgreVector3.h>
#include <rviz/ogre_helpers/ogre_vector.h>
#include <OgreQuaternion.h>

#include <sstream>
Expand Down
2 changes: 1 addition & 1 deletion src/rviz/ogre_helpers/axes.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@

#include <OgreSceneManager.h>
#include <OgreSceneNode.h>
#include <OgreVector3.h>
#include <rviz/ogre_helpers/ogre_vector.h>
#include <OgreQuaternion.h>

#include <sstream>
Expand Down
2 changes: 1 addition & 1 deletion src/rviz/ogre_helpers/billboard_line.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@

#include <OgreSceneManager.h>
#include <OgreSceneNode.h>
#include <OgreVector3.h>
#include <rviz/ogre_helpers/ogre_vector.h>
#include <OgreQuaternion.h>
#include <OgreBillboardChain.h>
#include <OgreMaterialManager.h>
Expand Down
2 changes: 1 addition & 1 deletion src/rviz/ogre_helpers/billboard_line.h
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
#include <stdint.h>

#include <vector>
#include <OgreVector3.h>
#include <rviz/ogre_helpers/ogre_vector.h>
#include <OgreColourValue.h>
#include <OgreMaterial.h>
#include <OgreSharedPtr.h>
Expand Down
2 changes: 1 addition & 1 deletion src/rviz/ogre_helpers/camera_base.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
#include <OgreCamera.h>
#include <OgreSceneManager.h>
#include <OgreSceneNode.h>
#include <OgreVector3.h>
#include <rviz/ogre_helpers/ogre_vector.h>
#include <OgreQuaternion.h>

#include <stdint.h>
Expand Down
2 changes: 1 addition & 1 deletion src/rviz/ogre_helpers/camera_base.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
#ifndef OGRE_TOOLS_CAMERA_BASE_H_
#define OGRE_TOOLS_CAMERA_BASE_H_

#include <OgreVector3.h>
#include <rviz/ogre_helpers/ogre_vector.h>
#include <OgreQuaternion.h>

namespace Ogre
Expand Down
2 changes: 1 addition & 1 deletion src/rviz/ogre_helpers/grid.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@

#include <OgreSceneManager.h>
#include <OgreSceneNode.h>
#include <OgreVector3.h>
#include <rviz/ogre_helpers/ogre_vector.h>
#include <OgreQuaternion.h>
#include <OgreManualObject.h>
#include <OgreMaterialManager.h>
Expand Down
2 changes: 1 addition & 1 deletion src/rviz/ogre_helpers/movable_text.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
#include "movable_text.h"
#include <rviz/ogre_helpers/version_check.h>

#include <OgreVector3.h>
#include <rviz/ogre_helpers/ogre_vector.h>
#include <OgreQuaternion.h>
#include <OgreRoot.h>
#include <OgreCamera.h>
Expand Down
8 changes: 8 additions & 0 deletions src/rviz/ogre_helpers/ogre_vector.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
// OgrePrerequisites.h is needed for version_check to work
#include <OgrePrerequisites.h>
#include <rviz/ogre_helpers/version_check.h>
#if OGRE_VERSION < OGRE_VERSION_CHECK(1, 12, 0)
#include <OgreVector3.h>
#else
#include <OgreVector.h>
#endif
2 changes: 1 addition & 1 deletion src/rviz/ogre_helpers/orbit_camera.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
#include <OgreCamera.h>
#include <OgreSceneManager.h>
#include <OgreSceneNode.h>
#include <OgreVector3.h>
#include <rviz/ogre_helpers/ogre_vector.h>
#include <OgreQuaternion.h>
#include <OgreViewport.h>

Expand Down
2 changes: 1 addition & 1 deletion src/rviz/ogre_helpers/orbit_camera.h
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
#define OGRE_TOOLS_ORBIT_CAMERA_H_

#include "camera_base.h"
#include <OgreVector3.h>
#include <rviz/ogre_helpers/ogre_vector.h>

namespace Ogre
{
Expand Down
2 changes: 1 addition & 1 deletion src/rviz/ogre_helpers/point_cloud.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@

#include <OgreSceneManager.h>
#include <OgreSceneNode.h>
#include <OgreVector3.h>
#include <rviz/ogre_helpers/ogre_vector.h>
#include <OgreQuaternion.h>
#include <OgreManualObject.h>
#include <OgreMaterialManager.h>
Expand Down
2 changes: 1 addition & 1 deletion src/rviz/ogre_helpers/point_cloud.h
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
#include <OgreMovableObject.h>
#include <OgreString.h>
#include <OgreAxisAlignedBox.h>
#include <OgreVector3.h>
#include <rviz/ogre_helpers/ogre_vector.h>
#include <OgreMaterial.h>
#include <OgreColourValue.h>
#include <OgreRoot.h>
Expand Down
2 changes: 1 addition & 1 deletion src/rviz/ogre_helpers/shape.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
#include <rviz/ogre_helpers/version_check.h>
#include <OgreSceneManager.h>
#include <OgreSceneNode.h>
#include <OgreVector3.h>
#include <rviz/ogre_helpers/ogre_vector.h>
#include <OgreQuaternion.h>
#include <OgreEntity.h>
#include <OgreMaterialManager.h>
Expand Down
2 changes: 1 addition & 1 deletion src/rviz/ogre_helpers/shape.h
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
#include "object.h"

#include <OgreMaterial.h>
#include <OgreVector3.h>
#include <rviz/ogre_helpers/ogre_vector.h>
#include <OgreSharedPtr.h>

namespace Ogre
Expand Down
Loading