8000 Remaining base targets move to new scene module by ahojnnes · Pull Request #2055 · colmap/colmap · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Remaining base targets move to new scene module #2055

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 2 commits into from
Jul 23, 2023
Merged

Remaining base targets move to new scene module #2055

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c45ccdb
Remaining base targets move to new scene module
ahojnnes Jul 22, 2023
3ee5bf7
f
ahojnnes Jul 22, 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
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -427,14 +427,14 @@ 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)
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)
Expand Down
2 changes: 1 addition & 1 deletion doc/cameras.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions doc/database.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand Down
24 changes: 12 additions & 12 deletions scripts/python/read_write_model.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
"""
Expand All @@ -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)
"""
Expand Down Expand Up @@ -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)
"""
Expand All @@ -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)
"""
Expand All @@ -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)
"""
Expand Down Expand Up @@ -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)
"""
Expand Down Expand Up @@ -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)
"""
Expand Down Expand Up @@ -286,7 +286,7 @@ def write_images_text(images, path):

def write_images_binary(images, path_to_model_file):
"& A377 quot;"
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)
"""
Expand All @@ -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)
"""
Expand All @@ -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)
"""
Expand Down Expand Up @@ -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)
"""
Expand All @@ -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)
"""
Expand Down
2 changes: 1 addition & 1 deletion src/colmap/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ elseif(IS_GNU OR IS_CLANG)
endif()
endif()

add_subdirectory(base)
add_subdirectory(camera)
add_subdirectory(controllers)
add_subdirectory(estimators)
Expand All @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion src/colmap/controllers/automatic_reconstruction.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion src/colmap/controllers/bundle_adjustment.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
4 changes: 2 additions & 2 deletions src/colmap/controllers/hierarchical_mapper.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions src/colmap/controllers/hierarchical_mapper.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@

#pragma once

#include "colmap/base/reconstruction_manager.h"
#include "colmap/base/scene_clustering.h"
#include "colmap/controllers/incremental_mapper.h"
#include "colmap/scene/reconstruction_manager.h"
#include "colmap/scene/scene_clustering.h"
#include "colmap/util/threading.h"

#include <memory>
Expand Down
4 changes: 2 additions & 2 deletions src/colmap/controllers/hierarchical_mapper_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 <gtest/gtest.h>
Expand Down
2 changes: 1 addition & 1 deletion src/colmap/controllers/incremental_mapper.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
4 changes: 2 additions & 2 deletions src/colmap/controllers/incremental_mapper_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 <gtest/gtest.h>
Expand Down
4 changes: 2 additions & 2 deletions src/colmap/estimators/bundle_adjustment.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 <memory>
#include <unordered_set>
Expand Down
2 changes: 1 addition & 1 deletion src/colmap/estimators/bundle_adjustment_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@

#include "colmap/estimators/bundle_adjustment.h"

#include "colmap/base/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 <gtest/gtest.h>

Expand Down
2 changes: 1 addition & 1 deletion src/colmap/estimators/coordinate_frame.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@

#pragma once

#include "colmap/base/reconstruction.h"
#include "colmap/scene/reconstruction.h"

#include <Eigen/Core>

Expand Down
2 changes: 1 addition & 1 deletion src/colmap/estimators/pose.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@

#pragma once

#include "colmap/base/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"
Expand Down
2 changes: 1 addition & 1 deletion src/colmap/estimators/triangulation.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@

#pragma once

#include "colmap/base/camera.h"
#include "colmap/math/math.h"
#include "colmap/optim/ransac.h"
#include "colmap/scene/camera.h"
#include "colmap/util/types.h"

#include <vector>
Expand Down
2 changes: 1 addition & 1 deletion src/colmap/estimators/two_view_geometry.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@

#include "colmap/estimators/two_view_geometry.h"

#include "colmap/base/camera.h"
#include "colmap/estimators/essential_matrix.h"
#include "colmap/estimators/fundamental_matrix.h"
#include "colmap/estimators/homography_matrix.h"
Expand All @@ -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 <unordered_set>

Expand Down
2 changes: 1 addition & 1 deletion src/colmap/estimators/two_view_geometry.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@

#pragma once

#include "colmap/base/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 {
Expand Down
2 changes: 1 addition & 1 deletion src/colmap/exe/database.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion src/colmap/exe/image.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@

#include "colmap/exe/image.h"

#include "colmap/base/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"
Expand Down
2 changes: 1 addition & 1 deletion 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/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"
Expand Down
2 changes: 1 addition & 1 deletion src/colmap/exe/mvs.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/mvs.h"

#include "colmap/base/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"

Expand Down
2 changes: 1 addition & 1 deletion src/colmap/exe/sfm.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,11 @@

#include "colmap/exe/sfm.h"

#include "colmap/base/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"
Expand Down
2 changes: 1 addition & 1 deletion src/colmap/exe/sfm.h
DF7A
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@

#pragma once

#include "colmap/base/reconstruction.h"
#include "colmap/controllers/incremental_mapper.h"
#include "colmap/scene/reconstruction.h"

namespace colmap {

Expand Down
2 changes: 1 addition & 1 deletion src/colmap/exe/vocab_tree.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,12 @@

#include "colmap/exe/vocab_tree.h"

#include "colmap/base/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"
Expand Down
Loading
0