Skip to content

[ROS-O] patches #891

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

Merged
merged 4 commits into from
Dec 10, 2024
Merged

[ROS-O] patches #891

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
54b1406
drop ROS_DISTRO STRGREATER tests
v4hn Oct 10, 2024
73fb2b3
support Ogre 1.12
v4hn Nov 18, 2024
b372ea6
Merge branch 'master' into obese-devel
k-okada Dec 10, 2024
064068d
CMakeLists.txt: check both kinetic and indigo
k-okada Dec 10, 2024
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
5 changes: 2 additions & 3 deletions jsk_interactive_markers/jsk_interactive_marker/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
cmake_minimum_required(VERSION 2.8.3)
project(jsk_interactive_marker)

if("$ENV{ROS_DISTRO}" STRGREATER "melodic")
add_compile_options(-std=c++14)
else()
if(("$ENV{ROS_DISTRO}" STREQUAL "kinetic") OR ("$ENV{ROS_DISTRO}" STREQUAL "indigo"))
# catch special case ROS kinetic where c++11 is not the default yet
add_compile_options(-std=c++11)
endif()

Expand Down
2 changes: 1 addition & 1 deletion jsk_rqt_plugins/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ install(DIRECTORY launch resource sample sample_scripts test

if (CATKIN_ENABLE_TESTING)
find_package(rostest REQUIRED)
if("$ENV{ROS_DISTRO}" STRGREATER "indigo")
if(NOT "$ENV{ROS_DISTRO}" STREQUAL "indigo")
catkin_add_nosetests(test)
add_rostest(test/test_rqt_plugins.test)
endif()
Expand Down
5 changes: 2 additions & 3 deletions jsk_rviz_plugins/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,8 @@
# http://ros.org/doc/groovy/api/catkin/html/user_guide/supposed.html
cmake_minimum_required(VERSION 2.8.3)
project(jsk_rviz_plugins)
if("$ENV{ROS_DISTRO}" STRGREATER "melodic")
add_compile_options(-std=c++14)
else()
if(("$ENV{ROS_DISTRO}" STREQUAL "kinetic") OR ("$ENV{ROS_DISTRO}" STREQUAL "indigo"))
# catch special case ROS kinetic where c++11 is not the default yet
add_compile_options(-std=c++11)
endif()
# Load catkin and all dependencies required for this package
Expand Down
1 change: 1 addition & 0 deletions jsk_rviz_plugins/src/camera_info_display.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@
#include <OGRE/OgreSceneManager.h>
#include <OGRE/OgreTextureManager.h>
#include <OGRE/OgreTexture.h>
#include <OGRE/OgreTechnique.h>
#include <cv_bridge/cv_bridge.h>
#include <sensor_msgs/image_encodings.h>
#include <image_transport/subscriber.h>
Expand Down
8 changes: 8 additions & 0 deletions jsk_rviz_plugins/src/overlay_camera_display.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,11 @@ void OverlayCameraDisplay::onInitialize()

bg_screen_rect_->setRenderQueueGroup(Ogre::RENDER_QUEUE_BACKGROUND);
bg_screen_rect_->setBoundingBox(aabInf);
#if ((OGRE_VERSION_MAJOR << 16) | (OGRE_VERSION_MINOR << 8) | OGRE_VERSION_PATCH) < ((1 << 16) | (10 << 8) | 0)
bg_screen_rect_->setMaterial(bg_material_->getName());
#else
bg_screen_rect_->setMaterial(bg_material_);
#endif

bg_scene_node_->attachObject(bg_screen_rect_);
bg_scene_node_->setVisible(false);
Expand All @@ -217,7 +221,11 @@ void OverlayCameraDisplay::onInitialize()

fg_material_ = bg_material_->clone( ss.str()+"fg" );
fg_screen_rect_->setBoundingBox(aabInf);
#if ((OGRE_VERSION_MAJOR << 16) | (OGRE_VERSION_MINOR << 8) | OGRE_VERSION_PATCH) < ((1 << 16) | (10 << 8) | 0)
fg_screen_rect_->setMaterial(fg_material_->getName());
#else
fg_screen_rect_->setMaterial(fg_material_);
#endif

fg_material_->setSceneBlending( Ogre::SBT_TRANSPARENT_ALPHA );
fg_screen_rect_->setRenderQueueGroup(Ogre::RENDER_QUEUE_OVERLAY - 1);
Expand Down
1 change: 1 addition & 0 deletions jsk_rviz_plugins/src/overlay_utils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@
#include <OGRE/OgreOverlayContainer.h>
#include <OGRE/OgreOverlayManager.h>
#else
#include <OGRE/Overlay/OgreOverlay.h>
#include <OGRE/Overlay/OgrePanelOverlayElement.h>
#include <OGRE/Overlay/OgreOverlayElement.h>
#include <OGRE/Overlay/OgreOverlayContainer.h>
Expand Down
1 change: 1 addition & 0 deletions jsk_rviz_plugins/src/polygon_array_display.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
#include <OGRE/OgreSceneNode.h>
#include <OGRE/OgreManualObject.h>
#include <OGRE/OgreMaterialManager.h>
#include <OGRE/OgreTechnique.h>
#include <rviz/properties/color_property.h>
#include <rviz/properties/bool_property.h>
#include <rviz/properties/enum_property.h>
Expand Down
Loading