Skip to content

Commit b3423f8

Browse files
committed
resolved merge conflict
2 parents eb81ef6 + 4a060a7 commit b3423f8

File tree

152 files changed

+2927
-3214
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

152 files changed

+2927
-3214
lines changed
File renamed without changes.

dat/micp.gif .resources/micp.gif

File renamed without changes.
File renamed without changes.

CMakeLists.txt

-711
This file was deleted.

README.md

+8-10
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11

22
<div align="center" min-width=519px>
3-
<img src="dat/rmcl_logo_landscape_small.png" alt="RMCL" height=150 />
3+
<img src=".resources/rmcl_logo_landscape_small.png" alt="RMCL" height=150 />
44
</div>
55

66

7-
<!-- ![RMCL](dat/rmcl_logo_landscape_small.png) -->
7+
<!-- ![RMCL](.resources/rmcl_logo_landscape_small.png) -->
88
<div align="center">
99
<h4 align="center">Software Tools for Mobile Robot Localization in 3D Meshes</h4>
1010
</div>
@@ -23,13 +23,12 @@
2323
</div>
2424

2525

26-
2726
## MICP-L
2827

2928
MICP-L: Mesh ICP for Robot Localization using Hardware-Accelerated Ray Casting.
3029
An approach to directly register range sensor data to a mesh in order to localize a mobile robot using hardware-accelerated ray casting correspondences (See publications).
3130

32-
[![Teaser](dat/micp.gif)](http://www.youtube.com/watch?v=G-Z5K0bPFFU)
31+
[![Teaser](.resources/micp.gif)](http://www.youtube.com/watch?v=G-Z5K0bPFFU)
3332

3433

3534
| Hilti: 6DoF Localization | MulRan: Large-scale scenes |
@@ -45,7 +44,7 @@ IMU prior is also possible as long as it is integrated as TF-Transform, e.g. wit
4544

4645
### Publication
4746

48-
MICP-L has been accepted to IROS'24! Please reference the following paper when using the MICP-L method in your scientific work.
47+
Please reference the following paper when using the MICP-L method in your scientific work.
4948

5049
```latex
5150
@inproceedings{mock2024micpl,
@@ -56,7 +55,7 @@ MICP-L has been accepted to IROS'24! Please reference the following paper when u
5655
}
5756
```
5857

59-
The [preprint](https://arxiv.org/abs/2210.13904) will be updated soon.
58+
The [preprint](https://arxiv.org/abs/2210.13904) will be updated soon. Experiments are available at https://github.com/amock/micp_experiments.
6059

6160
### Usage
6261

@@ -71,9 +70,9 @@ Starting the following Launch-File
7170
<launch>
7271

7372
<arg name="map" default="$(find uos_gazebo_worlds)/Media/models/avz_neu.dae" />
74-
<arg name="config" default="$(find rmcl)/config/examples/micp_velodyne_cpu.yaml" />
73+
<arg name="config" default="$(find rmcl_ros)/config/examples/micp_velodyne_cpu.yaml" />
7574

76-
<node pkg="rmcl" type="micp_localization" name="micp_localization" output="screen">
75+
<node pkg="rmcl_ros" type="micp_localization" name="micp_localization" output="screen">
7776
<param name="map_file" type="string" value="$(arg map)" />
7877
<rosparam command="load" file="$(arg config)" />
7978
<remap from="pose_wc" to="/initialpose" />
@@ -283,7 +282,6 @@ Dependencies:
283282
- Recommended: Install OptiX backend if NVIDIA GPU is available
284283
- For rmagine version >= 2.2.2 it is possible to put rmagine into your ROS workspace for easier compilation
285284
- ROS (tested with ROS-noetic)
286-
- Clone [rmcl_msgs](https://github.com/uos/rmcl_msgs) to your workspace
287285

288286
Clone this repository into your ROS workspace and build it.
289287

@@ -297,7 +295,7 @@ To learn how to use RMCL library in your Node: `src/nodes/examples`.
297295

298296
To navigate a robot automatically and safely through uneven terrain, the combination RMCL + Mesh Navigation Stack is very suitable: [https://github.com/naturerobots/mesh_navigation](https://github.com/naturerobots/mesh_navigation). As we presented on [ROSCon 2023](https://vimeo.com/879000775):
299297

300-
<a href="https://vimeo.com/879000775" target="_blank" ><img src="dat/ROSCon2023.png" alt="MICP-L ROSCon 2023 Video" width="300px" /></a>
298+
<a href="https://vimeo.com/879000775" target="_blank" ><img src=".resources/ROSCon2023.png" alt="MICP-L ROSCon 2023 Video" width="300px" /></a>
301299

302300
## Roadmap
303301

include/rmcl/correction/O1DnCorrectorEmbreeROS.hpp

-121
This file was deleted.

include/rmcl/correction/O1DnCorrectorOptixROS.hpp

-122
This file was deleted.

0 commit comments

Comments
 (0)