8000 Move related code to new geometry module by ahojnnes · Pull Request #2006 · colmap/colmap · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Move related code to new geometry module #2006

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jul 7, 2023
Merged

Move related code to new geometry module #2006

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
146e9cd
Move related code to new geometry module
ahojnnes Jul 7, 2023
a3c1b99
format
ahojnnes Jul 7, 2023
9007db7
f
ahojnnes Jul 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/colmap/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ add_subdirectory(controllers)
add_subdirectory(estimators)
add_subdirectory(exe)
add_subdirectory(feature)
add_subdirectory(geometry)
add_subdirectory(image)
add_subdirectory(mvs)
add_subdirectory(optim)
Expand Down
14 changes: 0 additions & 14 deletions src/colmap/base/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,22 +37,15 @@ COLMAP_ADD_SOURCES(
correspondence_graph.h correspondence_graph.cc
database.h database.cc
database_cache.h database_cache.cc
essential_matrix.h essential_matrix.cc
gps.h gps.cc
graph_cut.h graph_cut.cc
homography_matrix.h homography_matrix.cc
image.h image.cc
point2d.h point2d.cc
point3d.h point3d.cc
polynomial.h polynomial.cc
pose.h pose.cc
projection.h projection.cc
reconstruction.h reconstruction.cc
reconstruction_manager.h reconstruction_manager.cc
scene_clustering.h scene_clustering.cc
similarity_transform.h similarity_transform.cc
track.h track.cc
triangulation.h triangulation.cc
visibility_pyramid.h visibility_pyramid.cc
)

Expand All @@ -62,20 +55,13 @@ COLMAP_ADD_TEST(correspondence_graph_test correspondence_gra 9E81 ph_test.cc)
COLMAP_ADD_TEST(cost_functions_test cost_functions_test.cc)
COLMAP_ADD_TEST(database_cache_test database_cache_test.cc)
COLMAP_ADD_TEST(database_test database_test.cc)
COLMAP_ADD_TEST(essential_matrix_utils_test essential_matrix_test.cc)
COLMAP_ADD_TEST(gps_test gps_test.cc)
COLMAP_ADD_TEST(graph_cut_test graph_cut_test.cc)
COLMAP_ADD_TEST(homography_matrix_utils_test homography_matrix_test.cc)
COLMAP_ADD_TEST(image_test image_test.cc)
COLMAP_ADD_TEST(point2d_test point2d_test.cc)
COLMAP_ADD_TEST(point3d_test point3d_test.cc)
COLMAP_ADD_TEST(polynomial_test polynomial_test.cc)
COLMAP_ADD_TEST(pose_test pose_test.cc)
COLMAP_ADD_TEST(projection_test projection_test.cc)
COLMAP_ADD_TEST(reconstruction_test reconstruction_test.cc)
COLMAP_ADD_TEST(reconstruction_manager_test reconstruction_manager_test.cc)
COLMAP_ADD_TEST(scene_clustering_test scene_clustering_test.cc)
COLMAP_ADD_TEST(similarity_transform_test similarity_transform_test.cc)
COLMAP_ADD_TEST(track_test track_test.cc)
COLMAP_ADD_TEST(triangulation_test triangulation_test.cc)
COLMAP_ADD_TEST(visibility_pyramid_test visibility_pyramid_test.cc)
2 changes: 1 addition & 1 deletion src/colmap/base/camera_rig.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@
#define COLMAP_SRC_BASE_CAMERA_RIG_H_

#include "colmap/base/camera.h"
#include "colmap/base/pose.h"
#include "colmap/base/reconstruction.h"
#include "colmap/geometry/pose.h"
#include "colmap/util/types.h"

#include <unordered_map>
Expand Down
< F438 span class="sr-only"> 2 changes: 1 addition & 1 deletion src/colmap/base/correspondence_graph.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@

#include "colmap/base/correspondence_graph.h"

#include "colmap/base/pose.h"
#include "colmap/geometry/pose.h"
#include "colmap/util/string.h"

#include <unordered_set>
Expand Down
2 changes: 1 addition & 1 deletion src/colmap/base/cost_functions_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@
#define TEST_NAME "base/cost_functions"
#include "colmap/base/cost_functions.h"

#include "colmap/base/pose.h"
#include "colmap/camera/models.h"
#include "colmap/geometry/pose.h"
#include "colmap/util/testing.h"

namespace colmap {
Expand Down
2 changes: 1 addition & 1 deletion src/colmap/base/database_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
#define TEST_NAME "base/database"
#include "colmap/base/database.h"

#include "colmap/base/pose.h"
#include "colmap/geometry/pose.h"
#include "colmap/util/testing.h"

#include <thread>
Expand Down
4 changes: 2 additions & 2 deletions src/colmap/base/image.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@

#include "colmap/base/image.h"

#include "colmap/base/pose.h"
#include "colmap/base/projection.h"
#include "colmap/geometry/pose.h"
#include "colmap/geometry/projection.h"

namespace colmap {
namespace {
Expand Down
8 changes: 4 additions & 4 deletions src/colmap/base/reconstruction.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@
#include "colmap/base/reconstruction.h"

#include "colmap/base/database_cache.h"
#include "colmap/base/gps.h"
#include "colmap/base/pose.h"
#include "colmap/base/projection.h"
#include "colmap/base/triangulation.h"
#include "colmap/geometry/gps.h"
#include "colmap/geometry/pose.h"
#include "colmap/geometry/projection.h"
#include "colmap/geometry/triangulation.h"
#include "colmap/image/bitmap.h"
#include "colmap/util/misc.h"
#include "colmap/util/ply.h"
Expand Down
2 changes: 1 addition & 1 deletion src/colmap/base/reconstruction.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@
#include "colmap/base/image.h"
#include "colmap/base/point2d.h"
#include "colmap/base/point3d.h"
#include "colmap/base/similarity_transform.h"
#include "colmap/base/track.h"
#include "colmap/estimators/similarity_transform.h"
#include "colmap/geometry/similarity_transform.h"
#include "colmap/optim/loransac.h"
#include "colmap/util/types.h"

Expand Down
4 changes: 2 additions & 2 deletions src/colmap/base/reconstruction_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@
#include "colmap/base/reconstruction.h"

#include "colmap/base/correspondence_graph.h"
#include "colmap/base/pose.h"
#include "colmap/base/similarity_transform.h"
#include "colmap/camera/models.h"
#include "colmap/geometry/pose.h"
#include "colmap/geometry/similarity_transform.h"
#include "colmap/util/testing.h"

namespace colmap {
Expand Down
6 changes: 3 additions & 3 deletions src/colmap/camera/database.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
//
// Author: Johannes L. Schoenberger (jsch-at-demuc-dot-de)

#ifndef COLMAP_SRC_BASE_CAMERA_DATABASE_H_
#define COLMAP_SRC_BASE_CAMERA_DATABASE_H_
#ifndef COLMAP_SRC_CAMERA_CAMERA_DATABASE_H_
#define COLMAP_SRC_CAMERA_CAMERA_DATABASE_H_

#include "colmap/camera/specs.h"

Expand All @@ -56,4 +56,4 @@ class CameraDatabase {

} // namespace colmap

#endif // COLMAP_SRC_BASE_CAMERA_DATABASE_H_
#endif // COLMAP_SRC_CAMERA_CAMERA_DATABASE_H_
2 changes: 1 addition & 1 deletion src/colmap/camera/database_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
//
// Author: Johannes L. Schoenberger (jsch-at-demuc-dot-de)

#define TEST_NAME "base/camera_database"
#define TEST_NAME "camera/camera_database"
#include "colmap/camera/database.h"

#include "colmap/util/testing.h"
Expand Down
6 changes: 3 additions & 3 deletions src/colmap/camera/models.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
//
// Author: Johannes L. Schoenberger (jsch-at-demuc-dot-de)

#ifndef COLMAP_SRC_BASE_CAMERA_MODELS_H_
#define COLMAP_SRC_BASE_CAMERA_MODELS_H_
#ifndef COLMAP_SRC_CAMERA_CAMERA_MODELS_H_
#define COLMAP_SRC_CAMERA_CAMERA_MODELS_H_

#include <cfloat>
#include <string>
Expand Down Expand Up @@ -1551,4 +1551,4 @@ double CameraModelImageToWorldThreshold(const int model_id,

} // namespace colmap

#endif // COLMAP_SRC_BASE_CAMERA_MODELS_H_
#endif // COLMAP_SRC_CAMERA_CAMERA_MODELS_H_
2 changes: 1 addition & 1 deletion src/colmap/camera/models_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
//
// Author: Johannes L. Schoenberger (jsch-at-demuc-dot-de)

#define TEST_NAME "base/camera_models"
#define TEST_NAME "camera/camera_models"
#include "colmap/camera/models.h"

#include "colmap/util/testing.h"
Expand Down
4 changes: 2 additions & 2 deletions src/colmap/estimators/absolute_pose_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@
#define TEST_NAME "base/absolute_pose"
#include "colmap/estimators/absolute_pose.h"

#include "colmap/base/pose.h"
#include "colmap/base/similarity_transform.h"
#include "colmap/estimators/essential_matrix.h"
#include "colmap/geometry/pose.h"
#include "colmap/geometry/similarity_transform.h"
#include "colmap/optim/ransac.h"
#include "colmap/util/random.h"
#include "colmap/util/testing.h"
Expand Down
4 changes: 2 additions & 2 deletions src/colmap/estimators/coordinate_frame.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@

#include "colmap/estimators/coordinate_frame.h"

#include "colmap/base/gps.h"
#include "colmap/base/pose.h"
#include "colmap/estimators/utils.h"
#include "colmap/geometry/gps.h"
#include "colmap/geometry/pose.h"
#include "colmap/image/line.h"
#include "colmap/image/undistortion.h"
#include "colmap/optim/ransac.h"
Expand Down
2 changes: 1 addition & 1 deletion src/colmap/estimators/coordinate_frame_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
#define TEST_NAME "estimators/coordinate_frame"
#include "colmap/estimators/coordinate_frame.h"

#include "colmap/base/gps.h"
#include "colmap/geometry/gps.h"
#include "colmap/util/testing.h"

namespace colmap {
Expand Down
6 changes: 3 additions & 3 deletions src/colmap/estimators/essential_matrix_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,12 @@
// Author: Johannes L. Schoenberger (jsch-at-demuc-dot-de)

#define TEST_NAME "estimators/essential_matrix"
#include "colmap/base/essential_matrix.h"
#include "colmap/geometry/essential_matrix.h"

#include "colmap/base/pose.h"
#include "colmap/base/projection.h"
#include "colmap/camera/models.h"
#include "colmap/estimators/essential_matrix.h"
#include "colmap/geometry/pose.h"
#include "colmap/geometry/projection.h"
#include "colmap/optim/ransac.h"
#include "colmap/util/random.h"
#include "colmap/util/testing.h"
Expand Down
2 changes: 1 addition & 1 deletion src/colmap/estimators/euclidean_transform.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
#ifndef COLMAP_SRC_ESTIMATORS_EUCLIDEAN_TRANSFORM_H_
#define COLMAP_SRC_ESTIMATORS_EUCLIDEAN_TRANSFORM_H_

#include "colmap/base/similarity_transform.h"
#include "colmap/geometry/similarity_transform.h"

namespace colmap {

Expand Down
2 changes: 1 addition & 1 deletion src/colmap/estimators/generalized_absolute_pose.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@
#include "colmap/estimators/generalized_absolute_pose.h"

#include "colmap/base/polynomial.h"
#include "colmap/base/projection.h"
#include "colmap/estimators/generalized_absolute_pose_coeffs.h"
#include "colmap/geometry/projection.h"
#include "colmap/util/logging.h"

#include <array>
Expand Down
6 changes: 3 additions & 3 deletions src/colmap/estimators/generalized_absolute_pose_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@
#define TEST_NAME "base/generalized_absolute_pose"
#include "colmap/estimators/generalized_absolute_pose.h"

#include "colmap/base/po 93C6 se.h"
#include "colmap/base/projection.h"
#include "colmap/base/similarity_transform.h"
#include "colmap/geometry/pose.h"
#include "colmap/geometry/projection.h"
#include "colmap/geometry/similarity_transform.h"
#include "colmap/optim/ransac.h"
#include "colmap/util/random.h"
#include "colmap/util/testing.h"
Expand Down
8 changes: 4 additions & 4 deletions src/colmap/estimators/generalized_relative_pose.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,10 @@

#include "colmap/estimators/generalized_relative_pose.h"

#include "colmap/base/essential_matrix.h"
#include "colmap/base/pose.h"
#include "colmap/base/projection.h"
#include "colmap/base/triangulation.h"
#include "colmap/geometry/essential_matrix.h"
#include "colmap/geometry/pose.h"
#include "colmap/geometry/projection.h"
#include "colmap/geometry/triangulation.h"
#include "colmap/util/logging.h"
#include "colmap/util/random.h"

Expand Down
6 changes: 3 additions & 3 deletions src/colmap/estimators/generalized_relative_pose_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@
#define TEST_NAME "base/generalized_relative_pose"
#include "colmap/estimators/generalized_relative_pose.h"

#include "colmap/base/pose.h"
#include "colmap/base/projection.h"
#include "colmap/base/similarity_transform.h"
#include "colmap/geometry/pose.h"
#include "colmap/geometry/projection.h"
#include "colmap/geometry/similarity_transform.h"
#include "colmap/optim/loransac.h"
#include "colmap/util/random.h"
#include "colmap/util/testing.h"
Expand Down
2 changes: 1 addition & 1 deletion src/colmap/estimators/homography_matrix.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@

#include "colmap/estimators/homography_matrix.h"

#include "colmap/base/projection.h"
#include "colmap/estimators/utils.h"
#include "colmap/geometry/projection.h"
#include "colmap/util/logging.h"

#include <Eigen/Geometry>
Expand Down
4 changes: 2 additions & 2 deletions src/colmap/estimators/pose.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,11 @@
#include "colmap/estimators/pose.h"

#include "colmap/base/cost_functions.h"
#include "colmap/base/essential_matrix.h"
#include "colmap/base/pose.h"
#include "colmap/camera/models.h"
#include "colmap/estimators/absolute_pose.h"
#include "colmap/estimators/essential_matrix.h"
#include "colmap/geometry/essential_matrix.h"
#include "colmap/geometry/pose.h"
#include "colmap/optim/bundle_adjustment.h"
#include "colmap/util/matrix.h"
#include "colmap/util/misc.h"
Expand Down
2 changes: 1 addition & 1 deletion src/colmap/estimators/similarity_transform.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
#ifndef COLMAP_SRC_ESTIMATORS_SIMILARITY_TRANSFORM_H_
#define COLMAP_SRC_ESTIMATORS_SIMILARITY_TRANSFORM_H_

#include "colmap/base/projection.h"
#include "colmap/geometry/projection.h"
#include "colmap/util/logging.h"
#include "colmap/util/types.h"

Expand Down
4 changes: 2 additions & 2 deletions src/colmap/estimators/triangulation.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@

#include "colmap/estimators/triangulation.h"

#include "colmap/base/projection.h"
#include "colmap/base/triangulation.h"
#include "colmap/estimators/essential_matrix.h"
#include "colmap/geometry/projection.h"
#include "colmap/geometry/triangulation.h"
#include "colmap/optim/combination_sampler.h"
#include "colmap/optim/loransac.h"
#include "colmap/util/logging.h"
Expand Down
10 changes: 5 additions & 5 deletions src/colmap/estimators/two_view_geometry.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,15 +32,15 @@
#include "colmap/estimators/two_view_geometry.h"

#include "colmap/base/camera.h"
#include "colmap/base/essential_matrix.h"
#include "colmap/base/homography_matrix.h"
#include "colmap/base/pose.h"
#include "colmap/base/projection.h"
#include "colmap/base/triangulation.h"
#include "colmap/estimators/essential_matrix.h"
#include "colmap/estimators/fundamental_matrix.h"
#include "colmap/estimators/homography_matrix.h"
#include "colmap/estimators/translation_transform.h"
#include "colmap/geometry/essential_matrix.h"
#include "colmap/geometry/homography_matrix.h"
#include "colmap/geometry/pose.h"
#include "colmap/geometry/projection.h"
#include "colmap/geometry/triangulation.h"
#include "colmap/optim/loransac.h"
#include "colmap/optim/ransac.h"
#include "colmap/util/random.h"
Expand Down
2 changes: 1 addition & 1 deletion src/colmap/estimators/two_view_geometry_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
#define TEST_NAME "estimators/two_view_geometry"
#include "colmap/estimators/two_view_geometry.h"

#include "colmap/base/pose.h"
#include "colmap/geometry/pose.h"
#include "colmap/util/testing.h"

namespace colmap {
Expand Down
2 changes: 1 addition & 1 deletion src/colmap/estimators/utils_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
#define TEST_NAME "estimators/utils"
#include "colmap/estimators/utils.h"

#include "colmap/base/essential_matrix.h"
#include "colmap/geometry/essential_matrix.h"
#include "colmap/util/testing.h"

namespace colmap {
Expand Down
6 changes: 3 additions & 3 deletions src/colmap/exe/model.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@

#include "colmap/exe/model.h"

#include "colmap/base/gps.h"
#include "colmap/base/pose.h"
#include "colmap/base/similarity_transform.h"
#include "colmap/estimators/coordinate_frame.h"
#include "colmap/geometry/gps.h"
#include "colmap/geometry/pose.h"
#include "colmap/geometry/similarity_transform.h"
#include "colmap/util/misc.h"
#include "colmap/util/option_manager.h"
#include "colmap/util/threading.h"
Expand Down
Loading
0