Change file layout

3rdparty/apriltag/CMakeLists.txt

@@ -159,23 +159,3 @@ execute_process(COMMAND python3 -m site --user-site OUTPUT_VARIABLE PY_DEST)
 string(STRIP ${PY_DEST} PY_DEST)
 install(FILES ${PROJECT_BINARY_DIR}/apriltag${PY_EXT_SUFFIX} DESTINATION ${PY_DEST})
 endif (NOT Python3_NOT_FOUND AND NOT Numpy_NOT_FOUND AND PYTHONLIBS_FOUND AND BUILD_PYTHON_WRAPPER)
-
-
-# Examples
-# apriltag_demo
-# add_executable(apriltag_demo example/apriltag_demo.c)
-# target_link_libraries(apriltag_demo apriltag)
-
-# # opencv_demo
-# find_package(OpenCV 4.0)
-# if(OpenCV_FOUND)
-#     add_executable(opencv_demo example/opencv_demo.cc)
-#     target_link_libraries(opencv_demo apriltag ${OpenCV_LIBRARIES} stdc++fs)
-#     set_target_properties(opencv_demo PROPERTIES CXX_STANDARD 17)
-#     install(TARGETS opencv_demo RUNTIME DESTINATION bin)
-# else()
-#     message(WARNING "OpenCV not found: Not building demo")
-# endif(OpenCV_FOUND)
-
-# # install example programs
-# install(TARGETS apriltag_demo RUNTIME DESTINATION bin)

CMakeLists.txt

@@ -115,31 +115,31 @@ add_library(xrsfm
         src/geometry/triangulate_light.cc
         src/geometry/track_processor.cc
 
-        src/geometry/colmap/estimators/absolute_pose.cc
-        src/geometry/colmap/estimators/polynomial.cc
-        src/geometry/colmap/estimators/fundamental_matrix.cc
-        src/geometry/colmap/util/random.cc
-        src/geometry/colmap/optim/random_sampler.cc
-        src/geometry/colmap/optim/combination_sampler.cc
-        src/geometry/colmap/optim/support_measurement.cc
-
         src/optimization/ba_solver.cc
         src/mapper/incremental_mapper.cc
         src/utility/io_ecim.cc
 
-        src/ui/point_painter.cc
-        src/ui/project_widget.cc
-        src/ui/model_viewer_widget.cc
-        src/ui/resources.qrc
+        src/colmap/estimators/absolute_pose.cc
+        src/colmap/estimators/polynomial.cc
+        src/colmap/estimators/fundamental_matrix.cc
+        src/colmap/ransac/random_sampler.cc
+        src/colmap/ransac/combination_sampler.cc
+        src/colmap/ransac/support_measurement.cc
+        src/colmap/ransac/random.cc
+        src/colmap/ui/point_painter.cc
+        src/colmap/ui/project_widget.cc
+        src/colmap/ui/model_viewer_widget.cc
+        src/colmap/ui/resources.qrc
         )
 
-qt5_add_resources(RESOURCES src/ui/resources.qrc)
+
+qt5_add_resources(RESOURCES src/colmap/ui/resources.qrc)
 
 target_include_directories(xrsfm
         PUBLIC
         ${CMAKE_SOURCE_DIR}
         ${CMAKE_SOURCE_DIR}/src
-        ${CMAKE_SOURCE_DIR}/src/geometry/colmap
+        ${CMAKE_SOURCE_DIR}/src/colmap
         ${CMAKE_SOURCE_DIR}/3rdparty/SiftGPU
         ${CMAKE_SOURCE_DIR}/3rdparty/apriltag
         ${EIGEN3_INCLUDE_DIRS}
@@ -159,12 +159,12 @@ if(XRPRIMER_ENABLED)
 else ()
     target_link_libraries(xrsfm
         stdc++fs
+        sift_gpu
         ${OpenCV_LIBS}
         ${CERES_LIBRARIES}
-        sift_gpu
         ${Qt5Core_LIBRARIES}
         ${Qt5OpenGL_LIBRARIES}
-        ${Qt5Widgets_LIBRARIES} 
+        ${Qt5Widgets_LIBRARIES}
         )
 endif()
 
@@ -191,4 +191,4 @@ target_link_libraries(rec_kitti xrsfm)
 
 add_executable(test_gui src/test_gui.cc)
 target_link_libraries(test_gui xrsfm)
-target_sources(test_gui PRIVATE ${RESOURCES})
+target_sources(test_gui PRIVATE ${RESOURCES})

src/geometry/colmap/estimators/absolute_pose.h → src/colmap/estimators/absolute_pose.h

@@ -36,7 +36,7 @@
 #include <array>
 #include <vector>
 
-// #include "geometry/colmap/util/types.h"
+// #include util/types.h"
 
 namespace Eigen {
 typedef Eigen::Matrix<double, 3, 4> Matrix3x4d;

src/geometry/colmap/estimators/fundamental_matrix.h → src/colmap/estimators/fundamental_matrix.h

@@ -35,8 +35,7 @@
 #include <Eigen/Core>
 #include <vector>
 
-#include "optim/ransac.h"
-// #include "util/types.h"
+#include "ransac/ransac.h"
 
 namespace colmap {
 

src/geometry/colmap/optim/combination_sampler.cc → src/colmap/ransac/combination_sampler.cc

@@ -33,8 +33,8 @@
 
 #include <numeric>
 
-#include "geometry/colmap/util/math.h"
-#include "geometry/colmap/util/random.h"
+#include "random.h"
+#include "util/math.h"
 
 namespace colmap {
 

src/geometry/colmap/optim/random_sampler.cc → src/colmap/ransac/random_sampler.cc

@@ -33,7 +33,7 @@
 
 #include <numeric>
 
-#include "../util/random.h"
+#include "random.h"
 
 namespace colmap {