diff --git a/Examples/LaparoscopicCamera/CMakeLists.txt b/Examples/LaparoscopicCamera/CMakeLists.txt index d99dcd40a61b8a0113321c3505e26fd69890d3f4..7ff60639a7f7e919de0a4937e8fab193aedbcb3f 100644 --- a/Examples/LaparoscopicCamera/CMakeLists.txt +++ b/Examples/LaparoscopicCamera/CMakeLists.txt @@ -1,18 +1,13 @@ -set(APP LaparoscopicCamera) +set(APP LapCameraNavigationApp) add_executable(${APP} main.cpp) target_link_libraries(${APP} Core Geometry VTKRendering - # Rendering - # RenderDelegates Simulators Mesh - Collision - ContactHandling Event - # ExamplesCommon IO Devices VirtualTools @@ -28,20 +23,17 @@ if(NOT EXISTS ${${APP}_DATA}) file(MAKE_DIRECTORY ${${APP}_DATA}) endif() -set(FILE_URL http://midas3.kitware.com/midas/download/item/318708/box.tar) -set(FILE_SHA1 928294a91477bc5d6fa494afb34016ba7f0b40c5) -set(LOCAL_FILE ${EXAMPLES_DATA}/box.tar) +set(FILE_URL http://midas3.kitware.com/midas/download/item/318829/CameraNavAppData.tar) +set(FILE_SHA1 da39a3ee5e6b4b0d3255bfef95601890afd80709) +set(LOCAL_FILE ${EXAMPLES_DATA}/CameraNavAppData.tar) + midas_download(${FILE_URL} ${FILE_SHA1} ${LOCAL_FILE}) # Extract data set(DATA - ${${APP}_DATA}/box.bou - ${${APP}_DATA}/box.config - ${${APP}_DATA}/box.interp - ${${APP}_DATA}/box.mass - ${${APP}_DATA}/box.vtk - ${${APP}_DATA}/box.veg + ${${APP}_DATA}/Target-marker.vtk + ${${APP}_DATA}/Target.vtk ) add_custom_command( diff --git a/Examples/LaparoscopicCamera/main.cpp b/Examples/LaparoscopicCamera/main.cpp index 80f89ccebc0690717e2cfbb95e946ee1d8e798a1..c53cc829ea1b21be5812024cb4b35d586322b142 100644 --- a/Examples/LaparoscopicCamera/main.cpp +++ b/Examples/LaparoscopicCamera/main.cpp @@ -55,13 +55,14 @@ bool createCameraNavigationScene( auto plane = std::make_shared<PlaneCollisionModel>( core::Vec3d(0.0, -0.01, 0.0), core::Vec3d(0.0, 1.0, 0.0)); + plane->getPlaneModel()->setWidth(5); staticObject->setModel(plane); auto planeRendDetail = std::make_shared<RenderDetail>(SIMMEDTK_RENDER_NORMALS); - planeRendDetail->setAmbientColor(Color(0.5, 0.5, 0.5, 1.0)); - planeRendDetail->setDiffuseColor(Color(0.5, 0.5, 0.5, 1.0)); + planeRendDetail->setAmbientColor(Color(0.4, 0.4, 0.4, 1.0)); + planeRendDetail->setDiffuseColor(Color(0.4, 0.4, 0.4, 1.0)); planeRendDetail->setSpecularColor(Color(0.4, 0.4, 0.4, 1.0)); planeRendDetail->setShininess(50.0); @@ -119,8 +120,8 @@ bool createCameraNavigationScene( auto targetModel = std::make_shared<MeshCollisionModel>(); targetModel->loadTriangleMesh(fileNameTarget); - targetModel->getMesh()->scale(Eigen::UniformScaling<double>(0.1));//0.2 - targetModel->getMesh()->scale(Eigen::UniformScaling<double>(0.15));//0.2 + targetModel->getMesh()->translate(Eigen::Translation3d(0, 0.02, 0.02)); + targetModel->getMesh()->scale(Eigen::UniformScaling<double>(0.15)); staticTarget->setModel(targetModel); targetModel->setRenderDetail(meshRenderDetail2); @@ -133,7 +134,6 @@ bool createCameraNavigationScene( q.normalize(); targetModel->getMesh()->rotate(q); } - return true; }