Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Migrate fps camera #281

Merged
merged 7 commits into from
Jun 14, 2018
Merged

Migrate fps camera #281

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
15afef1
Move fps view controller
Martin-Idel-SI Jun 1, 2018
386af2c
Add to plugins_description.xml
Martin-Idel-SI Jun 1, 2018
d68c81f
Make everything compile and fix linters
Martin-Idel-SI Jun 1, 2018
57f424a
Add tests
Martin-Idel-SI Jun 1, 2018
5df11c0
Fix reset function
Martin-Idel-SI Jun 1, 2018
93780e8
Minor refactoring of fps_view_controller
Martin-Idel-SI Jun 1, 2018
e920edc
Move header to include folder
Martin-Idel-SI Jun 12, 2018
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
247 changes: 0 additions & 247 deletions rviz/src/rviz/default_plugin/view_controllers/fps_view_controller.cpp
View file
Open in desktop

This file was deleted.

90 changes: 0 additions & 90 deletions rviz/src/rviz/default_plugin/view_controllers/fps_view_controller.h
View file
Open in desktop

This file was deleted.

16 changes: 15 additions & 1 deletion rviz_default_plugins/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,7 @@ set(rviz_default_plugins_source_files
src/rviz_default_plugins/tools/move/move_tool.cpp
src/rviz_default_plugins/tools/point/point_tool.cpp
src/rviz_default_plugins/tools/select/selection_tool.cpp
src/rviz_default_plugins/view_controllers/fps/fps_view_controller.cpp
src/rviz_default_plugins/view_controllers/orbit/orbit_view_controller.cpp
src/rviz_default_plugins/view_controllers/ortho/fixed_orientation_ortho_view_controller.cpp
src/rviz_default_plugins/view_controllers/xy_orbit/xy_orbit_view_controller.cpp
Expand Down Expand Up @@ -428,7 +429,20 @@ if(BUILD_TESTING)
${TEST_LINK_LIBRARIES})
endif()

if(EnableVisualTests STREQUAL "True")
ament_add_gmock(fps_view_controller_test
test/rviz_default_plugins/view_controllers/fps/fps_view_controller_test.cpp
test/rviz_default_plugins/view_controllers/view_controller_test_fixture.hpp
test/rviz_default_plugins/displays/display_test_fixture.cpp
test/rviz_default_plugins/scene_graph_introspection.cpp
APPEND_ENV AMENT_PREFIX_PATH=${CMAKE_INSTALL_PREFIX} PATH=${CMAKE_INSTALL_PREFIX}/bin;${CMAKE_INSTALL_PREFIX}/opt/rviz_assimp_vendor/bin;${CMAKE_INSTALL_PREFIX}/opt/rviz_yaml_cpp_vendor/bin;${CMAKE_INSTALL_PREFIX}/opt/rviz_ogre_vendor/bin)
if(TARGET fps_view_controller_test)
target_include_directories(fps_view_controller_test PUBLIC
${TEST_INCLUDE_DIRS})
target_link_libraries(fps_view_controller_test
${TEST_LINK_LIBRARIES})
endif()

if(EnableVisualTests STREQUAL "True")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nitpick: indentation looks wrong here. Could be fixed in a small follow up pr.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This will be done on the open PR #289

find_package(ament_index_cpp REQUIRED)

ament_add_gtest(camera_display_visual_test
Expand Down
Loading