Skip to content

Support Ogre 14.5.1 #1655

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

Draft
ahcorde wants to merge 2 commits into
base: rolling
Choose a base branch
from
+11 −5
Draft

Support Ogre 14.5.1 #1655

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
67cfc10
Support Ogre 14.5.1
ahcorde Jan 21, 2026
d1f4450
clean up
ahcorde Jan 21, 2026
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
1 change: 1 addition & 0 deletions rviz_common/include/rviz_common/interaction/selection_renderer.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
#include <memory>
#include <string>

#include <OgreMaterial.h>
#include <OgreMaterialManager.h>
#include <OgreRenderQueueListener.h>

Expand Down
1 change: 1 addition & 0 deletions rviz_common/src/rviz_common/interaction/selection_renderer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@

#include <OgreCamera.h>
#include <OgreHardwarePixelBuffer.h>
#include <OgreMaterial.h>
#include <OgreMaterialManager.h>
#include <OgreRectangle2D.h>
#include <OgreRenderTexture.h>
Expand Down
1 change: 1 addition & 0 deletions rviz_default_plugins/include/rviz_default_plugins/displays/marker/marker_common.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
#include <vector>
#include <utility>

#include <OgreMaterial.h>
#include <OgreSceneNode.h>

#include <QString> // NOLINT: cpplint is unable to handle the include order here
Expand Down
4 changes: 2 additions & 2 deletions rviz_ogre_vendor/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ endif()

ament_vendor(ogre_vendor
VCS_URL https://github.com/OGRECave/ogre.git
VCS_VERSION v1.12.10
VCS_VERSION v14.5.1
CMAKE_ARGS
-DOGRE_STATIC:BOOL=OFF
-DOGRE_INSTALL_PDB:BOOL=OFF
Expand All @@ -70,7 +70,7 @@ ament_vendor(ogre_vendor
-DOGRE_MANGLE_NAME_OF_LIBRARIES_USED_BY_RVIZ:BOOL=${RVIZ_OGRE_VENDOR_MANGLE_NAME_OF_LIBRARIES_USED_BY_RVIZ}
"-DCMAKE_CXX_FLAGS=${OGRE_CXX_FLAGS}"
${OGRE_CMAKE_ARGS}
PATCHES patches
# PATCHES patches
)

if(BUILD_TESTING)
Expand Down
2 changes: 1 addition & 1 deletion rviz_ogre_vendor/rviz_ogre_vendor-extras.cmake.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ foreach(_lib IN LISTS OGRE_LIBRARIES)

set_property(TARGET rviz_ogre_vendor::OgreMain
PROPERTY
INTERFACE_INCLUDE_DIRECTORIES ${OGRE_INCLUDE_DIRS}
INTERFACE_INCLUDE_DIRECTORIES ${OGRE_INCLUDE_DIRS} ${OGRE_INCLUDE_DIRS}/RenderSystems/glad
)
if(_ogre_main_static_library_abs)
set_property(TARGET rviz_ogre_vendor::OgreMain APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
Expand Down
1 change: 1 addition & 0 deletions rviz_rendering/include/rviz_rendering/objects/billboard_line.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
#define RVIZ_RENDERING__OBJECTS__BILLBOARD_LINE_HPP_

#include <cstdint>
#include <functional>
#include <vector>

#include <OgreBillboardChain.h>
Expand Down
1 change: 1 addition & 0 deletions rviz_rendering/include/rviz_rendering/objects/grid.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
#define RVIZ_RENDERING__OBJECTS__GRID_HPP_

#include <cstdint>
#include <functional>
#include <memory>
#include <vector>

Expand Down
1 change: 1 addition & 0 deletions rviz_rendering/src/rviz_rendering/objects/billboard_line.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
#include <iostream>
#include <stdexcept>
#include <string>
#include <sstream>

#include "rviz_rendering/material_manager.hpp"

Expand Down
2 changes: 1 addition & 1 deletion rviz_rendering/src/rviz_rendering/objects/point_cloud.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -649,7 +649,7 @@ size_t PointCloud::removePointsFromRenderables(

size_t popped_in_renderable = std::min(
static_cast<size_t>(number_of_points * vertices_per_point - popped_count),
op->vertexData->vertexCount);
static_cast<size_t>(op->vertexData->vertexCount));
op->vertexData->vertexStart += popped_in_renderable;
op->vertexData->vertexCount -= popped_in_renderable;

Expand Down
2 changes: 1 addition & 1 deletion rviz_rendering/src/rviz_rendering/render_system.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ RenderSystem::detectGlVersion()
} else {
Ogre::RenderSystem * renderSys = ogre_root_->getRenderSystem();
// createRenderSystemCapabilities() called for side effects only
std::unique_ptr<Ogre::RenderSystemCapabilities>(renderSys->createRenderSystemCapabilities());
Ogre::Root::getSingleton().getRenderSystem()->getCapabilities();
const Ogre::RenderSystemCapabilities * caps = renderSys->getCapabilities();
int major = caps->getDriverVersion().major;
int minor = caps->getDriverVersion().minor;
Expand Down