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.

Sign up for GitHub

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

Jump to bottom

Drop OGRE/ from #include directives #1730

Merged
merged 1 commit into from
Mar 22, 2022
Merged

Drop OGRE/ from #include directives #1730

merged 1 commit into from
Mar 22, 2022

Conversation

rhaschke
Copy link
Contributor

Implements #1630 (comment). Untested.

@rhaschke
Drop OGRE/ from #include directives
3aa6b76 
${OGRE_INCLUDE_DIRS} points to <install folder>/include/OGRE.
Thus #includes shouldn't comprise OGRE/*.
Reverts 41d62f5
simonschmeisser
simonschmeisser reviewed Mar 19, 2022
View reviewed changes
src/rviz/ogre_helpers/movable_text.cpp
#include <OgreHardwareBufferManager.h>
#include <Overlay/OgreFontManager.h>
#include <Overlay/OgreFont.h>
#include <OgreUTFString.h>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this makes a4919f5 superfluous as proposed originally in #1645 😉

@v4hn
Copy link
Contributor

v4hn commented Mar 21, 2022

OGRECave/ogre#2411

paroj
paroj reviewed Mar 21, 2022
View reviewed changes
src/rviz/ogre_helpers/movable_text.cpp
#include <OgreSceneNode.h>
#include <OgreMaterialManager.h>
#include <OgreHardwareBufferManager.h>
#include <Overlay/OgreFontManager.h>
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

CMake will add Overlay to the include path, so you should not use the Overlay/ prefix.

Also, there is native movable text in 1.12.10+:
https://www.ogre3d.org/2020/12/13/ogre-1-12-10-released#3dtext

v4hn
v4hn approved these changes Mar 22, 2022
View reviewed changes
Copy link
Contributor

@v4hn v4hn left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As stressed by upstream in the linked PR, Ogre headers must never be included with a folder prefix.

So this patch makes sense after also removing all the Overlay/ references.

@rhaschke rhaschke merged commit 83b1802 into ros-visualization:melodic-devel Mar 22, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@paroj paroj paroj left review comments

@simonschmeisser simonschmeisser simonschmeisser left review comments

@v4hn v4hn v4hn approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@rhaschke @v4hn @simonschmeisser @paroj