adds components, Range2PointCloud and OGMap3DViewer

git-svn-id: https://hrpsys-base.googlecode.com/svn/trunk@404 a991ac11-fb38-5095-8c12-a1ddb0715245
snozawa · Jul 22, 2012 · 78cc2a1 · 78cc2a1
1 parent cc11dc0
commit 78cc2a1
Show file tree

Hide file tree

Showing 20 changed files with 2,631 additions and 0 deletions.
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
@@ -8,6 +8,7 @@ set(input_files package.h utilities.h
  ../rtc/Joystick2PanTiltAngles/Joystick2PanTiltAngles.txt
  ../rtc/NullComponent/NullComponent.txt
  ../rtc/OccupancyGridMap3D/OccupancyGridMap3D.txt
+ ../rtc/OGMap3DViewer/OGMap3DViewer.txt
  ../rtc/RobotHardware/RobotHardware.txt
  ../rtc/SequencePlayer/SequencePlayer.txt
  ../rtc/Simulator/Simulator.txt

diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in
@@ -477,6 +477,7 @@ INPUT = @CMAKE_CURRENT_SOURCE_DIR@/package.h \
  @CMAKE_CURRENT_SOURCE_DIR@/../rtc/JpegDecoder \
  @CMAKE_CURRENT_SOURCE_DIR@/../rtc/NullComponent \
  @CMAKE_CURRENT_SOURCE_DIR@/../rtc/OccupancyGridMap3D \
+ @CMAKE_CURRENT_SOURCE_DIR@/../rtc/OGMap3DViewer \
  @CMAKE_CURRENT_SOURCE_DIR@/../rtc/RobotHardware \
  @CMAKE_CURRENT_SOURCE_DIR@/../rtc/SequencePlayer \
  @CMAKE_CURRENT_SOURCE_DIR@/../rtc/Simulator \

diff --git a/doc/package.h b/doc/package.h
@@ -30,6 +30,7 @@ To use python scripts to create RT components, connect ports and get/set propert
  <li>\ref JpegDecoder</li>
  <li>\ref NullComponent</li>
  <li>\ref OccupancyGridMap3D</li>
+ <li>\ref OGMap3DViewer</li>
  <li>\ref RobotHardware</li>
  <li>\ref SequencePlayer</li>
  <li>\ref Simulator</li>

diff --git a/rtc/CMakeLists.txt b/rtc/CMakeLists.txt
@@ -37,6 +37,7 @@ add_subdirectory(Joystick2Velocity2D)
 add_subdirectory(Joystick2PanTiltAngles)
 add_subdirectory(ForwardKinematics)
 add_subdirectory(HGcontroller)
+add_subdirectory(Range2PointCloud)
 add_subdirectory(Simulator)
 add_subdirectory(Viewer)
 add_subdirectory(JpegDecoder)
@@ -47,8 +48,10 @@ endif()
 # Octomap
 pkg_check_modules(OCTOMAP octomap)
 
+find_package(Irrlicht)
 if (IRRLICHT_FOUND)
  add_subdirectory(CollisionDetector)
+ add_subdirectory(OGMap3DViewer)
 endif()
 
 add_subdirectory(VirtualCamera)

diff --git a/rtc/OGMap3DViewer/CMakeLists.txt b/rtc/OGMap3DViewer/CMakeLists.txt
@@ -0,0 +1,15 @@
+set(comp_sources OGMap3DViewer.cpp IrrModel.cpp)
+set(libs ${OPENHRP_LIBRARIES} ${OPENGL_LIBRARIES} ${IRRLICHT_LIBRARIES} ${OpenCV_LIBRARIES} hrpsysBaseStub)
+add_library(OGMap3DViewer SHARED ${comp_sources})
+target_link_libraries(OGMap3DViewer ${libs})
+set_target_properties(OGMap3DViewer PROPERTIES PREFIX "")
+
+add_executable(OGMap3DViewerComp OGMap3DViewerComp.cpp ${comp_sources})
+target_link_libraries(OGMap3DViewerComp ${libs})
+
+set(target OGMap3DViewer OGMap3DViewerComp)
+
+install(TARGETS ${target}
+ RUNTIME DESTINATION bin CONFIGURATIONS Release Debug
+ LIBRARY DESTINATION lib CONFIGURATIONS Release Debug
+)