i/rtabmap_ros
1
0
Fork 0
mirror of https://github.com/introlab/rtabmap_ros.git synced 2026-10-04 16:57:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

fixed merge artifacts

Browse Source
This commit is contained in:
matlabbe
2024-01-03 18:27:19 -08:00
parent 745f9fcd5f
commit 4301dcbc0d
1 changed files with 0 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rtabmap_util/include/rtabmap_util/MapsManager.h
-22
View File
@@ -132,24 +132,6 @@ private:
#if defined(WITH_GRID_MAP_ROS) and defined(RTABMAP_GRIDMAP) #if defined(WITH_GRID_MAP_ROS) and defined(RTABMAP_GRIDMAP)
rclcpp::Publisher<grid_map_msgs::msg::GridMap>::SharedPtr elevationMapPub_; rclcpp::Publisher<grid_map_msgs::msg::GridMap>::SharedPtr elevationMapPub_;
#endif #endif
=======
ros::Publisher cloudMapPub_;
ros::Publisher cloudGroundPub_;
ros::Publisher cloudObstaclesPub_;
ros::Publisher projMapPub_;
ros::Publisher gridMapPub_;
ros::Publisher gridProbMapPub_;
ros::Publisher scanMapPub_;
ros::Publisher octoMapPubBin_;
ros::Publisher octoMapPubFull_;
ros::Publisher octoMapCloud_;
ros::Publisher octoMapFrontierCloud_;
ros::Publisher octoMapGroundCloud_;
ros::Publisher octoMapObstacleCloud_;
ros::Publisher octoMapEmptySpace_;
ros::Publisher octoMapProj_;
ros::Publisher elevationMapPub_;
>>>>>>> c70f9f1b14ead8f51ee724bd0b2c88ff091d74fa
std::map<int, rtabmap::Transform> assembledGroundPoses_; std::map<int, rtabmap::Transform> assembledGroundPoses_;
std::map<int, rtabmap::Transform> assembledObstaclePoses_; std::map<int, rtabmap::Transform> assembledObstaclePoses_;
@@ -172,13 +154,9 @@ private:
int octomapTreeDepth_; int octomapTreeDepth_;
bool octomapUpdated_; bool octomapUpdated_;
<<<<<<< HEAD
#ifdef RTABMAP_GRIDMAP #ifdef RTABMAP_GRIDMAP
rtabmap::GridMap * elevationMap_; rtabmap::GridMap * elevationMap_;
#endif #endif
=======
rtabmap::GridMap * elevationMap_;
>>>>>>> c70f9f1b14ead8f51ee724bd0b2c88ff091d74fa
bool elevationMapUpdated_; bool elevationMapUpdated_;
rtabmap::ParametersMap parameters_; rtabmap::ParametersMap parameters_;