diff --git a/Apps/Examples/volumeExplorer.cpp b/Apps/Examples/volumeExplorer.cpp index f46843726eafe422354b3de095ae31fc5b7310ce..62434a43438c3516893d21b945133250fbadb236 100644 --- a/Apps/Examples/volumeExplorer.cpp +++ b/Apps/Examples/volumeExplorer.cpp @@ -218,6 +218,7 @@ void MyQT::cb_initGL() registerShader(m_explode_render->shaderLines()); m_PlanePick = new Utils::Pickable(Utils::Pickable::GRID,1); + m_PlanePick->drawable()->setColor(Geom::Vec4f(1.0f,1.0f,0.0f,0.0f)); m_frame = new Utils::FrameManipulator(); m_frame->setSize(m_WidthObj/2.0f); @@ -254,6 +255,7 @@ void MyQT::cb_redraw() if (clip_volume && !hide_clipping) { m_frame->draw(); + m_PlanePick->setLineWidth(2.0f); m_PlanePick->draw(); } diff --git a/apps_cmake.txt b/apps_cmake.txt index 97660373239b1685939a18636680f2788c30adfd..c68b7ddba4112c372c8c6855cb9abe8f24c72b99 100644 --- a/apps_cmake.txt +++ b/apps_cmake.txt @@ -21,7 +21,7 @@ # qt_wrap_cpp( pipo_moc pipo.h ) # add_executable( pipo pipo.cpp ${pipo_ui} ${pipo_moc} ) # target_link_libraries( pipo ${CGoGN_LIBS} ${CGoGN_EXT_LIBS} ) -# +# qt_use_cgogn_modules(pipo) # # WARNING: to avoid problem of DLL loading, on windows executable are generated in CGoGN/bin/.... # Take care while choosing executable names @@ -75,7 +75,11 @@ IF (WIN32) ENDIF() ELSE() link_directories( ${CGoGN_ROOT_DIR}/lib/${CMAKE_BUILD_TYPE} ) - SET(EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_SOURCE_DIR}/bin/${CMAKE_BUILD_TYPE} ) + IF(APPLE) + SET(EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_SOURCE_DIR}/bin/${CMAKE_BUILD_TYPE}/Contents/MacOS/ ) + ELSE() + SET(EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_SOURCE_DIR}/bin/${CMAKE_BUILD_TYPE} ) + ENDIF() ENDIF() # Qt version from CGoGN