Skip to content

Commit

Permalink
Migrate fps camera (#281)
Browse files Browse the repository at this point in the history
* Move fps view controller

* Add to plugins_description.xml

* Make everything compile and fix linters

* Add tests

* Fix reset function

* Minor refactoring of fps_view_controller

* Move header to include folder
  • Loading branch information
Martin-Idel-SI authored and wjwwood committed Jun 14, 2018
1 parent b85cc6b commit f89711b
Show file tree
Hide file tree
Showing 7 changed files with 641 additions and 338 deletions.
247 changes: 0 additions & 247 deletions rviz/src/rviz/default_plugin/view_controllers/fps_view_controller.cpp

This file was deleted.

This file was deleted.

16 changes: 15 additions & 1 deletion rviz_default_plugins/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,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 @@ -464,7 +465,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")
find_package(ament_index_cpp REQUIRED)

ament_add_gtest(camera_display_visual_test
Expand Down
Loading

0 comments on commit f89711b

Please sign in to comment.