Merge pull request #1855 from Nerei:master
Roman Donchenko
11 years ago
committed by
OpenCV Buildbot
commit
24465bbd05
21 changed files with 333 additions and 400 deletions
@ -0,0 +1,21 @@ |
||||
if(NOT WITH_VTK OR ANDROID OR IOS) |
||||
return() |
||||
endif() |
||||
|
||||
find_package(VTK 6.0 QUIET COMPONENTS vtkRenderingCore vtkInteractionWidgets vtkInteractionStyle vtkIOLegacy vtkIOPLY vtkRenderingFreeType vtkRenderingLOD vtkFiltersTexture NO_MODULE) |
||||
|
||||
if(NOT DEFINED VTK_FOUND OR NOT VTK_FOUND) |
||||
find_package(VTK 5.10 QUIET COMPONENTS vtkCommon vtkFiltering vtkRendering vtkWidgets vtkImaging NO_MODULE) |
||||
endif() |
||||
|
||||
if(NOT DEFINED VTK_FOUND OR NOT VTK_FOUND) |
||||
find_package(VTK 5.8 QUIET COMPONENTS vtkCommon vtkFiltering vtkRendering vtkWidgets vtkImaging NO_MODULE) |
||||
endif() |
||||
|
||||
if(VTK_FOUND) |
||||
set(HAVE_VTK ON) |
||||
message(STATUS "Found VTK ver. ${VTK_VERSION} (usefile: ${VTK_USE_FILE})") |
||||
else() |
||||
set(HAVE_VTK OFF) |
||||
message(STATUS "VTK is not found. Please set -DVTK_DIR in CMake to VTK build directory, or set $VTK_DIR enviroment variable to VTK install subdirectory with VTKConfig.cmake file (for windows)") |
||||
endif() |
||||
@ -1,57 +1,11 @@ |
||||
macro(find_qvtk) |
||||
find_library (QVTK_LIBRARY QVTK HINTS ${VTK_DIR} ${VTK_DIR}/bin) |
||||
find_path (QVTK_INCLUDE_DIR QVTKWidget.h HINT ${VTK_INCLUDE_DIRS}) |
||||
find_package_handle_standard_args(QVTK DEFAULT_MSG QVTK_LIBRARY QVTK_INCLUDE_DIR) |
||||
|
||||
if(QVTK_FOUND) |
||||
get_filename_component (QVTK_LIBRARY_DIR ${QVTK_LIBRARY} PATH) |
||||
list(APPEND VTK_LIBRARY_DIRS ${QVTK_LIBRARY_DIR}) |
||||
list(APPEND VTK_INCLUDE_DIRS ${QVTK_INCLUDE_DIR}) |
||||
set (VTK_USE_QVTK ON) |
||||
endif() |
||||
endmacro() |
||||
|
||||
macro(find_vtk) |
||||
find_package(VTK) |
||||
if(${VTK_MAJOR_VERSION} LESS 5) |
||||
MESSAGE(FATAL_ERROR "VTK 5 or more required!") |
||||
endif() |
||||
if(VTK_FOUND) |
||||
if (BUILD_SHARED_LIBS OR (NOT BUILD_SHARED_LIBS AND NOT VTK_BUILD_SHARED_LIBS)) |
||||
find_qvtk() |
||||
message(STATUS "VTK found (include: ${VTK_INCLUDE_DIRS}, lib: ${VTK_LIBRARY_DIRS})") |
||||
link_directories(${VTK_LIBRARY_DIRS}) |
||||
include_directories(SYSTEM ${VTK_INCLUDE_DIRS}) |
||||
set(HAVE_VTK ON) |
||||
else () |
||||
set(HAVE_VTK OFF) |
||||
message (FATAL_ERROR "VTK disabled. You are to build OpenCV in STATIC but VTK is SHARED!") |
||||
endif () |
||||
endif() |
||||
endmacro() |
||||
|
||||
if (NOT OPENCV_INITIAL_PASS AND DEFINED BUILD_opencv_viz AND BUILD_opencv_viz) |
||||
find_vtk() |
||||
endif() |
||||
|
||||
if(DEFINED HAVE_VTK AND HAVE_VTK) |
||||
set(VTK_USE_FILE ${VTK_USE_FILE} CACHE INTERNAL "VTK_USE_FILE") |
||||
include (${VTK_USE_FILE}) |
||||
add_definitions(-DHAVE_VTK) |
||||
if(NOT WITH_VTK OR NOT DEFINED HAVE_VTK OR NOT HAVE_VTK) |
||||
ocv_module_disable(viz) |
||||
endif() |
||||
|
||||
include(${VTK_USE_FILE}) |
||||
set(the_description "Viz") |
||||
set(BUILD_opencv_viz_INIT OFF) |
||||
include_directories(src) |
||||
ocv_define_module(viz opencv_core) |
||||
ocv_define_module(viz opencv_core ${VTK_LIBRARIES}) |
||||
|
||||
if(DEFINED BUILD_opencv_viz AND BUILD_opencv_viz AND DEFINED HAVE_VTK AND HAVE_VTK) |
||||
if (${VTK_VERSION_MAJOR} EQUAL 5) |
||||
target_link_libraries(opencv_viz vtkCommon vtkWidgets vtkFiltering vtkRendering) |
||||
else() |
||||
target_link_libraries(opencv_viz vtkViewsCore vtkRenderingLOD vtkIOPLY vtkRenderingFreeTypeOpenGL vtkRenderingVolumeOpenGL vtkFiltersTexture) |
||||
endif() |
||||
if(APPLE) |
||||
target_link_libraries(opencv_viz "-framework Cocoa") |
||||
endif() |
||||
if(APPLE AND BUILD_opencv_viz) |
||||
target_link_libraries(opencv_viz "-framework Cocoa") |
||||
endif() |
||||
|
||||
@ -0,0 +1,54 @@ |
||||
#include "test_precomp.hpp" |
||||
|
||||
using namespace cv; |
||||
using namespace std; |
||||
|
||||
void tutorial2() |
||||
{ |
||||
/// Create a window
|
||||
viz::Viz3d myWindow("Coordinate Frame"); |
||||
|
||||
/// Add coordinate axes
|
||||
myWindow.showWidget("Coordinate Widget", viz::WCoordinateSystem()); |
||||
|
||||
/// Add line to represent (1,1,1) axis
|
||||
viz::WLine axis(Point3f(-1.0f,-1.0f,-1.0f), Point3f(1.0f,1.0f,1.0f)); |
||||
axis.setRenderingProperty(viz::LINE_WIDTH, 4.0); |
||||
myWindow.showWidget("Line Widget", axis); |
||||
|
||||
/// Construct a cube widget
|
||||
viz::WCube cube_widget(Point3f(0.5,0.5,0.0), Point3f(0.0,0.0,-0.5), true, viz::Color::blue()); |
||||
cube_widget.setRenderingProperty(viz::LINE_WIDTH, 4.0); |
||||
|
||||
/// Display widget (update if already displayed)
|
||||
myWindow.showWidget("Cube Widget", cube_widget); |
||||
|
||||
/// Rodrigues vector
|
||||
Mat rot_vec = Mat::zeros(1,3,CV_32F); |
||||
float translation_phase = 0.0, translation = 0.0; |
||||
while(!myWindow.wasStopped()) |
||||
{ |
||||
/* Rotation using rodrigues */ |
||||
/// Rotate around (1,1,1)
|
||||
rot_vec.at<float>(0,0) += CV_PI * 0.01f; |
||||
rot_vec.at<float>(0,1) += CV_PI * 0.01f; |
||||
rot_vec.at<float>(0,2) += CV_PI * 0.01f; |
||||
|
||||
/// Shift on (1,1,1)
|
||||
translation_phase += CV_PI * 0.01f; |
||||
translation = sin(translation_phase); |
||||
|
||||
/// Construct pose
|
||||
Affine3f pose(rot_vec, Vec3f(translation, translation, translation)); |
||||
|
||||
myWindow.setWidgetPose("Cube Widget", pose); |
||||
|
||||
myWindow.spinOnce(1, true); |
||||
} |
||||
} |
||||
|
||||
|
||||
TEST(Viz_viz3d, DISABLED_tutorial2_pose_of_widget) |
||||
{ |
||||
tutorial2(); |
||||
} |
||||
Loading…
Reference in new issue