Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 8 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# VS Code stuff
/.vscode/**
**/__pycache__/

# ROS 2 build files
build/
install/
log/
1 change: 0 additions & 1 deletion navmap_core/include/navmap_core/Geometry.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
#include <limits>
#include <cmath>
#include <algorithm>
#include <array>

namespace navmap
{
Expand Down
2 changes: 0 additions & 2 deletions navmap_core/include/navmap_core/NavMap.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,8 @@
#include <string>
#include <array>
#include <limits>
#include <stack>
#include <cmath>
#include <cstdint>
#include <span>
#include <type_traits>
#include <deque>
#include <algorithm>
Expand Down
1 change: 1 addition & 0 deletions navmap_core/src/navmap_core/NavMap.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@


#include "navmap_core/NavMap.hpp"
#include <stack>
#include <algorithm>
#include <functional>
#include <cmath>
Expand Down
1 change: 0 additions & 1 deletion navmap_core/tests/test_geometry.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@

#include <gtest/gtest.h>
#include <Eigen/Core>
#include <limits>
#include "navmap_core/Geometry.hpp"

using namespace navmap;
Expand Down
1 change: 0 additions & 1 deletion navmap_core/tests/test_navmap_uniform_and_closest.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@

#include <gtest/gtest.h>
#include <Eigen/Core>
#include <limits>
#include "navmap_core/NavMap.hpp"

using namespace navmap;
Expand Down
4 changes: 0 additions & 4 deletions navmap_examples/src/01_flat_plane.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,12 @@
#include <iostream>
#include <vector>
#include <cstdint>
#include <limits>
#include <algorithm>
#include <Eigen/Core>

#include "navmap_core/NavMap.hpp"

using navmap::NavMap;
using navmap::NavCelId;
using navmap::Surface;
using navmap::LayerView;
using navmap::LayerType;
using Eigen::Vector3f;
using std::cout; using std::cerr; using std::endl;
Expand Down
8 changes: 1 addition & 7 deletions navmap_examples/src/02_two_floors.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -16,20 +16,14 @@

#include <iostream>
#include <vector>
#include <cstdint>
#include <limits>
#include <algorithm>
#include <Eigen/Core>

#include "navmap_core/NavMap.hpp"

using navmap::NavMap;
using navmap::NavCelId;
using navmap::Surface;
using navmap::LayerView;
using navmap::LayerType;
using Eigen::Vector3f;
using std::cout; using std::cerr; using std::endl;
using std::cout; using std::endl;

// 02_two_floors: two stacked floors, locate & closest_navcel
static void make_two_floors(NavMap & nm, float z0, float z1)
Expand Down
8 changes: 1 addition & 7 deletions navmap_examples/src/03_slope_surface.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -16,20 +16,14 @@

#include <iostream>
#include <vector>
#include <cstdint>
#include <limits>
#include <algorithm>
#include <Eigen/Core>

#include "navmap_core/NavMap.hpp"

using navmap::NavMap;
using navmap::NavCelId;
using navmap::Surface;
using navmap::LayerView;
using navmap::LayerType;
using Eigen::Vector3f;
using std::cout; using std::cerr; using std::endl;
using std::cout; using std::endl;

// 03_slope_surface: sloped z, sample_layer_at
int main()
Expand Down
8 changes: 1 addition & 7 deletions navmap_examples/src/04_layers.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -15,21 +15,15 @@


#include <iostream>
#include <vector>
#include <cstdint>
#include <limits>
#include <algorithm>
#include <Eigen/Core>

#include "navmap_core/NavMap.hpp"

using navmap::NavMap;
using navmap::NavCelId;
using navmap::Surface;
using navmap::LayerView;
using navmap::LayerType;
using Eigen::Vector3f;
using std::cout; using std::cerr; using std::endl;
using std::cout; using std::endl;

// 04_layers: add/list/set/get
int main()
Expand Down
8 changes: 1 addition & 7 deletions navmap_examples/src/05_neighbors_and_centroids.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -16,20 +16,14 @@

#include <iostream>
#include <vector>
#include <cstdint>
#include <limits>
#include <algorithm>
#include <Eigen/Core>

#include "navmap_core/NavMap.hpp"

using navmap::NavMap;
using navmap::NavCelId;
using navmap::Surface;
using navmap::LayerView;
using navmap::LayerType;
using Eigen::Vector3f;
using std::cout; using std::cerr; using std::endl;
using std::cout; using std::endl;

// 05_neighbors_and_centroids
static void make_flat_square(NavMap & nm)
Expand Down
8 changes: 1 addition & 7 deletions navmap_examples/src/06_area_marking.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -15,21 +15,15 @@


#include <iostream>
#include <vector>
#include <cstdint>
#include <limits>
#include <algorithm>
#include <Eigen/Core>

#include "navmap_core/NavMap.hpp"

using navmap::NavMap;
using navmap::NavCelId;
using navmap::Surface;
using navmap::LayerView;
using navmap::LayerType;
using Eigen::Vector3f;
using std::cout; using std::cerr; using std::endl;
using std::cout; using std::endl;

// 06_area_marking: set_area CIRCULAR y RECTANGULAR sobre una malla 1x1 de 2 tris
#include <cmath>
Expand Down
7 changes: 0 additions & 7 deletions navmap_examples/src/07_raycast.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -16,20 +16,13 @@

#include <iostream>
#include <vector>
#include <cstdint>
#include <limits>
#include <algorithm>
#include <Eigen/Core>

#include "navmap_core/NavMap.hpp"

using navmap::NavMap;
using navmap::NavCelId;
using navmap::Surface;
using navmap::LayerView;
using navmap::LayerType;
using Eigen::Vector3f;
using std::cout; using std::cerr; using std::endl;

// 07_raycast: simple y batch (raycast_many)
int main()
Expand Down
6 changes: 0 additions & 6 deletions navmap_examples/src/08_copy_and_assign.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -17,19 +17,13 @@
#include <iostream>
#include <vector>
#include <cstdint>
#include <limits>
#include <algorithm>
#include <Eigen/Core>

#include "navmap_core/NavMap.hpp"

using navmap::NavMap;
using navmap::NavCelId;
using navmap::Surface;
using navmap::LayerView;
using navmap::LayerType;
using Eigen::Vector3f;
using std::cout; using std::cerr; using std::endl;

// 08_copy_and_assign: muestra operator= optimizado (igual geometría) y completo (distinta)
static void fill_one_tri_map(navmap::NavMap & m)
Expand Down
2 changes: 0 additions & 2 deletions navmap_ros/include/navmap_ros/conversions.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,6 @@
*/

#include <string>
#include <memory>
#include <vector>
#include <Eigen/Core>
#include <pcl/point_cloud.h>
#include <pcl/point_types.h>
Expand Down
1 change: 0 additions & 1 deletion navmap_ros/include/navmap_ros/navmap_io.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@
#include <system_error>

#include "navmap_core/NavMap.hpp"
#include "navmap_ros/conversions.hpp"

#include "navmap_ros_interfaces/msg/nav_map.hpp"

Expand Down
8 changes: 2 additions & 6 deletions navmap_ros/src/navmap_ros/conversions.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -25,21 +25,17 @@
#include <numeric>

#include "geometry_msgs/msg/pose.hpp"
#include <std_msgs/msg/header.hpp>
#include "std_msgs/msg/header.hpp"
#include "sensor_msgs/msg/point_cloud2.hpp"
#include "navmap_ros_interfaces/msg/nav_map.hpp"
#include "navmap_ros_interfaces/msg/nav_map_layer.hpp"
#include "nav_msgs/msg/occupancy_grid.hpp"

#include "navmap_core/Geometry.hpp"

#include "pcl_conversions/pcl_conversions.h"
#include "pcl/point_types_conversion.h"
#include "pcl/common/point_tests.h"

#include "pcl/common/transforms.h"
#include "pcl/point_cloud.h"
#include "pcl/point_types.h"
#include "pcl/PointIndices.h"
#include "pcl/kdtree/kdtree_flann.h"

namespace navmap_ros
Expand Down
1 change: 0 additions & 1 deletion navmap_ros/tests/test_conversions.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
#include <nav_msgs/msg/occupancy_grid.hpp>

#include "navmap_ros_interfaces/msg/nav_map_layer.hpp"
#include "navmap_ros_interfaces/msg/nav_map.hpp"

#include "navmap_ros/conversions.hpp"
#include "navmap_core/NavMap.hpp"
Expand Down
5 changes: 2 additions & 3 deletions navmap_ros/tests/test_navmap_io.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
#include <rclcpp/serialized_message.hpp>

#include <filesystem>
#include <fstream>
#include <vector>
#include <string>
#include <unistd.h>
Expand Down Expand Up @@ -92,7 +91,7 @@ static void ExpectNavMapMsgEqualSemantic(
const navmap_ros_interfaces::msg::NavMap & A,
const navmap_ros_interfaces::msg::NavMap & B)
{
// Header: frame must match; stamp puede variar → lo ignoramos
// Header: frame must match; stamp may change -> we ignore it
EXPECT_EQ(A.header.frame_id, B.header.frame_id);

// Geometry
Expand Down Expand Up @@ -306,7 +305,7 @@ ASSERT_TRUE(navmap_ros::io::load_from_file(path, core_loaded, &ec)) << ec.messag
auto msg_from_core = navmap_ros::to_msg(core);
auto msg_from_core_loaded = navmap_ros::to_msg(core_loaded);

// Comparación semántica (tolerante a orden y FP)
// Semantic comparison (order and FP tolerant)
ExpectNavMapMsgEqualSemantic(msg_from_core, msg_from_core_loaded);

std::filesystem::remove(path);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,8 @@
#define NAVMAP_RVIZ_PLUGIN__NAVMAP_DISPLAY_HPP_

#include <cstdint>
#include <memory>
#include <string>
#include <unordered_map>
#include <vector>

#include <QObject>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@
#include <QObject>

#include "geometry_msgs/msg/pose_stamped.hpp"
#include "rclcpp/node.hpp"
#include "rclcpp/qos.hpp"
#include "rclcpp/rclcpp.hpp"

#include "navmap_rviz_plugin/navmap_pose_tool.hpp"
#include "rviz_default_plugins/visibility_control.hpp"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,6 @@
#include "rviz_rendering/viewport_projection_finder.hpp"
#include "rviz_default_plugins/visibility_control.hpp"

#include "navmap_rviz_plugin/NavMapDisplay.hpp"


namespace rviz_rendering
{
class Arrow;
Expand Down
21 changes: 2 additions & 19 deletions navmap_rviz_plugin/src/navmap_rviz_plugin/NavMapDisplay.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -14,39 +14,22 @@
// limitations under the License.


#include "navmap_rviz_plugin/NavMapDisplay.hpp"
#include <cmath>

#include <OgreSceneManager.h>
#include <OgreSceneNode.h>
#include <OgreManualObject.h>
#include <OgreEntity.h>
#include <OgreMesh.h>
#include <OgreMeshManager.h>
#include <OgreHardwareVertexBuffer.h>
#include <OgreHardwareBufferManager.h>
#include <OgreMaterialManager.h>
#include <OgreSubMesh.h>
#include <OgreMaterial.h>
#include <OgreTechnique.h>
#include <OgrePass.h>
#include <OgreVertexIndexData.h>
#include <OgreRoot.h>

#include <rclcpp/exceptions.hpp>
#include <rviz_common/display_context.hpp>
#include <rviz_common/frame_manager_iface.hpp>
#include <rviz_common/logging.hpp>
#include <rviz_common/uniform_string_stream.hpp>
#include <rviz_common/validate_floats.hpp>

#include "navmap_core/NavMap.hpp"
#include "navmap_ros/conversions.hpp"


#include <QCoreApplication>
#include <cmath>
#include <sstream>

#include "navmap_rviz_plugin/NavMapDisplay.hpp"
namespace
{

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
#include "geometry_msgs/msg/pose_stamped.hpp"

#include "rviz_common/display_context.hpp"
#include "rviz_common/logging.hpp"
#include "rviz_common/properties/string_property.hpp"
#include "rviz_common/properties/qos_profile_property.hpp"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,15 @@
#include "rviz_rendering/render_window.hpp"

#include "rviz_common/logging.hpp"
#include "rviz_common/display_context.hpp"
#include "rviz_common/render_panel.hpp"
#include "rviz_common/viewport_mouse_event.hpp"
#include "rviz_common/view_manager.hpp"
#include "rviz_common/view_controller.hpp"

#include "navmap_core/NavMap.hpp"
#include "navmap_rviz_plugin/NavMapDisplay.hpp"

namespace navmap_rviz_plugin
{

Expand Down
Loading