From c45ccdbf793076701d146c4bd111370a84c30edf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20Sch=C3=B6nberger?= Date: Sat, 22 Jul 2023 11:45:21 +0200 Subject: [PATCH 1/2] Remaining base targets move to new scene module --- CMakeLists.txt | 2 +- doc/cameras.rst | 2 +- doc/database.rst | 4 ++-- scripts/python/read_write_model.py | 24 +++++++++---------- src/colmap/CMakeLists.txt | 2 +- .../controllers/automatic_reconstruction.h | 2 +- src/colmap/controllers/bundle_adjustment.h | 2 +- src/colmap/controllers/hierarchical_mapper.cc | 4 ++-- src/colmap/controllers/hierarchical_mapper.h | 4 ++-- .../controllers/hierarchical_mapper_test.cc | 4 ++-- src/colmap/controllers/incremental_mapper.h | 2 +- .../controllers/incremental_mapper_test.cc | 4 ++-- src/colmap/estimators/bundle_adjustment.h | 4 ++-- .../estimators/bundle_adjustment_test.cc | 2 +- src/colmap/estimators/coordinate_frame.h | 2 +- src/colmap/estimators/pose.h | 2 +- src/colmap/estimators/triangulation.h | 2 +- src/colmap/estimators/two_view_geometry.cc | 2 +- src/colmap/estimators/two_view_geometry.h | 2 +- src/colmap/exe/database.cc | 2 +- src/colmap/exe/image.cc | 2 +- src/colmap/exe/model.cc | 2 +- src/colmap/exe/mvs.cc | 2 +- src/colmap/exe/sfm.cc | 2 +- src/colmap/exe/sfm.h | 2 +- src/colmap/exe/vocab_tree.cc | 2 +- src/colmap/feature/extraction.h | 2 +- src/colmap/feature/matching.h | 2 +- src/colmap/geometry/projection.h | 2 +- src/colmap/geometry/triangulation.h | 2 +- src/colmap/image/reader.h | 2 +- src/colmap/image/undistortion.h | 2 +- src/colmap/image/warp.h | 2 +- src/colmap/mvs/meshing.cc | 2 +- src/colmap/mvs/model.cc | 2 +- src/colmap/{base => scene}/CMakeLists.txt | 0 src/colmap/{base => scene}/alignment.cc | 2 +- src/colmap/{base => scene}/alignment.h | 2 +- src/colmap/{base => scene}/camera.cc | 2 +- src/colmap/{base => scene}/camera.h | 0 src/colmap/{base => scene}/camera_rig.cc | 2 +- src/colmap/{base => scene}/camera_rig.h | 4 ++-- src/colmap/{base => scene}/camera_rig_test.cc | 2 +- src/colmap/{base => scene}/camera_test.cc | 2 +- .../{base => scene}/correspondence_graph.cc | 2 +- .../{base => scene}/correspondence_graph.h | 2 +- .../correspondence_graph_test.cc | 2 +- src/colmap/{base => scene}/database.cc | 2 +- src/colmap/{base => scene}/database.h | 4 ++-- src/colmap/{base => scene}/database_cache.cc | 2 +- src/colmap/{base => scene}/database_cache.h | 8 +++---- .../{base => scene}/database_cache_test.cc | 2 +- src/colmap/{base => scene}/database_test.cc | 2 +- src/colmap/{base => scene}/image.cc | 2 +- src/colmap/{base => scene}/image.h | 6 ++--- src/colmap/{base => scene}/image_test.cc | 2 +- src/colmap/{base => scene}/point2d.h | 0 src/colmap/{base => scene}/point2d_test.cc | 2 +- src/colmap/{base => scene}/point3d.cc | 2 +- src/colmap/{base => scene}/point3d.h | 2 +- src/colmap/{base => scene}/point3d_test.cc | 2 +- src/colmap/{base => scene}/reconstruction.cc | 4 ++-- src/colmap/{base => scene}/reconstruction.h | 12 +++++----- .../{base => scene}/reconstruction_manager.cc | 2 +- .../{base => scene}/reconstruction_manager.h | 2 +- .../reconstruction_manager_test.cc | 2 +- .../{base => scene}/reconstruction_test.cc | 4 ++-- .../{base => scene}/scene_clustering.cc | 2 +- src/colmap/{base => scene}/scene_clustering.h | 2 +- .../{base => scene}/scene_clustering_test.cc | 4 ++-- src/colmap/{base => scene}/synthetic.cc | 2 +- src/colmap/{base => scene}/synthetic.h | 4 ++-- src/colmap/{base => scene}/synthetic_test.cc | 2 +- src/colmap/{base => scene}/track.cc | 2 +- src/colmap/{base => scene}/track.h | 0 src/colmap/{base => scene}/track_test.cc | 2 +- .../{base => scene}/visibility_pyramid.cc | 2 +- .../{base => scene}/visibility_pyramid.h | 0 .../visibility_pyramid_test.cc | 2 +- src/colmap/sfm/incremental_mapper.h | 6 ++--- src/colmap/sfm/incremental_triangulator.h | 4 ++-- src/colmap/tools/example.cc | 2 +- src/colmap/ui/bundle_adjustment_widget.h | 2 +- src/colmap/ui/colormaps.h | 2 +- src/colmap/ui/database_management_widget.h | 2 +- src/colmap/ui/image_viewer_widget.h | 4 ++-- src/colmap/ui/main_window.h | 2 +- src/colmap/ui/model_viewer_widget.h | 4 ++-- src/colmap/ui/movie_grabber_widget.h | 2 +- src/colmap/ui/point_viewer_widget.h | 2 +- src/colmap/ui/project_widget.cc | 2 +- src/colmap/ui/reconstruction_manager_widget.h | 2 +- src/colmap/ui/reconstruction_stats_widget.h | 2 +- src/colmap/ui/undistortion_widget.h | 2 +- 94 files changed, 127 insertions(+), 127 deletions(-) rename src/colmap/{base => scene}/CMakeLists.txt (100%) rename src/colmap/{base => scene}/alignment.cc (99%) rename src/colmap/{base => scene}/alignment.h (98%) rename src/colmap/{base => scene}/camera.cc (99%) rename src/colmap/{base => scene}/camera.h (100%) rename src/colmap/{base => scene}/camera_rig.cc (99%) rename src/colmap/{base => scene}/camera_rig.h (98%) rename src/colmap/{base => scene}/camera_rig_test.cc (99%) rename src/colmap/{base => scene}/camera_test.cc (99%) rename src/colmap/{base => scene}/correspondence_graph.cc (99%) rename src/colmap/{base => scene}/correspondence_graph.h (99%) rename src/colmap/{base => scene}/correspondence_graph_test.cc (99%) rename src/colmap/{base => scene}/database.cc (99%) rename src/colmap/{base => scene}/database.h (99%) rename src/colmap/{base => scene}/database_cache.cc (99%) rename src/colmap/{base => scene}/database_cache.h (97%) rename src/colmap/{base => scene}/database_cache_test.cc (99%) rename src/colmap/{base => scene}/database_test.cc (99%) rename src/colmap/{base => scene}/image.cc (99%) rename src/colmap/{base => scene}/image.h (98%) rename src/colmap/{base => scene}/image_test.cc (99%) rename src/colmap/{base => scene}/point2d.h (100%) rename src/colmap/{base => scene}/point2d_test.cc (98%) rename src/colmap/{base => scene}/point3d.cc (98%) rename src/colmap/{base => scene}/point3d.h (99%) rename src/colmap/{base => scene}/point3d_test.cc (99%) rename src/colmap/{base => scene}/reconstruction.cc (99%) rename src/colmap/{base => scene}/reconstruction.h (99%) rename src/colmap/{base => scene}/reconstruction_manager.cc (98%) rename src/colmap/{base => scene}/reconstruction_manager.h (98%) rename src/colmap/{base => scene}/reconstruction_manager_test.cc (98%) rename src/colmap/{base => scene}/reconstruction_test.cc (99%) rename src/colmap/{base => scene}/scene_clustering.cc (99%) rename src/colmap/{base => scene}/scene_clustering.h (99%) rename src/colmap/{base => scene}/scene_clustering_test.cc (98%) rename src/colmap/{base => scene}/synthetic.cc (99%) rename src/colmap/{base => scene}/synthetic.h (96%) rename src/colmap/{base => scene}/synthetic_test.cc (99%) rename src/colmap/{base => scene}/track.cc (98%) rename src/colmap/{base => scene}/track.h (100%) rename src/colmap/{base => scene}/track_test.cc (99%) rename src/colmap/{base => scene}/visibility_pyramid.cc (98%) rename src/colmap/{base => scene}/visibility_pyramid.h (100%) rename src/colmap/{base => scene}/visibility_pyramid_test.cc (98%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6c1182198f..58285cb421 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -427,7 +427,6 @@ COLMAP_ADD_SOURCE_DIR(src/lib/PoissonRecon LIB_POISSON_RECON_SRCS *.h *.cpp *.in COLMAP_ADD_SOURCE_DIR(src/lib/SiftGPU LIB_SIFT_GPU_SRCS *.h *.cpp *.cu) COLMAP_ADD_SOURCE_DIR(src/lib/VLFeat LIB_VLFEAT_SRCS *.h *.c *.tc) -COLMAP_ADD_SOURCE_DIR(src/colmap/base BASE_SRCS *.h *.cc) COLMAP_ADD_SOURCE_DIR(src/colmap/controllers CONTROLLERS_SRCS *.h *.cc) COLMAP_ADD_SOURCE_DIR(src/colmap/estimators ESTIMATORS_SRCS *.h *.cc) COLMAP_ADD_SOURCE_DIR(src/colmap/exe EXE_SRCS *.h *.cc) @@ -435,6 +434,7 @@ COLMAP_ADD_SOURCE_DIR(src/colmap/feature FEATURE_SRCS *.h *.cc) COLMAP_ADD_SOURCE_DIR(src/colmap/mvs MVS_SRCS *.h *.cc *.cu) COLMAP_ADD_SOURCE_DIR(src/colmap/optim OPTIM_SRCS *.h *.cc) COLMAP_ADD_SOURCE_DIR(src/colmap/retrieval RETRIEVAL_SRCS *.h *.cc) +COLMAP_ADD_SOURCE_DIR(src/colmap/scene BASE_SRCS *.h *.cc) COLMAP_ADD_SOURCE_DIR(src/colmap/sfm SFM_SRCS *.h *.cc) COLMAP_ADD_SOURCE_DIR(src/colmap/tools TOOLS_SRCS *.h *.cc) COLMAP_ADD_SOURCE_DIR(src/colmap/ui UI_SRCS *.h *.cc) diff --git a/doc/cameras.rst b/doc/cameras.rst index 686cb259b1..5bba751901 100644 --- a/doc/cameras.rst +++ b/doc/cameras.rst @@ -44,4 +44,4 @@ fix the intrinsic parameters during the reconstruction Please, refer to the camera models header file for information on the parameters of the different camera models: -https://github.com/colmap/colmap/blob/master/src/base/camera_models.h +https://github.com/colmap/colmap/blob/master/src/colmap/camera/models.h diff --git a/doc/database.rst b/doc/database.rst index 698686fcd7..834302a985 100755 --- a/doc/database.rst +++ b/doc/database.rst @@ -5,7 +5,7 @@ Database Format COLMAP stores all extracted information in a single SQLite database file. The database can be accessed with the database management toolkit in the COLMAP GUI, -the provided C++ database API (see ``src/base/database.h``), or with a scripting +the provided C++ database API (see ``src/colmap/scene/database.h``), or with a scripting language of your choice (see ``scripts/python/database.py``). The database contains the following tables: @@ -29,7 +29,7 @@ intrinsic parameters (focal length, principal point, distortion, etc.), while every image has separate extrinsic parameters (orientation and location). The intrinsic parameters of cameras are stored as contiguous binary blobs in -`float64`, ordered as specified in ``src/base/camera_models.h``. COLMAP only +`float64`, ordered as specified in ``src/colmap/camera/models.h``. COLMAP only uses cameras that are referenced by images, all other cameras are ignored. The ``name`` column in the images table is the unique relative path in the image diff --git a/scripts/python/read_write_model.py b/scripts/python/read_write_model.py index 28109a8692..2a9ba20c60 100755 --- a/scripts/python/read_write_model.py +++ b/scripts/python/read_write_model.py @@ -100,7 +100,7 @@ def write_next_bytes(fid, data, format_char_sequence, endian_character="<"): def read_cameras_text(path): """ - see: src/base/reconstruction.cc + see: src/colmap/scene/reconstruction.cc void Reconstruction::WriteCamerasText(const std::string& path) void Reconstruction::ReadCamerasText(const std::string& path) """ @@ -126,7 +126,7 @@ def read_cameras_text(path): def read_cameras_binary(path_to_model_file): """ - see: src/base/reconstruction.cc + see: src/colmap/scene/reconstruction.cc void Reconstruction::WriteCamerasBinary(const std::string& path) void Reconstruction::ReadCamerasBinary(const std::string& path) """ @@ -155,7 +155,7 @@ def read_cameras_binary(path_to_model_file): def write_cameras_text(cameras, path): """ - see: src/base/reconstruction.cc + see: src/colmap/scene/reconstruction.cc void Reconstruction::WriteCamerasText(const std::string& path) void Reconstruction::ReadCamerasText(const std::string& path) """ @@ -172,7 +172,7 @@ def write_cameras_text(cameras, path): def write_cameras_binary(cameras, path_to_model_file): """ - see: src/base/reconstruction.cc + see: src/colmap/scene/reconstruction.cc void Reconstruction::WriteCamerasBinary(const std::string& path) void Reconstruction::ReadCamerasBinary(const std::string& path) """ @@ -192,7 +192,7 @@ def write_cameras_binary(cameras, path_to_model_file): def read_images_text(path): """ - see: src/base/reconstruction.cc + see: src/colmap/scene/reconstruction.cc void Reconstruction::ReadImagesText(const std::string& path) void Reconstruction::WriteImagesText(const std::string& path) """ @@ -223,7 +223,7 @@ def read_images_text(path): def read_images_binary(path_to_model_file): """ - see: src/base/reconstruction.cc + see: src/colmap/scene/reconstruction.cc void Reconstruction::ReadImagesBinary(const std::string& path) void Reconstruction::WriteImagesBinary(const std::string& path) """ @@ -258,7 +258,7 @@ def read_images_binary(path_to_model_file): def write_images_text(images, path): """ - see: src/base/reconstruction.cc + see: src/colmap/scene/reconstruction.cc void Reconstruction::ReadImagesText(const std::string& path) void Reconstruction::WriteImagesText(const std::string& path) """ @@ -286,7 +286,7 @@ def write_images_text(images, path): def write_images_binary(images, path_to_model_file): """ - see: src/base/reconstruction.cc + see: src/colmap/scene/reconstruction.cc void Reconstruction::ReadImagesBinary(const std::string& path) void Reconstruction::WriteImagesBinary(const std::string& path) """ @@ -307,7 +307,7 @@ def write_images_binary(images, path_to_model_file): def read_points3D_text(path): """ - see: src/base/reconstruction.cc + see: src/colmap/scene/reconstruction.cc void Reconstruction::ReadPoints3DText(const std::string& path) void Reconstruction::WritePoints3DText(const std::string& path) """ @@ -334,7 +334,7 @@ def read_points3D_text(path): def read_points3D_binary(path_to_model_file): """ - see: src/base/reconstruction.cc + see: src/colmap/scene/reconstruction.cc void Reconstruction::ReadPoints3DBinary(const std::string& path) void Reconstruction::WritePoints3DBinary(const std::string& path) """ @@ -364,7 +364,7 @@ def read_points3D_binary(path_to_model_file): def write_points3D_text(points3D, path): """ - see: src/base/reconstruction.cc + see: src/colmap/scene/reconstruction.cc void Reconstruction::ReadPoints3DText(const std::string& path) void Reconstruction::WritePoints3DText(const std::string& path) """ @@ -389,7 +389,7 @@ def write_points3D_text(points3D, path): def write_points3D_binary(points3D, path_to_model_file): """ - see: src/base/reconstruction.cc + see: src/colmap/scene/reconstruction.cc void Reconstruction::ReadPoints3DBinary(const std::string& path) void Reconstruction::WritePoints3DBinary(const std::string& path) """ diff --git a/src/colmap/CMakeLists.txt b/src/colmap/CMakeLists.txt index 3cc2d957c6..779a148128 100644 --- a/src/colmap/CMakeLists.txt +++ b/src/colmap/CMakeLists.txt @@ -47,7 +47,6 @@ elseif(IS_GNU OR IS_CLANG) endif() endif() -add_subdirectory(base) add_subdirectory(camera) add_subdirectory(controllers) add_subdirectory(estimators) @@ -59,6 +58,7 @@ add_subdirectory(math) add_subdirectory(mvs) add_subdirectory(optim) add_subdirectory(retrieval) +add_subdirectory(scene) add_subdirectory(sfm) add_subdirectory(tools) add_subdirectory(util) diff --git a/src/colmap/controllers/automatic_reconstruction.h b/src/colmap/controllers/automatic_reconstruction.h index a042a07f7f..a9f35d6f53 100644 --- a/src/colmap/controllers/automatic_reconstruction.h +++ b/src/colmap/controllers/automatic_reconstruction.h @@ -31,7 +31,7 @@ #pragma once -#include "colmap/base/reconstruction_manager.h" +#include "colmap/scene/reconstruction_manager.h" #include "colmap/util/option_manager.h" #include "colmap/util/threading.h" diff --git a/src/colmap/controllers/bundle_adjustment.h b/src/colmap/controllers/bundle_adjustment.h index ca1127f5d9..e9d31f60f1 100644 --- a/src/colmap/controllers/bundle_adjustment.h +++ b/src/colmap/controllers/bundle_adjustment.h @@ -31,7 +31,7 @@ #pragma once -#include "colmap/base/reconstruction.h" +#include "colmap/scene/reconstruction.h" #include "colmap/util/option_manager.h" #include "colmap/util/threading.h" diff --git a/src/colmap/controllers/hierarchical_mapper.cc b/src/colmap/controllers/hierarchical_mapper.cc index 47d553c82d..e511e54ff9 100644 --- a/src/colmap/controllers/hierarchical_mapper.cc +++ b/src/colmap/controllers/hierarchical_mapper.cc @@ -31,8 +31,8 @@ #include "colmap/controllers/hierarchical_mapper.h" -#include "colmap/base/alignment.h" -#include "colmap/base/scene_clustering.h" +#include "colmap/scene/alignment.h" +#include "colmap/scene/scene_clustering.h" #include "colmap/util/misc.h" namespace colmap { diff --git a/src/colmap/controllers/hierarchical_mapper.h b/src/colmap/controllers/hierarchical_mapper.h index 652d08e2d2..3819f7ca14 100644 --- a/src/colmap/controllers/hierarchical_mapper.h +++ b/src/colmap/controllers/hierarchical_mapper.h @@ -31,8 +31,8 @@ #pragma once -#include "colmap/base/reconstruction_manager.h" -#include "colmap/base/scene_clustering.h" +#include "colmap/scene/reconstruction_manager.h" +#include "colmap/scene/scene_clustering.h" #include "colmap/controllers/incremental_mapper.h" #include "colmap/util/threading.h" diff --git a/src/colmap/controllers/hierarchical_mapper_test.cc b/src/colmap/controllers/hierarchical_mapper_test.cc index a359771ed7..f5ed05c2f1 100644 --- a/src/colmap/controllers/hierarchical_mapper_test.cc +++ b/src/colmap/controllers/hierarchical_mapper_test.cc @@ -31,8 +31,8 @@ #include "colmap/controllers/hierarchical_mapper.h" -#include "colmap/base/alignment.h" -#include "colmap/base/synthetic.h" +#include "colmap/scene/alignment.h" +#include "colmap/scene/synthetic.h" #include "colmap/util/testing.h" #include diff --git a/src/colmap/controllers/incremental_mapper.h b/src/colmap/controllers/incremental_mapper.h index c5d3bf9965..010377adbc 100644 --- a/src/colmap/controllers/incremental_mapper.h +++ b/src/colmap/controllers/incremental_mapper.h @@ -31,7 +31,7 @@ #pragma once -#include "colmap/base/reconstruction_manager.h" +#include "colmap/scene/reconstruction_manager.h" #include "colmap/sfm/incremental_mapper.h" #include "colmap/util/threading.h" diff --git a/src/colmap/controllers/incremental_mapper_test.cc b/src/colmap/controllers/incremental_mapper_test.cc index ca71da548c..c349e10ecc 100644 --- a/src/colmap/controllers/incremental_mapper_test.cc +++ b/src/colmap/controllers/incremental_mapper_test.cc @@ -31,8 +31,8 @@ #include "colmap/controllers/incremental_mapper.h" -#include "colmap/base/alignment.h" -#include "colmap/base/synthetic.h" +#include "colmap/scene/alignment.h" +#include "colmap/scene/synthetic.h" #include "colmap/util/testing.h" #include diff --git a/src/colmap/estimators/bundle_adjustment.h b/src/colmap/estimators/bundle_adjustment.h index 709c9b6984..5c67fc0b21 100644 --- a/src/colmap/estimators/bundle_adjustment.h +++ b/src/colmap/estimators/bundle_adjustment.h @@ -31,8 +31,8 @@ #pragma once -#include "colmap/base/camera_rig.h" -#include "colmap/base/reconstruction.h" +#include "colmap/scene/camera_rig.h" +#include "colmap/scene/reconstruction.h" #include #include diff --git a/src/colmap/estimators/bundle_adjustment_test.cc b/src/colmap/estimators/bundle_adjustment_test.cc index 7a6c6787b7..f10c9b4c49 100644 --- a/src/colmap/estimators/bundle_adjustment_test.cc +++ b/src/colmap/estimators/bundle_adjustment_test.cc @@ -31,7 +31,7 @@ #include "colmap/estimators/bundle_adjustment.h" -#include "colmap/base/correspondence_graph.h" +#include "colmap/scene/correspondence_graph.h" #include "colmap/camera/models.h" #include "colmap/geometry/projection.h" #include "colmap/math/random.h" diff --git a/src/colmap/estimators/coordinate_frame.h b/src/colmap/estimators/coordinate_frame.h index 1ebd52f008..e7c3e480f3 100644 --- a/src/colmap/estimators/coordinate_frame.h +++ b/src/colmap/estimators/coordinate_frame.h @@ -31,7 +31,7 @@ #pragma once -#include "colmap/base/reconstruction.h" +#include "colmap/scene/reconstruction.h" #include diff --git a/src/colmap/estimators/pose.h b/src/colmap/estimators/pose.h index e9dde00295..fd3bcffe05 100644 --- a/src/colmap/estimators/pose.h +++ b/src/colmap/estimators/pose.h @@ -31,7 +31,7 @@ #pragma once -#include "colmap/base/camera.h" +#include "colmap/scene/camera.h" #include "colmap/camera/models.h" #include "colmap/geometry/rigid3.h" #include "colmap/optim/loransac.h" diff --git a/src/colmap/estimators/triangulation.h b/src/colmap/estimators/triangulation.h index d7abd2f45f..61d63a6217 100644 --- a/src/colmap/estimators/triangulation.h +++ b/src/colmap/estimators/triangulation.h @@ -31,7 +31,7 @@ #pragma once -#include "colmap/base/camera.h" +#include "colmap/scene/camera.h" #include "colmap/math/math.h" #include "colmap/optim/ransac.h" #include "colmap/util/types.h" diff --git a/src/colmap/estimators/two_view_geometry.cc b/src/colmap/estimators/two_view_geometry.cc index b9ab5a1b0d..4fcba05920 100644 --- a/src/colmap/estimators/two_view_geometry.cc +++ b/src/colmap/estimators/two_view_geometry.cc @@ -31,7 +31,7 @@ #include "colmap/estimators/two_view_geometry.h" -#include "colmap/base/camera.h" +#include "colmap/scene/camera.h" #include "colmap/estimators/essential_matrix.h" #include "colmap/estimators/fundamental_matrix.h" #include "colmap/estimators/homography_matrix.h" diff --git a/src/colmap/estimators/two_view_geometry.h b/src/colmap/estimators/two_view_geometry.h index 80b1fff294..68b5ae9089 100644 --- a/src/colmap/estimators/two_view_geometry.h +++ b/src/colmap/estimators/two_view_geometry.h @@ -31,7 +31,7 @@ #pragma once -#include "colmap/base/camera.h" +#include "colmap/scene/camera.h" #include "colmap/feature/types.h" #include "colmap/geometry/rigid3.h" #include "colmap/optim/ransac.h" diff --git a/src/colmap/exe/database.cc b/src/colmap/exe/database.cc index 7c6100335d..410a69a5cb 100644 --- a/src/colmap/exe/database.cc +++ b/src/colmap/exe/database.cc @@ -31,7 +31,7 @@ #include "colmap/exe/database.h" -#include "colmap/base/database.h" +#include "colmap/scene/database.h" #include "colmap/util/misc.h" #include "colmap/util/option_manager.h" diff --git a/src/colmap/exe/image.cc b/src/colmap/exe/image.cc index 3950999d9c..8ac3af002e 100644 --- a/src/colmap/exe/image.cc +++ b/src/colmap/exe/image.cc @@ -31,7 +31,7 @@ #include "colmap/exe/image.h" -#include "colmap/base/reconstruction.h" +#include "colmap/scene/reconstruction.h" #include "colmap/controllers/incremental_mapper.h" #include "colmap/image/undistortion.h" #include "colmap/sfm/incremental_mapper.h" diff --git a/src/colmap/exe/model.cc b/src/colmap/exe/model.cc index 5a3d93b5bb..afb60a9b5a 100644 --- a/src/colmap/exe/model.cc +++ b/src/colmap/exe/model.cc @@ -31,7 +31,7 @@ #include "colmap/exe/model.h" -#include "colmap/base/alignment.h" +#include "colmap/scene/alignment.h" #include "colmap/estimators/coordinate_frame.h" #include "colmap/geometry/gps.h" #include "colmap/geometry/pose.h" diff --git a/src/colmap/exe/mvs.cc b/src/colmap/exe/mvs.cc index ebcf39321f..7748815262 100644 --- a/src/colmap/exe/mvs.cc +++ b/src/colmap/exe/mvs.cc @@ -31,7 +31,7 @@ #include "colmap/exe/mvs.h" -#include "colmap/base/reconstruction.h" +#include "colmap/scene/reconstruction.h" #include "colmap/mvs/fusion.h" #include "colmap/mvs/meshing.h" #include "colmap/mvs/patch_match.h" diff --git a/src/colmap/exe/sfm.cc b/src/colmap/exe/sfm.cc index d7ac4d6639..2479dc6313 100644 --- a/src/colmap/exe/sfm.cc +++ b/src/colmap/exe/sfm.cc @@ -31,7 +31,7 @@ #include "colmap/exe/sfm.h" -#include "colmap/base/reconstruction.h" +#include "colmap/scene/reconstruction.h" #include "colmap/controllers/automatic_reconstruction.h" #include "colmap/controllers/bundle_adjustment.h" #include "colmap/controllers/hierarchical_mapper.h" diff --git a/src/colmap/exe/sfm.h b/src/colmap/exe/sfm.h index 56329055c6..2f1d1fbf8b 100644 --- a/src/colmap/exe/sfm.h +++ b/src/colmap/exe/sfm.h @@ -31,7 +31,7 @@ #pragma once -#include "colmap/base/reconstruction.h" +#include "colmap/scene/reconstruction.h" #include "colmap/controllers/incremental_mapper.h" namespace colmap { diff --git a/src/colmap/exe/vocab_tree.cc b/src/colmap/exe/vocab_tree.cc index af9b1672e2..e67953c6b8 100644 --- a/src/colmap/exe/vocab_tree.cc +++ b/src/colmap/exe/vocab_tree.cc @@ -31,7 +31,7 @@ #include "colmap/exe/vocab_tree.h" -#include "colmap/base/database.h" +#include "colmap/scene/database.h" #include "colmap/exe/gui.h" #include "colmap/feature/matching.h" #include "colmap/feature/sift.h" diff --git a/src/colmap/feature/extraction.h b/src/colmap/feature/extraction.h index 09df675798..24e7b1545f 100644 --- a/src/colmap/feature/extraction.h +++ b/src/colmap/feature/extraction.h @@ -31,7 +31,7 @@ #pragma once -#include "colmap/base/database.h" +#include "colmap/scene/database.h" #include "colmap/feature/sift.h" #include "colmap/image/reader.h" #include "colmap/util/opengl_utils.h" diff --git a/src/colmap/feature/matching.h b/src/colmap/feature/matching.h index 81429356a1..5df7a53729 100644 --- a/src/colmap/feature/matching.h +++ b/src/colmap/feature/matching.h @@ -31,7 +31,7 @@ #pragma once -#include "colmap/base/database.h" +#include "colmap/scene/database.h" #include "colmap/feature/sift.h" #include "colmap/util/cache.h" #include "colmap/util/opengl_utils.h" diff --git a/src/colmap/geometry/projection.h b/src/colmap/geometry/projection.h index 406cd2614d..bdd0707ece 100644 --- a/src/colmap/geometry/projection.h +++ b/src/colmap/geometry/projection.h @@ -31,7 +31,7 @@ #pragma once -#include "colmap/base/camera.h" +#include "colmap/scene/camera.h" #include "colmap/geometry/rigid3.h" #include diff --git a/src/colmap/geometry/triangulation.h b/src/colmap/geometry/triangulation.h index 2288dc5a60..1792c00c6c 100644 --- a/src/colmap/geometry/triangulation.h +++ b/src/colmap/geometry/triangulation.h @@ -31,7 +31,7 @@ #pragma once -#include "colmap/base/camera.h" +#include "colmap/scene/camera.h" #include "colmap/math/math.h" #include "colmap/util/types.h" diff --git a/src/colmap/image/reader.h b/src/colmap/image/reader.h index 6291815c88..d719d36f8b 100644 --- a/src/colmap/image/reader.h +++ b/src/colmap/image/reader.h @@ -31,7 +31,7 @@ #pragma once -#include "colmap/base/database.h" +#include "colmap/scene/database.h" #include "colmap/image/bitmap.h" #include "colmap/util/threading.h" diff --git a/src/colmap/image/undistortion.h b/src/colmap/image/undistortion.h index 9a4613ff5e..57c6267055 100644 --- a/src/colmap/image/undistortion.h +++ b/src/colmap/image/undistortion.h @@ -31,7 +31,7 @@ #pragma once -#include "colmap/base/reconstruction.h" +#include "colmap/scene/reconstruction.h" #include "colmap/geometry/rigid3.h" #include "colmap/image/bitmap.h" #include "colmap/util/misc.h" diff --git a/src/colmap/image/warp.h b/src/colmap/image/warp.h index 0b65ed4b20..331aef0ab4 100644 --- a/src/colmap/image/warp.h +++ b/src/colmap/image/warp.h @@ -31,7 +31,7 @@ #pragma once -#include "colmap/base/camera.h" +#include "colmap/scene/camera.h" #include "colmap/image/bitmap.h" namespace colmap { diff --git a/src/colmap/mvs/meshing.cc b/src/colmap/mvs/meshing.cc index baca950953..c29042ff24 100644 --- a/src/colmap/mvs/meshing.cc +++ b/src/colmap/mvs/meshing.cc @@ -40,7 +40,7 @@ #include #endif // CGAL_ENABLED -#include "colmap/base/reconstruction.h" +#include "colmap/scene/reconstruction.h" #include "colmap/math/graph_cut.h" #include "colmap/math/random.h" #include "colmap/util/endian.h" diff --git a/src/colmap/mvs/model.cc b/src/colmap/mvs/model.cc index a2eb5160df..2b0d91948a 100644 --- a/src/colmap/mvs/model.cc +++ b/src/colmap/mvs/model.cc @@ -31,7 +31,7 @@ #include "colmap/mvs/model.h" -#include "colmap/base/reconstruction.h" +#include "colmap/scene/reconstruction.h" #include "colmap/camera/models.h" #include "colmap/geometry/pose.h" #include "colmap/geometry/projection.h" diff --git a/src/colmap/base/CMakeLists.txt b/src/colmap/scene/CMakeLists.txt similarity index 100% rename from src/colmap/base/CMakeLists.txt rename to src/colmap/scene/CMakeLists.txt diff --git a/src/colmap/base/alignment.cc b/src/colmap/scene/alignment.cc similarity index 99% rename from src/colmap/base/alignment.cc rename to src/colmap/scene/alignment.cc index 61682dd620..dfa0014fa8 100644 --- a/src/colmap/base/alignment.cc +++ b/src/colmap/scene/alignment.cc @@ -29,7 +29,7 @@ // // Author: Johannes L. Schoenberger (jsch-at-demuc-dot-de) -#include "colmap/base/alignment.h" +#include "colmap/scene/alignment.h" #include "colmap/estimators/similarity_transform.h" #include "colmap/geometry/pose.h" diff --git a/src/colmap/base/alignment.h b/src/colmap/scene/alignment.h similarity index 98% rename from src/colmap/base/alignment.h rename to src/colmap/scene/alignment.h index 6ecb139ed0..10c9f41aef 100644 --- a/src/colmap/base/alignment.h +++ b/src/colmap/scene/alignment.h @@ -31,7 +31,7 @@ #pragma once -#include "colmap/base/reconstruction.h" +#include "colmap/scene/reconstruction.h" #include "colmap/geometry/sim3.h" namespace colmap { diff --git a/src/colmap/base/camera.cc b/src/colmap/scene/camera.cc similarity index 99% rename from src/colmap/base/camera.cc rename to src/colmap/scene/camera.cc index 83e43f80dd..539abf2d14 100644 --- a/src/colmap/base/camera.cc +++ b/src/colmap/scene/camera.cc @@ -29,7 +29,7 @@ // // Author: Johannes L. Schoenberger (jsch-at-demuc-dot-de) -#include "colmap/base/camera.h" +#include "colmap/scene/camera.h" #include "colmap/camera/models.h" #include "colmap/util/logging.h" diff --git a/src/colmap/base/camera.h b/src/colmap/scene/camera.h similarity index 100% rename from src/colmap/base/camera.h rename to src/colmap/scene/camera.h diff --git a/src/colmap/base/camera_rig.cc b/src/colmap/scene/camera_rig.cc similarity index 99% rename from src/colmap/base/camera_rig.cc rename to src/colmap/scene/camera_rig.cc index 8cdc9aa59c..91f2363aa0 100644 --- a/src/colmap/base/camera_rig.cc +++ b/src/colmap/scene/camera_rig.cc @@ -29,7 +29,7 @@ // // Author: Johannes L. Schoenberger (jsch-at-demuc-dot-de) -#include "colmap/base/camera_rig.h" +#include "colmap/scene/camera_rig.h" #include "colmap/util/misc.h" diff --git a/src/colmap/base/camera_rig.h b/src/colmap/scene/camera_rig.h similarity index 98% rename from src/colmap/base/camera_rig.h rename to src/colmap/scene/camera_rig.h index 7150c9515a..ab02ba53b8 100644 --- a/src/colmap/base/camera_rig.h +++ b/src/colmap/scene/camera_rig.h @@ -31,8 +31,8 @@ #pragma once -#include "colmap/base/camera.h" -#include "colmap/base/reconstruction.h" +#include "colmap/scene/camera.h" +#include "colmap/scene/reconstruction.h" #include "colmap/geometry/pose.h" #include "colmap/util/types.h" diff --git a/src/colmap/base/camera_rig_test.cc b/src/colmap/scene/camera_rig_test.cc similarity index 99% rename from src/colmap/base/camera_rig_test.cc rename to src/colmap/scene/camera_rig_test.cc index 4dde688b04..57301db3c2 100644 --- a/src/colmap/base/camera_rig_test.cc +++ b/src/colmap/scene/camera_rig_test.cc @@ -29,7 +29,7 @@ // // Author: Johannes L. Schoenberger (jsch-at-demuc-dot-de) -#include "colmap/base/camera_rig.h" +#include "colmap/scene/camera_rig.h" #include diff --git a/src/colmap/base/camera_test.cc b/src/colmap/scene/camera_test.cc similarity index 99% rename from src/colmap/base/camera_test.cc rename to src/colmap/scene/camera_test.cc index a8a77d997a..d88ee56cbd 100644 --- a/src/colmap/base/camera_test.cc +++ b/src/colmap/scene/camera_test.cc @@ -29,7 +29,7 @@ // // Author: Johannes L. Schoenberger (jsch-at-demuc-dot-de) -#include "colmap/base/camera.h" +#include "colmap/scene/camera.h" #include "colmap/camera/models.h" diff --git a/src/colmap/base/correspondence_graph.cc b/src/colmap/scene/correspondence_graph.cc similarity index 99% rename from src/colmap/base/correspondence_graph.cc rename to src/colmap/scene/correspondence_graph.cc index 098fefd10b..dfb6aad61c 100644 --- a/src/colmap/base/correspondence_graph.cc +++ b/src/colmap/scene/correspondence_graph.cc @@ -29,7 +29,7 @@ // // Author: Johannes L. Schoenberger (jsch-at-demuc-dot-de) -#include "colmap/base/correspondence_graph.h" +#include "colmap/scene/correspondence_graph.h" #include "colmap/geometry/pose.h" #include "colmap/util/string.h" diff --git a/src/colmap/base/correspondence_graph.h b/src/colmap/scene/correspondence_graph.h similarity index 99% rename from src/colmap/base/correspondence_graph.h rename to src/colmap/scene/correspondence_graph.h index 2ea6adfcc8..d598b08d6e 100644 --- a/src/colmap/base/correspondence_graph.h +++ b/src/colmap/scene/correspondence_graph.h @@ -31,7 +31,7 @@ #pragma once -#include "colmap/base/database.h" +#include "colmap/scene/database.h" #include "colmap/util/types.h" #include diff --git a/src/colmap/base/correspondence_graph_test.cc b/src/colmap/scene/correspondence_graph_test.cc similarity index 99% rename from src/colmap/base/correspondence_graph_test.cc rename to src/colmap/scene/correspondence_graph_test.cc index 86136cebdd..99d018d773 100644 --- a/src/colmap/base/correspondence_graph_test.cc +++ b/src/colmap/scene/correspondence_graph_test.cc @@ -29,7 +29,7 @@ // // Author: Johannes L. Schoenberger (jsch-at-demuc-dot-de) -#include "colmap/base/correspondence_graph.h" +#include "colmap/scene/correspondence_graph.h" #include diff --git a/src/colmap/base/database.cc b/src/colmap/scene/database.cc similarity index 99% rename from src/colmap/base/database.cc rename to src/colmap/scene/database.cc index 7afa26e244..3ecc02bc58 100644 --- a/src/colmap/base/database.cc +++ b/src/colmap/scene/database.cc @@ -29,7 +29,7 @@ // // Author: Johannes L. Schoenberger (jsch-at-demuc-dot-de) -#include "colmap/base/database.h" +#include "colmap/scene/database.h" #include "colmap/util/sqlite3_utils.h" #include "colmap/util/string.h" diff --git a/src/colmap/base/database.h b/src/colmap/scene/database.h similarity index 99% rename from src/colmap/base/database.h rename to src/colmap/scene/database.h index b9c89dfb49..1502ecc773 100644 --- a/src/colmap/base/database.h +++ b/src/colmap/scene/database.h @@ -31,8 +31,8 @@ #pragma once -#include "colmap/base/camera.h" -#include "colmap/base/image.h" +#include "colmap/scene/camera.h" +#include "colmap/scene/image.h" #include "colmap/estimators/two_view_geometry.h" #include "colmap/feature/types.h" #include "colmap/util/types.h" diff --git a/src/colmap/base/database_cache.cc b/src/colmap/scene/database_cache.cc similarity index 99% rename from src/colmap/base/database_cache.cc rename to src/colmap/scene/database_cache.cc index b711de7b0d..91c639f24f 100644 --- a/src/colmap/base/database_cache.cc +++ b/src/colmap/scene/database_cache.cc @@ -29,7 +29,7 @@ // // Author: Johannes L. Schoenberger (jsch-at-demuc-dot-de) -#include "colmap/base/database_cache.h" +#include "colmap/scene/database_cache.h" #include "colmap/feature/utils.h" #include "colmap/util/string.h" diff --git a/src/colmap/base/database_cache.h b/src/colmap/scene/database_cache.h similarity index 97% rename from src/colmap/base/database_cache.h rename to src/colmap/scene/database_cache.h index cabda03e63..175493cc25 100644 --- a/src/colmap/base/database_cache.h +++ b/src/colmap/scene/database_cache.h @@ -31,10 +31,10 @@ #pragma once -#include "colmap/base/camera.h" -#include "colmap/base/correspondence_graph.h" -#include "colmap/base/database.h" -#include "colmap/base/image.h" +#include "colmap/scene/camera.h" +#include "colmap/scene/correspondence_graph.h" +#include "colmap/scene/database.h" +#include "colmap/scene/image.h" #include "colmap/camera/models.h" #include "colmap/util/types.h" diff --git a/src/colmap/base/database_cache_test.cc b/src/colmap/scene/database_cache_test.cc similarity index 99% rename from src/colmap/base/database_cache_test.cc rename to src/colmap/scene/database_cache_test.cc index 6b9e7f4a6e..6b174733d4 100644 --- a/src/colmap/base/database_cache_test.cc +++ b/src/colmap/scene/database_cache_test.cc @@ -29,7 +29,7 @@ // // Author: Johannes L. Schoenberger (jsch-at-demuc-dot-de) -#include "colmap/base/database_cache.h" +#include "colmap/scene/database_cache.h" #include diff --git a/src/colmap/base/database_test.cc b/src/colmap/scene/database_test.cc similarity index 99% rename from src/colmap/base/database_test.cc rename to src/colmap/scene/database_test.cc index 20a88171e3..c5a2358785 100644 --- a/src/colmap/base/database_test.cc +++ b/src/colmap/scene/database_test.cc @@ -29,7 +29,7 @@ // // Author: Johannes L. Schoenberger (jsch-at-demuc-dot-de) -#include "colmap/base/database.h" +#include "colmap/scene/database.h" #include "colmap/geometry/pose.h" diff --git a/src/colmap/base/image.cc b/src/colmap/scene/image.cc similarity index 99% rename from src/colmap/base/image.cc rename to src/colmap/scene/image.cc index 4c42453b3b..0a40096b34 100644 --- a/src/colmap/base/image.cc +++ b/src/colmap/scene/image.cc @@ -29,7 +29,7 @@ // // Author: Johannes L. Schoenberger (jsch-at-demuc-dot-de) -#include "colmap/base/image.h" +#include "colmap/scene/image.h" #include "colmap/geometry/pose.h" #include "colmap/geometry/projection.h" diff --git a/src/colmap/base/image.h b/src/colmap/scene/image.h similarity index 98% rename from src/colmap/base/image.h rename to src/colmap/scene/image.h index 42b9d45b53..69cbf1e57a 100644 --- a/src/colmap/base/image.h +++ b/src/colmap/scene/image.h @@ -31,9 +31,9 @@ #pragma once -#include "colmap/base/camera.h" -#include "colmap/base/point2d.h" -#include "colmap/base/visibility_pyramid.h" +#include "colmap/scene/camera.h" +#include "colmap/scene/point2d.h" +#include "colmap/scene/visibility_pyramid.h" #include "colmap/geometry/rigid3.h" #include "colmap/math/math.h" #include "colmap/util/logging.h" diff --git a/src/colmap/base/image_test.cc b/src/colmap/scene/image_test.cc similarity index 99% rename from src/colmap/base/image_test.cc rename to src/colmap/scene/image_test.cc index 57fcb4da2f..a64874dede 100644 --- a/src/colmap/base/image_test.cc +++ b/src/colmap/scene/image_test.cc @@ -29,7 +29,7 @@ // // Author: Johannes L. Schoenberger (jsch-at-demuc-dot-de) -#include "colmap/base/image.h" +#include "colmap/scene/image.h" #include diff --git a/src/colmap/base/point2d.h b/src/colmap/scene/point2d.h similarity index 100% rename from src/colmap/base/point2d.h rename to src/colmap/scene/point2d.h diff --git a/src/colmap/base/point2d_test.cc b/src/colmap/scene/point2d_test.cc similarity index 98% rename from src/colmap/base/point2d_test.cc rename to src/colmap/scene/point2d_test.cc index 0ad34a92e6..c7289d3f67 100644 --- a/src/colmap/base/point2d_test.cc +++ b/src/colmap/scene/point2d_test.cc @@ -29,7 +29,7 @@ // // Author: Johannes L. Schoenberger (jsch-at-demuc-dot-de) -#include "colmap/base/point2d.h" +#include "colmap/scene/point2d.h" #include diff --git a/src/colmap/base/point3d.cc b/src/colmap/scene/point3d.cc similarity index 98% rename from src/colmap/base/point3d.cc rename to src/colmap/scene/point3d.cc index 3d9a92e9f9..c40d3e03e0 100644 --- a/src/colmap/base/point3d.cc +++ b/src/colmap/scene/point3d.cc @@ -29,7 +29,7 @@ // // Author: Johannes L. Schoenberger (jsch-at-demuc-dot-de) -#include "colmap/base/point3d.h" +#include "colmap/scene/point3d.h" namespace colmap { diff --git a/src/colmap/base/point3d.h b/src/colmap/scene/point3d.h similarity index 99% rename from src/colmap/base/point3d.h rename to src/colmap/scene/point3d.h index db00d6cd51..be56592c4b 100644 --- a/src/colmap/base/point3d.h +++ b/src/colmap/scene/point3d.h @@ -31,7 +31,7 @@ #pragma once -#include "colmap/base/track.h" +#include "colmap/scene/track.h" #include "colmap/util/logging.h" #include "colmap/util/types.h" diff --git a/src/colmap/base/point3d_test.cc b/src/colmap/scene/point3d_test.cc similarity index 99% rename from src/colmap/base/point3d_test.cc rename to src/colmap/scene/point3d_test.cc index 53c8a58b0d..24ffbd80c5 100644 --- a/src/colmap/base/point3d_test.cc +++ b/src/colmap/scene/point3d_test.cc @@ -29,7 +29,7 @@ // // Author: Johannes L. Schoenberger (jsch-at-demuc-dot-de) -#include "colmap/base/point3d.h" +#include "colmap/scene/point3d.h" #include diff --git a/src/colmap/base/reconstruction.cc b/src/colmap/scene/reconstruction.cc similarity index 99% rename from src/colmap/base/reconstruction.cc rename to src/colmap/scene/reconstruction.cc index 8374ea5b33..d3d03f90f1 100644 --- a/src/colmap/base/reconstruction.cc +++ b/src/colmap/scene/reconstruction.cc @@ -29,9 +29,9 @@ // // Author: Johannes L. Schoenberger (jsch-at-demuc-dot-de) -#include "colmap/base/reconstruction.h" +#include "colmap/scene/reconstruction.h" -#include "colmap/base/database_cache.h" +#include "colmap/scene/database_cache.h" #include "colmap/estimators/similarity_transform.h" #include "colmap/geometry/gps.h" #include "colmap/geometry/pose.h" diff --git a/src/colmap/base/reconstruction.h b/src/colmap/scene/reconstruction.h similarity index 99% rename from src/colmap/base/reconstruction.h rename to src/colmap/scene/reconstruction.h index 05bc3e82d2..86d7e24378 100644 --- a/src/colmap/base/reconstruction.h +++ b/src/colmap/scene/reconstruction.h @@ -31,12 +31,12 @@ #pragma once -#include "colmap/base/camera.h" -#include "colmap/base/database.h" -#include "colmap/base/image.h" -#include "colmap/base/point2d.h" -#include "colmap/base/point3d.h" -#include "colmap/base/track.h" +#include "colmap/scene/camera.h" +#include "colmap/scene/database.h" +#include "colmap/scene/image.h" +#include "colmap/scene/point2d.h" +#include "colmap/scene/point3d.h" +#include "colmap/scene/track.h" #include "colmap/geometry/sim3.h" #include "colmap/util/types.h" diff --git a/src/colmap/base/reconstruction_manager.cc b/src/colmap/scene/reconstruction_manager.cc similarity index 98% rename from src/colmap/base/reconstruction_manager.cc rename to src/colmap/scene/reconstruction_manager.cc index a2ba2be953..2d45e27902 100644 --- a/src/colmap/base/reconstruction_manager.cc +++ b/src/colmap/scene/reconstruction_manager.cc @@ -29,7 +29,7 @@ // // Author: Johannes L. Schoenberger (jsch-at-demuc-dot-de) -#include "colmap/base/reconstruction_manager.h" +#include "colmap/scene/reconstruction_manager.h" #include "colmap/util/misc.h" #include "colmap/util/option_manager.h" diff --git a/src/colmap/base/reconstruction_manager.h b/src/colmap/scene/reconstruction_manager.h similarity index 98% rename from src/colmap/base/reconstruction_manager.h rename to src/colmap/scene/reconstruction_manager.h index 223084e813..f5b9fee1e5 100644 --- a/src/colmap/base/reconstruction_manager.h +++ b/src/colmap/scene/reconstruction_manager.h @@ -31,7 +31,7 @@ #pragma once -#include "colmap/base/reconstruction.h" +#include "colmap/scene/reconstruction.h" #include diff --git a/src/colmap/base/reconstruction_manager_test.cc b/src/colmap/scene/reconstruction_manager_test.cc similarity index 98% rename from src/colmap/base/reconstruction_manager_test.cc rename to src/colmap/scene/reconstruction_manager_test.cc index 3dadbd9165..12a84b6402 100644 --- a/src/colmap/base/reconstruction_manager_test.cc +++ b/src/colmap/scene/reconstruction_manager_test.cc @@ -29,7 +29,7 @@ // // Author: Johannes L. Schoenberger (jsch-at-demuc-dot-de) -#include "colmap/base/reconstruction_manager.h" +#include "colmap/scene/reconstruction_manager.h" #include #include diff --git a/src/colmap/base/reconstruction_test.cc b/src/colmap/scene/reconstruction_test.cc similarity index 99% rename from src/colmap/base/reconstruction_test.cc rename to src/colmap/scene/reconstruction_test.cc index 0da5f39929..6807a1a52c 100644 --- a/src/colmap/base/reconstruction_test.cc +++ b/src/colmap/scene/reconstruction_test.cc @@ -29,9 +29,9 @@ // // Author: Johannes L. Schoenberger (jsch-at-demuc-dot-de) -#include "colmap/base/reconstruction.h" +#include "colmap/scene/reconstruction.h" -#include "colmap/base/correspondence_graph.h" +#include "colmap/scene/correspondence_graph.h" #include "colmap/camera/models.h" #include "colmap/geometry/pose.h" #include "colmap/geometry/sim3.h" diff --git a/src/colmap/base/scene_clustering.cc b/src/colmap/scene/scene_clustering.cc similarity index 99% rename from src/colmap/base/scene_clustering.cc rename to src/colmap/scene/scene_clustering.cc index 160b72fc90..82f1c9fc0c 100644 --- a/src/colmap/base/scene_clustering.cc +++ b/src/colmap/scene/scene_clustering.cc @@ -29,7 +29,7 @@ // // Author: Johannes L. Schoenberger (jsch-at-demuc-dot-de) -#include "colmap/base/scene_clustering.h" +#include "colmap/scene/scene_clustering.h" #include "colmap/math/graph_cut.h" #include "colmap/math/random.h" diff --git a/src/colmap/base/scene_clustering.h b/src/colmap/scene/scene_clustering.h similarity index 99% rename from src/colmap/base/scene_clustering.h rename to src/colmap/scene/scene_clustering.h index 250b88d6e2..2a2035b5f5 100644 --- a/src/colmap/base/scene_clustering.h +++ b/src/colmap/scene/scene_clustering.h @@ -31,7 +31,7 @@ #pragma once -#include "colmap/base/database.h" +#include "colmap/scene/database.h" #include "colmap/util/types.h" #include diff --git a/src/colmap/base/scene_clustering_test.cc b/src/colmap/scene/scene_clustering_test.cc similarity index 98% rename from src/colmap/base/scene_clustering_test.cc rename to src/colmap/scene/scene_clustering_test.cc index a3e906ba47..6490961503 100644 --- a/src/colmap/base/scene_clustering_test.cc +++ b/src/colmap/scene/scene_clustering_test.cc @@ -29,9 +29,9 @@ // // Author: Johannes L. Schoenberger (jsch-at-demuc-dot-de) -#include "colmap/base/scene_clustering.h" +#include "colmap/scene/scene_clustering.h" -#include "colmap/base/database.h" +#include "colmap/scene/database.h" #include diff --git a/src/colmap/base/synthetic.cc b/src/colmap/scene/synthetic.cc similarity index 99% rename from src/colmap/base/synthetic.cc rename to src/colmap/scene/synthetic.cc index fd2a195c58..f097a0cefc 100644 --- a/src/colmap/base/synthetic.cc +++ b/src/colmap/scene/synthetic.cc @@ -29,7 +29,7 @@ // // Author: Johannes L. Schoenberger (jsch-at-demuc-dot-de) -#include "colmap/base/synthetic.h" +#include "colmap/scene/synthetic.h" #include "colmap/geometry/essential_matrix.h" #include "colmap/geometry/pose.h" diff --git a/src/colmap/base/synthetic.h b/src/colmap/scene/synthetic.h similarity index 96% rename from src/colmap/base/synthetic.h rename to src/colmap/scene/synthetic.h index a4e1a18c98..2de458e06e 100644 --- a/src/colmap/base/synthetic.h +++ b/src/colmap/scene/synthetic.h @@ -31,8 +31,8 @@ #pragma once -#include "colmap/base/database.h" -#include "colmap/base/reconstruction.h" +#include "colmap/scene/database.h" +#include "colmap/scene/reconstruction.h" #include "colmap/camera/models.h" #include "colmap/util/types.h" diff --git a/src/colmap/base/synthetic_test.cc b/src/colmap/scene/synthetic_test.cc similarity index 99% rename from src/colmap/base/synthetic_test.cc rename to src/colmap/scene/synthetic_test.cc index c984b9a9f9..f1f72f3a4f 100644 --- a/src/colmap/base/synthetic_test.cc +++ b/src/colmap/scene/synthetic_test.cc @@ -29,7 +29,7 @@ // // Author: Johannes L. Schoenberger (jsch-at-demuc-dot-de) -#include "colmap/base/synthetic.h" +#include "colmap/scene/synthetic.h" #include "colmap/util/testing.h" diff --git a/src/colmap/base/track.cc b/src/colmap/scene/track.cc similarity index 98% rename from src/colmap/base/track.cc rename to src/colmap/scene/track.cc index b7b4e30698..42477004b3 100644 --- a/src/colmap/base/track.cc +++ b/src/colmap/scene/track.cc @@ -29,7 +29,7 @@ // // Author: Johannes L. Schoenberger (jsch-at-demuc-dot-de) -#include "colmap/base/track.h" +#include "colmap/scene/track.h" namespace colmap { diff --git a/src/colmap/base/track.h b/src/colmap/scene/track.h similarity index 100% rename from src/colmap/base/track.h rename to src/colmap/scene/track.h diff --git a/src/colmap/base/track_test.cc b/src/colmap/scene/track_test.cc similarity index 99% rename from src/colmap/base/track_test.cc rename to src/colmap/scene/track_test.cc index b9b57cfd1e..93ea440d22 100644 --- a/src/colmap/base/track_test.cc +++ b/src/colmap/scene/track_test.cc @@ -29,7 +29,7 @@ // // Author: Johannes L. Schoenberger (jsch-at-demuc-dot-de) -#include "colmap/base/track.h" +#include "colmap/scene/track.h" #include diff --git a/src/colmap/base/visibility_pyramid.cc b/src/colmap/scene/visibility_pyramid.cc similarity index 98% rename from src/colmap/base/visibility_pyramid.cc rename to src/colmap/scene/visibility_pyramid.cc index d7832995b0..d18221bab3 100644 --- a/src/colmap/base/visibility_pyramid.cc +++ b/src/colmap/scene/visibility_pyramid.cc @@ -29,7 +29,7 @@ // // Author: Johannes L. Schoenberger (jsch-at-demuc-dot-de) -#include "colmap/base/visibility_pyramid.h" +#include "colmap/scene/visibility_pyramid.h" #include "colmap/math/math.h" #include "colmap/util/logging.h" diff --git a/src/colmap/base/visibility_pyramid.h b/src/colmap/scene/visibility_pyramid.h similarity index 100% rename from src/colmap/base/visibility_pyramid.h rename to src/colmap/scene/visibility_pyramid.h diff --git a/src/colmap/base/visibility_pyramid_test.cc b/src/colmap/scene/visibility_pyramid_test.cc similarity index 98% rename from src/colmap/base/visibility_pyramid_test.cc rename to src/colmap/scene/visibility_pyramid_test.cc index 0550d791c1..4a23f6825e 100644 --- a/src/colmap/base/visibility_pyramid_test.cc +++ b/src/colmap/scene/visibility_pyramid_test.cc @@ -29,7 +29,7 @@ // // Author: Johannes L. Schoenberger (jsch-at-demuc-dot-de) -#include "colmap/base/visibility_pyramid.h" +#include "colmap/scene/visibility_pyramid.h" #include diff --git a/src/colmap/sfm/incremental_mapper.h b/src/colmap/sfm/incremental_mapper.h index e14cccc6bc..40df7ba48a 100644 --- a/src/colmap/sfm/incremental_mapper.h +++ b/src/colmap/sfm/incremental_mapper.h @@ -31,9 +31,9 @@ #pragma once -#include "colmap/base/database.h" -#include "colmap/base/database_cache.h" -#include "colmap/base/reconstruction.h" +#include "colmap/scene/database.h" +#include "colmap/scene/database_cache.h" +#include "colmap/scene/reconstruction.h" #include "colmap/estimators/bundle_adjustment.h" #include "colmap/sfm/incremental_triangulator.h" diff --git a/src/colmap/sfm/incremental_triangulator.h b/src/colmap/sfm/incremental_triangulator.h index 367ce7f973..41de8e810c 100644 --- a/src/colmap/sfm/incremental_triangulator.h +++ b/src/colmap/sfm/incremental_triangulator.h @@ -31,8 +31,8 @@ #pragma once -#include "colmap/base/database_cache.h" -#include "colmap/base/reconstruction.h" +#include "colmap/scene/database_cache.h" +#include "colmap/scene/reconstruction.h" #include diff --git a/src/colmap/tools/example.cc b/src/colmap/tools/example.cc index e99b84fb1f..05ce6824ce 100644 --- a/src/colmap/tools/example.cc +++ b/src/colmap/tools/example.cc @@ -29,7 +29,7 @@ // // Author: Johannes L. Schoenberger (jsch-at-demuc-dot-de) -#include "colmap/base/reconstruction.h" +#include "colmap/scene/reconstruction.h" #include "colmap/util/logging.h" #include "colmap/util/option_manager.h" diff --git a/src/colmap/ui/bundle_adjustment_widget.h b/src/colmap/ui/bundle_adjustment_widget.h index 5f19346e6a..fc2a2df2be 100644 --- a/src/colmap/ui/bundle_adjustment_widget.h +++ b/src/colmap/ui/bundle_adjustment_widget.h @@ -31,7 +31,7 @@ #pragma once -#include "colmap/base/reconstruction.h" +#include "colmap/scene/reconstruction.h" #include "colmap/ui/options_widget.h" #include "colmap/ui/thread_control_widget.h" #include "colmap/util/option_manager.h" diff --git a/src/colmap/ui/colormaps.h b/src/colmap/ui/colormaps.h index 138d85dd3a..a4988143f8 100644 --- a/src/colmap/ui/colormaps.h +++ b/src/colmap/ui/colormaps.h @@ -31,7 +31,7 @@ #pragma once -#include "colmap/base/reconstruction.h" +#include "colmap/scene/reconstruction.h" #include "colmap/util/types.h" #include diff --git a/src/colmap/ui/database_management_widget.h b/src/colmap/ui/database_management_widget.h index df538c9452..ac9a47cfa7 100644 --- a/src/colmap/ui/database_management_widget.h +++ b/src/colmap/ui/database_management_widget.h @@ -31,7 +31,7 @@ #pragma once -#include "colmap/base/database.h" +#include "colmap/scene/database.h" #include "colmap/ui/image_viewer_widget.h" #include "colmap/util/misc.h" #include "colmap/util/option_manager.h" diff --git a/src/colmap/ui/image_viewer_widget.h b/src/colmap/ui/image_viewer_widget.h index fb35e8f0b0..2fe3b43174 100644 --- a/src/colmap/ui/image_viewer_widget.h +++ b/src/colmap/ui/image_viewer_widget.h @@ -31,8 +31,8 @@ #pragma once -#include "colmap/base/database.h" -#include "colmap/base/reconstruction.h" +#include "colmap/scene/database.h" +#include "colmap/scene/reconstruction.h" #include "colmap/geometry/projection.h" #include "colmap/ui/qt_utils.h" #include "colmap/util/option_manager.h" diff --git a/src/colmap/ui/main_window.h b/src/colmap/ui/main_window.h index 530ae11752..1f026701ad 100644 --- a/src/colmap/ui/main_window.h +++ b/src/colmap/ui/main_window.h @@ -31,7 +31,7 @@ #pragma once -#include "colmap/base/reconstruction.h" +#include "colmap/scene/reconstruction.h" #include "colmap/controllers/incremental_mapper.h" #include "colmap/image/bitmap.h" #include "colmap/ui/automatic_reconstruction_widget.h" diff --git a/src/colmap/ui/model_viewer_widget.h b/src/colmap/ui/model_viewer_widget.h index 854a4da284..ab3d407d11 100644 --- a/src/colmap/ui/model_viewer_widget.h +++ b/src/colmap/ui/model_viewer_widget.h @@ -31,8 +31,8 @@ #pragma once -#include "colmap/base/database.h" -#include "colmap/base/reconstruction.h" +#include "colmap/scene/database.h" +#include "colmap/scene/reconstruction.h" #include "colmap/ui/colormaps.h" #include "colmap/ui/image_viewer_widget.h" #include "colmap/ui/line_painter.h" diff --git a/src/colmap/ui/movie_grabber_widget.h b/src/colmap/ui/movie_grabber_widget.h index 40ffa03bc0..894f572ac8 100644 --- a/src/colmap/ui/movie_grabber_widget.h +++ b/src/colmap/ui/movie_grabber_widget.h @@ -31,7 +31,7 @@ #pragma once -#include "colmap/base/reconstruction.h" +#include "colmap/scene/reconstruction.h" #include #include diff --git a/src/colmap/ui/point_viewer_widget.h b/src/colmap/ui/point_viewer_widget.h index b64efb8cb7..84e5100858 100644 --- a/src/colmap/ui/point_viewer_widget.h +++ b/src/colmap/ui/point_viewer_widget.h @@ -31,7 +31,7 @@ #pragma once -#include "colmap/base/reconstruction.h" +#include "colmap/scene/reconstruction.h" #include "colmap/util/option_manager.h" #include diff --git a/src/colmap/ui/project_widget.cc b/src/colmap/ui/project_widget.cc index c629044277..9a2ba90b25 100644 --- a/src/colmap/ui/project_widget.cc +++ b/src/colmap/ui/project_widget.cc @@ -31,7 +31,7 @@ #include "colmap/ui/project_widget.h" -#include "colmap/base/database.h" +#include "colmap/scene/database.h" namespace colmap { diff --git a/src/colmap/ui/reconstruction_manager_widget.h b/src/colmap/ui/reconstruction_manager_widget.h index 396e385210..168f88c9a7 100644 --- a/src/colmap/ui/reconstruction_manager_widget.h +++ b/src/colmap/ui/reconstruction_manager_widget.h @@ -31,7 +31,7 @@ #pragma once -#include "colmap/base/reconstruction_manager.h" +#include "colmap/scene/reconstruction_manager.h" #include diff --git a/src/colmap/ui/reconstruction_stats_widget.h b/src/colmap/ui/reconstruction_stats_widget.h index f03a15d140..a0d166f8ad 100644 --- a/src/colmap/ui/reconstruction_stats_widget.h +++ b/src/colmap/ui/reconstruction_stats_widget.h @@ -31,7 +31,7 @@ #pragma once -#include "colmap/base/reconstruction.h" +#include "colmap/scene/reconstruction.h" #include diff --git a/src/colmap/ui/undistortion_widget.h b/src/colmap/ui/undistortion_widget.h index 7055a5ceef..9dcabac2a1 100644 --- a/src/colmap/ui/undistortion_widget.h +++ b/src/colmap/ui/undistortion_widget.h @@ -31,7 +31,7 @@ #pragma once -#include "colmap/base/reconstruction.h" +#include "colmap/scene/reconstruction.h" #include "colmap/image/undistortion.h" #include "colmap/ui/options_widget.h" #include "colmap/ui/thread_control_widget.h" From 3ee5bf749583a756e675599b514c4d7e104eb47d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20Sch=C3=B6nberger?= Date: Sat, 22 Jul 2023 11:45:56 +0200 Subject: [PATCH 2/2] f --- src/colmap/controllers/hierarchical_mapper.h | 2 +- src/colmap/estimators/bundle_adjustment_test.cc | 2 +- src/colmap/estimators/pose.h | 2 +- src/colmap/estimators/triangulation.h | 2 +- src/colmap/estimators/two_view_geometry.cc | 2 +- src/colmap/estimators/two_view_geometry.h | 2 +- src/colmap/exe/image.cc | 2 +- src/colmap/exe/model.cc | 2 +- src/colmap/exe/mvs.cc | 2 +- src/colmap/exe/sfm.cc | 2 +- src/colmap/exe/sfm.h | 2 +- src/colmap/exe/vocab_tree.cc | 2 +- src/colmap/feature/extraction.h | 2 +- src/colmap/feature/matching.h | 2 +- src/colmap/geometry/projection.h | 2 +- src/colmap/geometry/triangulation.h | 2 +- src/colmap/image/reader.h | 2 +- src/colmap/image/undistortion.h | 2 +- src/colmap/image/warp.h | 2 +- src/colmap/mvs/meshing.cc | 2 +- src/colmap/mvs/model.cc | 2 +- src/colmap/scene/alignment.h | 2 +- src/colmap/scene/camera_rig.h | 2 +- src/colmap/scene/database.h | 4 ++-- src/colmap/scene/database_cache.h | 2 +- src/colmap/scene/image.h | 4 ++-- src/colmap/scene/reconstruction.cc | 2 +- src/colmap/scene/reconstruction.h | 2 +- src/colmap/scene/reconstruction_test.cc | 2 +- src/colmap/scene/synthetic.h | 2 +- src/colmap/sfm/incremental_mapper.h | 2 +- src/colmap/ui/image_viewer_widget.h | 2 +- src/colmap/ui/main_window.h | 2 +- src/colmap/ui/undistortion_widget.h | 2 +- 34 files changed, 36 insertions(+), 36 deletions(-) diff --git a/src/colmap/controllers/hierarchical_mapper.h b/src/colmap/controllers/hierarchical_mapper.h index 3819f7ca14..cc7b8790c2 100644 --- a/src/colmap/controllers/hierarchical_mapper.h +++ b/src/colmap/controllers/hierarchical_mapper.h @@ -31,9 +31,9 @@ #pragma once +#include "colmap/controllers/incremental_mapper.h" #include "colmap/scene/reconstruction_manager.h" #include "colmap/scene/scene_clustering.h" -#include "colmap/controllers/incremental_mapper.h" #include "colmap/util/threading.h" #include diff --git a/src/colmap/estimators/bundle_adjustment_test.cc b/src/colmap/estimators/bundle_adjustment_test.cc index f10c9b4c49..ff309d857f 100644 --- a/src/colmap/estimators/bundle_adjustment_test.cc +++ b/src/colmap/estimators/bundle_adjustment_test.cc @@ -31,10 +31,10 @@ #include "colmap/estimators/bundle_adjustment.h" -#include "colmap/scene/correspondence_graph.h" #include "colmap/camera/models.h" #include "colmap/geometry/projection.h" #include "colmap/math/random.h" +#include "colmap/scene/correspondence_graph.h" #include diff --git a/src/colmap/estimators/pose.h b/src/colmap/estimators/pose.h index fd3bcffe05..430503448b 100644 --- a/src/colmap/estimators/pose.h +++ b/src/colmap/estimators/pose.h @@ -31,10 +31,10 @@ #pragma once -#include "colmap/scene/camera.h" #include "colmap/camera/models.h" #include "colmap/geometry/rigid3.h" #include "colmap/optim/loransac.h" +#include "colmap/scene/camera.h" #include "colmap/util/logging.h" #include "colmap/util/threading.h" #include "colmap/util/types.h" diff --git a/src/colmap/estimators/triangulation.h b/src/colmap/estimators/triangulation.h index 61d63a6217..3f9c8d50cb 100644 --- a/src/colmap/estimators/triangulation.h +++ b/src/colmap/estimators/triangulation.h @@ -31,9 +31,9 @@ #pragma once -#include "colmap/scene/camera.h" #include "colmap/math/math.h" #include "colmap/optim/ransac.h" +#include "colmap/scene/camera.h" #include "colmap/util/types.h" #include diff --git a/src/colmap/estimators/two_view_geometry.cc b/src/colmap/estimators/two_view_geometry.cc index 4fcba05920..7669e90978 100644 --- a/src/colmap/estimators/two_view_geometry.cc +++ b/src/colmap/estimators/two_view_geometry.cc @@ -31,7 +31,6 @@ #include "colmap/estimators/two_view_geometry.h" -#include "colmap/scene/camera.h" #include "colmap/estimators/essential_matrix.h" #include "colmap/estimators/fundamental_matrix.h" #include "colmap/estimators/homography_matrix.h" @@ -44,6 +43,7 @@ #include "colmap/math/random.h" #include "colmap/optim/loransac.h" #include "colmap/optim/ransac.h" +#include "colmap/scene/camera.h" #include diff --git a/src/colmap/estimators/two_view_geometry.h b/src/colmap/estimators/two_view_geometry.h index 68b5ae9089..9cd3e6249e 100644 --- a/src/colmap/estimators/two_view_geometry.h +++ b/src/colmap/estimators/two_view_geometry.h @@ -31,10 +31,10 @@ #pragma once -#include "colmap/scene/camera.h" #include "colmap/feature/types.h" #include "colmap/geometry/rigid3.h" #include "colmap/optim/ransac.h" +#include "colmap/scene/camera.h" #include "colmap/util/logging.h" namespace colmap { diff --git a/src/colmap/exe/image.cc b/src/colmap/exe/image.cc index 8ac3af002e..82fd8511a4 100644 --- a/src/colmap/exe/image.cc +++ b/src/colmap/exe/image.cc @@ -31,9 +31,9 @@ #include "colmap/exe/image.h" -#include "colmap/scene/reconstruction.h" #include "colmap/controllers/incremental_mapper.h" #include "colmap/image/undistortion.h" +#include "colmap/scene/reconstruction.h" #include "colmap/sfm/incremental_mapper.h" #include "colmap/util/misc.h" #include "colmap/util/option_manager.h" diff --git a/src/colmap/exe/model.cc b/src/colmap/exe/model.cc index afb60a9b5a..458b53a5dc 100644 --- a/src/colmap/exe/model.cc +++ b/src/colmap/exe/model.cc @@ -31,10 +31,10 @@ #include "colmap/exe/model.h" -#include "colmap/scene/alignment.h" #include "colmap/estimators/coordinate_frame.h" #include "colmap/geometry/gps.h" #include "colmap/geometry/pose.h" +#include "colmap/scene/alignment.h" #include "colmap/util/misc.h" #include "colmap/util/option_manager.h" #include "colmap/util/threading.h" diff --git a/src/colmap/exe/mvs.cc b/src/colmap/exe/mvs.cc index 7748815262..860a488756 100644 --- a/src/colmap/exe/mvs.cc +++ b/src/colmap/exe/mvs.cc @@ -31,10 +31,10 @@ #include "colmap/exe/mvs.h" -#include "colmap/scene/reconstruction.h" #include "colmap/mvs/fusion.h" #include "colmap/mvs/meshing.h" #include "colmap/mvs/patch_match.h" +#include "colmap/scene/reconstruction.h" #include "colmap/util/misc.h" #include "colmap/util/option_manager.h" diff --git a/src/colmap/exe/sfm.cc b/src/colmap/exe/sfm.cc index 2479dc6313..614c4239b8 100644 --- a/src/colmap/exe/sfm.cc +++ b/src/colmap/exe/sfm.cc @@ -31,11 +31,11 @@ #include "colmap/exe/sfm.h" -#include "colmap/scene/reconstruction.h" #include "colmap/controllers/automatic_reconstruction.h" #include "colmap/controllers/bundle_adjustment.h" #include "colmap/controllers/hierarchical_mapper.h" #include "colmap/exe/gui.h" +#include "colmap/scene/reconstruction.h" #include "colmap/util/misc.h" #include "colmap/util/opengl_utils.h" #include "colmap/util/option_manager.h" diff --git a/src/colmap/exe/sfm.h b/src/colmap/exe/sfm.h index 2f1d1fbf8b..51e27462bf 100644 --- a/src/colmap/exe/sfm.h +++ b/src/colmap/exe/sfm.h @@ -31,8 +31,8 @@ #pragma once -#include "colmap/scene/reconstruction.h" #include "colmap/controllers/incremental_mapper.h" +#include "colmap/scene/reconstruction.h" namespace colmap { diff --git a/src/colmap/exe/vocab_tree.cc b/src/colmap/exe/vocab_tree.cc index e67953c6b8..217f9f3e6a 100644 --- a/src/colmap/exe/vocab_tree.cc +++ b/src/colmap/exe/vocab_tree.cc @@ -31,12 +31,12 @@ #include "colmap/exe/vocab_tree.h" -#include "colmap/scene/database.h" #include "colmap/exe/gui.h" #include "colmap/feature/matching.h" #include "colmap/feature/sift.h" #include "colmap/feature/utils.h" #include "colmap/retrieval/visual_index.h" +#include "colmap/scene/database.h" #include "colmap/util/misc.h" #include "colmap/util/opengl_utils.h" #include "colmap/util/option_manager.h" diff --git a/src/colmap/feature/extraction.h b/src/colmap/feature/extraction.h index 24e7b1545f..2b6dada8cd 100644 --- a/src/colmap/feature/extraction.h +++ b/src/colmap/feature/extraction.h @@ -31,9 +31,9 @@ #pragma once -#include "colmap/scene/database.h" #include "colmap/feature/sift.h" #include "colmap/image/reader.h" +#include "colmap/scene/database.h" #include "colmap/util/opengl_utils.h" #include "colmap/util/threading.h" diff --git a/src/colmap/feature/matching.h b/src/colmap/feature/matching.h index 5df7a53729..f81641e781 100644 --- a/src/colmap/feature/matching.h +++ b/src/colmap/feature/matching.h @@ -31,8 +31,8 @@ #pragma once -#include "colmap/scene/database.h" #include "colmap/feature/sift.h" +#include "colmap/scene/database.h" #include "colmap/util/cache.h" #include "colmap/util/opengl_utils.h" #include "colmap/util/threading.h" diff --git a/src/colmap/geometry/projection.h b/src/colmap/geometry/projection.h index bdd0707ece..85d8dff8ae 100644 --- a/src/colmap/geometry/projection.h +++ b/src/colmap/geometry/projection.h @@ -31,8 +31,8 @@ #pragma once -#include "colmap/scene/camera.h" #include "colmap/geometry/rigid3.h" +#include "colmap/scene/camera.h" #include #include diff --git a/src/colmap/geometry/triangulation.h b/src/colmap/geometry/triangulation.h index 1792c00c6c..4baf071620 100644 --- a/src/colmap/geometry/triangulation.h +++ b/src/colmap/geometry/triangulation.h @@ -31,8 +31,8 @@ #pragma once -#include "colmap/scene/camera.h" #include "colmap/math/math.h" +#include "colmap/scene/camera.h" #include "colmap/util/types.h" #include diff --git a/src/colmap/image/reader.h b/src/colmap/image/reader.h index d719d36f8b..1acfeb6388 100644 --- a/src/colmap/image/reader.h +++ b/src/colmap/image/reader.h @@ -31,8 +31,8 @@ #pragma once -#include "colmap/scene/database.h" #include "colmap/image/bitmap.h" +#include "colmap/scene/database.h" #include "colmap/util/threading.h" #include diff --git a/src/colmap/image/undistortion.h b/src/colmap/image/undistortion.h index 57c6267055..1ac448d835 100644 --- a/src/colmap/image/undistortion.h +++ b/src/colmap/image/undistortion.h @@ -31,9 +31,9 @@ #pragma once -#include "colmap/scene/reconstruction.h" #include "colmap/geometry/rigid3.h" #include "colmap/image/bitmap.h" +#include "colmap/scene/reconstruction.h" #include "colmap/util/misc.h" #include "colmap/util/threading.h" diff --git a/src/colmap/image/warp.h b/src/colmap/image/warp.h index 331aef0ab4..15711b5f51 100644 --- a/src/colmap/image/warp.h +++ b/src/colmap/image/warp.h @@ -31,8 +31,8 @@ #pragma once -#include "colmap/scene/camera.h" #include "colmap/image/bitmap.h" +#include "colmap/scene/camera.h" namespace colmap { diff --git a/src/colmap/mvs/meshing.cc b/src/colmap/mvs/meshing.cc index c29042ff24..a83660441b 100644 --- a/src/colmap/mvs/meshing.cc +++ b/src/colmap/mvs/meshing.cc @@ -40,9 +40,9 @@ #include #endif // CGAL_ENABLED -#include "colmap/scene/reconstruction.h" #include "colmap/math/graph_cut.h" #include "colmap/math/random.h" +#include "colmap/scene/reconstruction.h" #include "colmap/util/endian.h" #include "colmap/util/logging.h" #include "colmap/util/misc.h" diff --git a/src/colmap/mvs/model.cc b/src/colmap/mvs/model.cc index 2b0d91948a..d917953817 100644 --- a/src/colmap/mvs/model.cc +++ b/src/colmap/mvs/model.cc @@ -31,11 +31,11 @@ #include "colmap/mvs/model.h" -#include "colmap/scene/reconstruction.h" #include "colmap/camera/models.h" #include "colmap/geometry/pose.h" #include "colmap/geometry/projection.h" #include "colmap/geometry/triangulation.h" +#include "colmap/scene/reconstruction.h" #include "colmap/util/misc.h" namespace colmap { diff --git a/src/colmap/scene/alignment.h b/src/colmap/scene/alignment.h index 10c9f41aef..348cc5e8b6 100644 --- a/src/colmap/scene/alignment.h +++ b/src/colmap/scene/alignment.h @@ -31,8 +31,8 @@ #pragma once -#include "colmap/scene/reconstruction.h" #include "colmap/geometry/sim3.h" +#include "colmap/scene/reconstruction.h" namespace colmap { diff --git a/src/colmap/scene/camera_rig.h b/src/colmap/scene/camera_rig.h index ab02ba53b8..7d87a5ea76 100644 --- a/src/colmap/scene/camera_rig.h +++ b/src/colmap/scene/camera_rig.h @@ -31,9 +31,9 @@ #pragma once +#include "colmap/geometry/pose.h" #include "colmap/scene/camera.h" #include "colmap/scene/reconstruction.h" -#include "colmap/geometry/pose.h" #include "colmap/util/types.h" #include diff --git a/src/colmap/scene/database.h b/src/colmap/scene/database.h index 1502ecc773..c72fb75f7e 100644 --- a/src/colmap/scene/database.h +++ b/src/colmap/scene/database.h @@ -31,10 +31,10 @@ #pragma once -#include "colmap/scene/camera.h" -#include "colmap/scene/image.h" #include "colmap/estimators/two_view_geometry.h" #include "colmap/feature/types.h" +#include "colmap/scene/camera.h" +#include "colmap/scene/image.h" #include "colmap/util/types.h" #include diff --git a/src/colmap/scene/database_cache.h b/src/colmap/scene/database_cache.h index 175493cc25..65edc00903 100644 --- a/src/colmap/scene/database_cache.h +++ b/src/colmap/scene/database_cache.h @@ -31,11 +31,11 @@ #pragma once +#include "colmap/camera/models.h" #include "colmap/scene/camera.h" #include "colmap/scene/correspondence_graph.h" #include "colmap/scene/database.h" #include "colmap/scene/image.h" -#include "colmap/camera/models.h" #include "colmap/util/types.h" #include diff --git a/src/colmap/scene/image.h b/src/colmap/scene/image.h index 69cbf1e57a..4fd7bf3f61 100644 --- a/src/colmap/scene/image.h +++ b/src/colmap/scene/image.h @@ -31,11 +31,11 @@ #pragma once +#include "colmap/geometry/rigid3.h" +#include "colmap/math/math.h" #include "colmap/scene/camera.h" #include "colmap/scene/point2d.h" #include "colmap/scene/visibility_pyramid.h" -#include "colmap/geometry/rigid3.h" -#include "colmap/math/math.h" #include "colmap/util/logging.h" #include "colmap/util/types.h" diff --git a/src/colmap/scene/reconstruction.cc b/src/colmap/scene/reconstruction.cc index d3d03f90f1..c54711ef94 100644 --- a/src/colmap/scene/reconstruction.cc +++ b/src/colmap/scene/reconstruction.cc @@ -31,7 +31,6 @@ #include "colmap/scene/reconstruction.h" -#include "colmap/scene/database_cache.h" #include "colmap/estimators/similarity_transform.h" #include "colmap/geometry/gps.h" #include "colmap/geometry/pose.h" @@ -39,6 +38,7 @@ #include "colmap/geometry/triangulation.h" #include "colmap/image/bitmap.h" #include "colmap/optim/loransac.h" +#include "colmap/scene/database_cache.h" #include "colmap/util/misc.h" #include "colmap/util/ply.h" diff --git a/src/colmap/scene/reconstruction.h b/src/colmap/scene/reconstruction.h index 86d7e24378..b22e936c2b 100644 --- a/src/colmap/scene/reconstruction.h +++ b/src/colmap/scene/reconstruction.h @@ -31,13 +31,13 @@ #pragma once +#include "colmap/geometry/sim3.h" #include "colmap/scene/camera.h" #include "colmap/scene/database.h" #include "colmap/scene/image.h" #include "colmap/scene/point2d.h" #include "colmap/scene/point3d.h" #include "colmap/scene/track.h" -#include "colmap/geometry/sim3.h" #include "colmap/util/types.h" #include diff --git a/src/colmap/scene/reconstruction_test.cc b/src/colmap/scene/reconstruction_test.cc index 6807a1a52c..8076afd334 100644 --- a/src/colmap/scene/reconstruction_test.cc +++ b/src/colmap/scene/reconstruction_test.cc @@ -31,10 +31,10 @@ #include "colmap/scene/reconstruction.h" -#include "colmap/scene/correspondence_graph.h" #include "colmap/camera/models.h" #include "colmap/geometry/pose.h" #include "colmap/geometry/sim3.h" +#include "colmap/scene/correspondence_graph.h" #include diff --git a/src/colmap/scene/synthetic.h b/src/colmap/scene/synthetic.h index 2de458e06e..37ee101101 100644 --- a/src/colmap/scene/synthetic.h +++ b/src/colmap/scene/synthetic.h @@ -31,9 +31,9 @@ #pragma once +#include "colmap/camera/models.h" #include "colmap/scene/database.h" #include "colmap/scene/reconstruction.h" -#include "colmap/camera/models.h" #include "colmap/util/types.h" namespace colmap { diff --git a/src/colmap/sfm/incremental_mapper.h b/src/colmap/sfm/incremental_mapper.h index 40df7ba48a..268df5370a 100644 --- a/src/colmap/sfm/incremental_mapper.h +++ b/src/colmap/sfm/incremental_mapper.h @@ -31,10 +31,10 @@ #pragma once +#include "colmap/estimators/bundle_adjustment.h" #include "colmap/scene/database.h" #include "colmap/scene/database_cache.h" #include "colmap/scene/reconstruction.h" -#include "colmap/estimators/bundle_adjustment.h" #include "colmap/sfm/incremental_triangulator.h" namespace colmap { diff --git a/src/colmap/ui/image_viewer_widget.h b/src/colmap/ui/image_viewer_widget.h index 2fe3b43174..863eed50fc 100644 --- a/src/colmap/ui/image_viewer_widget.h +++ b/src/colmap/ui/image_viewer_widget.h @@ -31,9 +31,9 @@ #pragma once +#include "colmap/geometry/projection.h" #include "colmap/scene/database.h" #include "colmap/scene/reconstruction.h" -#include "colmap/geometry/projection.h" #include "colmap/ui/qt_utils.h" #include "colmap/util/option_manager.h" diff --git a/src/colmap/ui/main_window.h b/src/colmap/ui/main_window.h index 1f026701ad..b58e03037f 100644 --- a/src/colmap/ui/main_window.h +++ b/src/colmap/ui/main_window.h @@ -31,9 +31,9 @@ #pragma once -#include "colmap/scene/reconstruction.h" #include "colmap/controllers/incremental_mapper.h" #include "colmap/image/bitmap.h" +#include "colmap/scene/reconstruction.h" #include "colmap/ui/automatic_reconstruction_widget.h" #include "colmap/ui/bundle_adjustment_widget.h" #include "colmap/ui/database_management_widget.h" diff --git a/src/colmap/ui/undistortion_widget.h b/src/colmap/ui/undistortion_widget.h index 9dcabac2a1..4e7c225935 100644 --- a/src/colmap/ui/undistortion_widget.h +++ b/src/colmap/ui/undistortion_widget.h @@ -31,8 +31,8 @@ #pragma once -#include "colmap/scene/reconstruction.h" #include "colmap/image/undistortion.h" +#include "colmap/scene/reconstruction.h" #include "colmap/ui/options_widget.h" #include "colmap/ui/thread_control_widget.h" #include "colmap/util/misc.h"