-
-
Notifications
You must be signed in to change notification settings - Fork 7
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #24 from wep21/add-grid-map
feat: add grid map into linux and osx
- Loading branch information
Showing
10 changed files
with
91 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
package: | ||
name: ros-jazzy-octomap | ||
version: "1.10.0" | ||
|
||
build: | ||
number: 0 | ||
|
||
requirements: | ||
run: | ||
- octomap 1.10.* | ||
|
||
|
||
about: | ||
homepage: https://github.com/conda-forge/octomap-feedstock | ||
license: BSD-3-Clause | ||
summary: | | ||
An Efficient Probabilistic 3D Mapping Framework Based on Octrees | ||
extra: | ||
recipe-maintainers: | ||
- ros-forge |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
diff --git a/include/grid_map_core/BufferRegion.hpp b/include/grid_map_core/BufferRegion.hpp | ||
index fbe2d20..873b4b6 100644 | ||
--- a/include/grid_map_core/BufferRegion.hpp | ||
+++ b/include/grid_map_core/BufferRegion.hpp | ||
@@ -39,6 +39,8 @@ public: | ||
BufferRegion( | ||
const Index & startIndex, const Size & size, | ||
const BufferRegion::Quadrant & quadrant); | ||
+ BufferRegion(const BufferRegion & other) = default; | ||
+ BufferRegion & operator=(const BufferRegion & other) = default; | ||
virtual ~BufferRegion() = default; | ||
|
||
const Index & getStartIndex() const; | ||
diff --git a/include/grid_map_core/Polygon.hpp b/include/grid_map_core/Polygon.hpp | ||
index 9d7ad27..a02b133 100644 | ||
--- a/include/grid_map_core/Polygon.hpp | ||
+++ b/include/grid_map_core/Polygon.hpp | ||
@@ -40,6 +40,9 @@ public: | ||
*/ | ||
explicit Polygon(std::vector<Position> vertices); | ||
|
||
+ Polygon(const Polygon & other) = default; | ||
+ Polygon & operator=(const Polygon & other) = default; | ||
+ | ||
/*! | ||
* Destructor. | ||
*/ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
diff --git a/include/grid_map_pcl/helpers.hpp b/include/grid_map_pcl/helpers.hpp | ||
index f3d9f38..fc94637 100644 | ||
--- a/include/grid_map_pcl/helpers.hpp | ||
+++ b/include/grid_map_pcl/helpers.hpp | ||
@@ -42,7 +42,11 @@ void saveGridMap( | ||
const std::string & mapTopic); | ||
|
||
inline void printTimeElapsedToRosInfoStream( | ||
+#if defined(__APPLE__) | ||
+ const std::chrono::steady_clock::time_point & start, | ||
+#else | ||
const std::chrono::system_clock::time_point & start, | ||
+#endif | ||
const std::string & prefix, | ||
const rclcpp::Logger & node_logger) | ||
{ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
index 2bdfa4d..c16ebcc 100644 | ||
--- a/CMakeLists.txt | ||
+++ b/CMakeLists.txt | ||
@@ -33,7 +33,7 @@ ament_auto_add_library(${PROJECT_NAME} SHARED | ||
|
||
target_link_libraries(${PROJECT_NAME} | ||
Qt5::Widgets | ||
- ${OCTOMAP_LIBRARIES} | ||
+ octomap | ||
) | ||
|
||
target_include_directories(${PROJECT_NAME} PUBLIC |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters