Skip to content

Commit

Permalink
Fix #13
Browse files Browse the repository at this point in the history
  • Loading branch information
horverno committed Feb 27, 2023
1 parent 942d444 commit 8f68975
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 5 deletions.
16 changes: 15 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,9 @@ if(BUILD_TESTING)
ament_lint_auto_find_test_dependencies()
endif()

install (DIRECTORY launch
install (DIRECTORY
launch
stl
DESTINATION share/${PROJECT_NAME}
)

Expand All @@ -89,4 +91,16 @@ install(TARGETS cone drone egolf lexus loomo nissan rosbot stopbase stopletters
# DESTINATION include/${PROJECT_NAME}
# )



# add_custom_command(
# TARGET ${PROJECT_NAME} POST_BUILD
# COMMAND echo "FOO"
# COMMENT ""
# VERBATIM)

# add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD
# COMMAND ${CMAKE_COMMAND} -E copy_directory
# ${CMAKE_SOURCE_DIR}/stl ${CMAKE_CURRENT_BINARY_DIR}/stl)

ament_package()
14 changes: 12 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
## Overview
This is a collection of low-poly 3D markers that can enhance data visualisation using Rviz. The 3D models are designed to be lightweight without heavily compromising realisticity.

## Installation
## Installation `ROS 1`

1. Clone this repository to your catkin workspace `src`
2. Build the package
Expand All @@ -12,13 +12,23 @@ This is a collection of low-poly 3D markers that can enhance data visualisation
3. Source your workspace
`source ~/catkin_ws/devel/setup.bash`

## Installation `ROS 2`

1. Clone this repository to your colcon (`ROS2`) workspace `src` (e.g. `~/ros2_ws/src`) checkout the branch: `git checkout ros2-humble`
2. Build the package
`cd ~/ros2_ws`
`colcon build --packages-select rviz_markers`
3. Source your workspace in a **new** terminal
`source ~/ros2_ws/install/local_setup.bash && source ~/ros2_ws/install/setup.bash`

## Usage

## Simple demo

Simply run:
After `source`, simply run:
```
roslaunch rviz_markers demo1.launch
ros2 launch rviz_markers demo1.launch.py
```
This will start `rviz`, publis some TF frames and start all markers, visible in `rviz`.

Expand Down
4 changes: 2 additions & 2 deletions launch/demo1.launch.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@

def generate_launch_description():

#pkg_name = 'lexus_bringup'
#pkg_name = 'rviz_markers'
#pkg_dir = os.popen('/bin/bash -c "source /usr/share/colcon_cd/function/colcon_cd.sh && colcon_cd %s && pwd"' % pkg_name).read().strip()

#print(pkg_dir)

return LaunchDescription([
Node(
Expand Down

0 comments on commit 8f68975

Please sign in to comment.