Skip to content

Commit 38d2387

Browse files
authoredSep 12, 2024
Merge pull request #3 from uos/develop
v2.2.6 Updates
2 parents 79665d6 + 427f134 commit 38d2387

Some content is hidden

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

53 files changed

+4988
-715
lines changed
 

‎CMakeLists.txt

+10-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
cmake_minimum_required(VERSION 3.16)
22
project(rmagine
33
LANGUAGES CXX C
4-
VERSION 2.2.5)# TODO update this version when merging into main-branch
4+
VERSION 2.2.6)# TODO update this version when merging into main-branch
55

66
option(BUILD_TOOLS "Build tools" ON)
77
option(BUILD_TESTS "Build tests" ON)
@@ -114,6 +114,9 @@ endif(OPENMP_FOUND)
114114
########################################
115115
## Optional Deps
116116

117+
# for ouster config loading
118+
find_package(jsoncpp)
119+
117120
######################################
118121
## CUDA: For Optix ##
119122
######################################
@@ -178,6 +181,11 @@ set(RMAGINE_STATIC_LIBRARIES)
178181
### RMAGINE CORE LIB
179182
add_subdirectory(src/rmagine_core)
180183

184+
### RMAGINE OUSTER LIB
185+
if(jsoncpp_FOUND)
186+
add_subdirectory(src/rmagine_ouster)
187+
endif(jsoncpp_FOUND)
188+
181189
### RMAGINE EMBREE LIB
182190
if(embree_FOUND)
183191
add_subdirectory(src/rmagine_embree)
@@ -193,7 +201,7 @@ endif(CUDA_FOUND)
193201

194202
message(STATUS "${BoldCyan}Components build:${ColourReset}")
195203
foreach(LIBRARY ${RMAGINE_LIBRARIES})
196-
message(STATUS "- ${BoldGreen}${LIBRARY}${ColourReset}")
204+
message(STATUS "- ${BoldGreen}${LIBRARY}${ColourReset}")
197205
endforeach()
198206

199207
#### TESTS

‎README.md

+4-1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ Rmagine
1515
<a href="https://github.com/uos/rmagine/issues">Issues</a>
1616
<span>&nbsp;&nbsp;&nbsp;&nbsp;</span>
1717
<a href="https://github.com/amock/rmagine_examples">Examples</a>
18+
<span>&nbsp;&nbsp;&nbsp;&nbsp;</span>
19+
<a href="https://github.com/amock/rmagine_viewer">Viewer</a>
1820
<br />
1921
</div>
2022

@@ -116,7 +118,7 @@ More detailed examples explaining each step and how to customize it to your need
116118

117119
Please reference the following papers when using the Rmagine library in your scientific work.
118120

119-
```latex
121+
```bib
120122
@inproceedings{mock2023rmagine,
121123
title={{Rmagine: 3D Range Sensor Simulation in Polygonal Maps via Ray Tracing for Embedded Hardware on Mobile Robots}},
122124
author={Mock, Alexander and Wiemann, Thomas and Hertzberg, Joachim},
@@ -127,6 +129,7 @@ Please reference the following papers when using the Rmagine library in your sci
127129
```
128130

129131
## Rmagine-accelerated Applications
132+
- [rmagine_viewer](https://github.com/amock/rmagine_viewer)
130133
- [rmagine_gazebo_plugins](https://github.com/uos/rmagine_gazebo_plugins)
131134
- [RMCL](https://github.com/uos/rmcl)
132135
- [radarays_ros](https://github.com/uos/radarays_ros)

0 commit comments

Comments
 (0)