Skip to content

Commit

Permalink
[sfm/clustering] Add a scene clustering approach openMVG#857
Browse files Browse the repository at this point in the history
- Add the interface to compute the camera cluster on a OpenMVG sfm_data scene.
- fix a bug in domset.cc @rperrot
- use more c++11 feature in the code
- fix backward View id mapping in main_ComputeClusters

- removed the nanoflann dependency
  • Loading branch information
pmoulon committed Jul 6, 2017
1 parent 18ae8de commit 7d40ac6
Show file tree
Hide file tree
Showing 11 changed files with 978 additions and 2,100 deletions.
2 changes: 1 addition & 1 deletion src/software/SfM/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,6 @@ INSTALL(TARGETS openMVG_main_ExportCameraFrustums DESTINATION bin/)
SET_PROPERTY(TARGET openMVG_main_openMVG2NVM PROPERTY FOLDER OpenMVG/software)
INSTALL(TARGETS openMVG_main_openMVG2NVM DESTINATION bin/)


# -
# Use openCV Feature detector to describe the images
# -
Expand Down Expand Up @@ -386,3 +385,4 @@ SET(OPENMVG_TUTORIAL_IN_FILE "${CMAKE_CURRENT_LIST_DIR}/SfM_SequentialPipeline.p
CONFIGURE_FILE(${OPENMVG_TUTORIAL_IN_FILE}
"${CMAKE_CURRENT_BINARY_DIR}/SfM_SequentialPipeline.py" @ONLY)

add_subdirectory(clustering)
14 changes: 14 additions & 0 deletions src/software/SfM/clustering/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
add_subdirectory(domSetLibrary)

# compute clusters for a given sfm_data.bin
add_executable(openMVG_main_ComputeClusters main_ComputeClusters.cpp)
target_link_libraries(openMVG_main_ComputeClusters
openMVG_system
openMVG_image
openMVG_features
openMVG_sfm
domset)

set_property(TARGET openMVG_main_ComputeClusters PROPERTY FOLDER OpenMVG/software/clustering)
install(TARGETS openMVG_main_ComputeClusters DESTINATION bin/)

1 change: 1 addition & 0 deletions src/software/SfM/clustering/domSetLibrary/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
add_library( domset domset.cc domset.h types.h )
Loading

0 comments on commit 7d40ac6

Please sign in to comment.