Skip to content

Commit 32ea99c

Browse files
authored
Update (#11)
1 parent 6b567ef commit 32ea99c

29 files changed

+4103
-3012
lines changed

.buildinfo

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# Sphinx build info version 1
22
# This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
3-
config: 7ecbe026126241ce4cdf145a49680b0e
3+
config: ee05e8cf3f65935f592597f6844d6280
44
tags: 645f666f9bcd5a90fca523b33c5a78b7

_sources/cameras.rst.txt

+18-18
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,24 @@ COLMAP implements different camera models of varying complexity. If no intrinsic
55
parameters are known a priori, it is generally best to use the simplest camera
66
model that is complex enough to model the distortion effects:
77

8-
- ``SIMPLE_PINHOLE``, ``PINHOLE``: Use these camera models,
9-
if your images are undistorted a priori. These use one and two focal length
10-
parameters, respectively. Note that even in the case of undistorted images,
11-
COLMAP could try to improve the intrinsics with a more complex camera model.
12-
- ``SIMPLE_RADIAL``, ``RADIAL``: This should be the camera model of choice,
13-
if the intrinsics are unknown and every image has a different camera
14-
calibration, e.g., in the case of Internet photos. Both models are simplified
15-
versions of the ``OPENCV`` model only modeling radial distortion
16-
effects with one and two parameters, respectively.
17-
- ``OPENCV``, ``FULL_OPENCV``: Use these camera models, if
18-
you know the calibration parameters a priori. You can also try to let COLMAP
19-
estimate the parameters, if you share the intrinsics for multiple images. Note
20-
that the automatic estimation of parameters will most likely fail, if every
21-
image has a separate set of intrinsic parameters.
22-
- ``SIMPLE_RADIAL_FISHEYE``, ``RADIAL_FISHEYE``, ``OPENCV_FISHEYE``, ``FOV``,
23-
``THIN_PRISM_FISHEYE``: Use these camera models for fisheye lenses
24-
and note that all other models are not really capable of modeling the
25-
distortion effects of fisheye lenses. The ``FOV`` model is used by
8+
- `SIMPLE_PINHOLE`, `PINHOLE`: Use these camera models, if your images are
9+
undistorted a priori. These use one and two focal length parameters,
10+
respectively. Note that even in the case of undistorted images, COLMAP could
11+
try to improve the intrinsics with a more complex camera model.
12+
- `SIMPLE_RADIAL`, `RADIAL`: This should be the camera model of choice, if the
13+
intrinsics are unknown and every image has a different camera calibration,
14+
e.g., in the case of Internet photos. Both models are simplified versions of
15+
the `OPENCV` model only modeling radial distortion effects with one and two
16+
parameters, respectively.
17+
- `OPENCV`, `FULL_OPENCV`: Use these camera models, if you know the calibration
18+
parameters a priori. You can also try to let COLMAP estimate the parameters,
19+
if you share the intrinsics for multiple images. Note that the automatic
20+
estimation of parameters will most likely fail, if every image has a separate
21+
set of intrinsic parameters.
22+
- `SIMPLE_RADIAL_FISHEYE`, `RADIAL_FISHEYE`, `OPENCV_FISHEYE`, `FOV`,
23+
`THIN_PRISM_FISHEYE`, `RAD_TAN_THIN_PRISM_FISHEYE`: Use these camera models
24+
for fisheye lenses and note that all other models are not really capable of
25+
modeling the distortion effects of fisheye lenses. The `FOV` model is used by
2626
Google Project Tango (make sure to not initialize `omega` to zero).
2727

2828
You can inspect the estimated intrinsic parameters by double-clicking specific

_sources/changelog.rst.txt

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
11
.. _changelog:
22

3-
Changelog
4-
=========
5-
6-
.. include:: ../CHANGELOG.txt
3+
.. include:: ../CHANGELOG.rst

_sources/index.rst.txt

+15-5
Original file line numberDiff line numberDiff line change
@@ -82,11 +82,21 @@ for bug reports, feature requests/additions, etc.
8282
Acknowledgments
8383
---------------
8484

85-
The library was originally written by `Johannes L. Schönberger
86-
<https://demuc.de/>`_ with funding provided by his PhD advisors Jan-Michael
87-
Frahm and Marc Pollefeys. Since then the project has benefited from countless
88-
community contributions, including bug fixes, improvements, new features,
89-
third-party tooling, and community support.
85+
COLMAP was originally written by `Johannes Schönberger <https://demuc.de/>`__ with
86+
funding provided by his PhD advisors Jan-Michael Frahm and Marc Pollefeys.
87+
The team of core project maintainers currently includes
88+
`Johannes Schönberger <https://github.com/ahojnnes>`__,
89+
`Paul-Edouard Sarlin <https://github.com/sarlinpe>`_, and
90+
`Shaohui Liu <https://github.com/B1ueber2y>`_.
91+
92+
The Python bindings in PyCOLMAP were originally added by
93+
`Mihai Dusmanu <https://github.com/mihaidusmanu>`_,
94+
`Philipp Lindenberger <https://github.com/Phil26AT>`_, and
95+
`Paul-Edouard Sarlin <https://github.com/sarlinpe>`_.
96+
97+
The project has also benefitted from countless community contributions, including
98+
bug fixes, improvements, new features, third-party tooling, and community
99+
support (special credits to `Torsten Sattler <https://tsattler.github.io>`_).
90100

91101

92102
.. toctree::

_sources/install.rst.txt

+11-18
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,16 @@ Installation
55

66
You can either download one of the pre-built binaries or build the source code
77
manually. Pre-built binaries and other resources can be downloaded from
8-
https://demuc.de/colmap/. An overview of system packages for Linux/Unix/BSD
9-
distributions are available at https://repology.org/metapackage/colmap/versions.
10-
Note that the COLMAP packages in the default repositories for Linux/Unix/BSD do
11-
not come with CUDA support, which requires a manual build from source.
8+
https://demuc.de/colmap/.
9+
10+
An overview of system packages for Linux/Unix/BSD distributions are available at
11+
https://repology.org/metapackage/colmap/versions. Note that the COLMAP packages
12+
in the default repositories for Linux/Unix/BSD do not come with CUDA support,
13+
which requires a manual build from source, as explained further below.
14+
15+
For Mac users, `Homebrew <https://brew.sh>`__ provides a formula for COLMAP with
16+
pre-compiled binaries or the option to build from source. After installing
17+
homebrew, installing COLMAP is as easy as running `brew install colmap`.
1218

1319
COLMAP can be used as an independent application through the command-line or
1420
graphical user interface. Alternatively, COLMAP is also built as a reusable
@@ -35,18 +41,6 @@ are not officially signed. The provided COLMAP binaries are automatically built
3541
from GitHub Actions CI machines. If you do not trust them, you can build from
3642
source as described below.
3743

38-
Mac
39-
---
40-
41-
The pre-built application package for Mac contains both the GUI and command-line
42-
version of COLMAP. To open the GUI, simply open the application. Note that
43-
COLMAP is shipped as an unsigned application, i.e., when your first open the
44-
application, you have to right-click the application and select *Open* and then
45-
accept to trust the application. In the future, you can then simply double-click
46-
the application to open COLMAP. The command-line interface is accessible by
47-
running the packaged binary ``COLMAP.app/Contents/MacOS/colmap``. To list the
48-
available COLMAP commands, run ``COLMAP.app/Contents/MacOS/colmap -h``.
49-
5044

5145
-----------------
5246
Build from Source
@@ -78,7 +72,6 @@ Dependencies from the default Ubuntu repositories::
7872
ninja-build \
7973
build-essential \
8074
libboost-program-options-dev \
81-
libboost-filesystem-dev \
8275
libboost-graph-dev \
8376
libboost-system-dev \
8477
libeigen3-dev \
@@ -138,7 +131,7 @@ CUDA package and GCC, and you must compile against GCC 10::
138131
Mac
139132
---
140133

141-
Dependencies from `Homebrew <http://brew.sh/>`_::
134+
Dependencies from `Homebrew <http://brew.sh/>`__::
142135

143136
brew install \
144137
cmake \

_sources/tutorial.rst.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@ Feature Matching and Geometric Verification
277277
In the second step, feature matching and geometric verification finds
278278
correspondences between the feature points in different images.
279279

280-
Please, choose ``Processing > Match features`` and select one of the provided
280+
Please, choose ``Processing > Feature matching`` and select one of the provided
281281
matching modes, that are intended for different input scenarios:
282282

283283
- **Exhaustive Matching**: If the number of images in your dataset is

_static/documentation_options.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
const DOCUMENTATION_OPTIONS = {
2-
VERSION: '3.11.0.dev0',
2+
VERSION: '3.12.0.dev0',
33
LANGUAGE: 'en',
44
COLLAPSE_INDEX: false,
55
BUILDER: 'html',

bibliography.html

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<meta charset="utf-8" /><meta name="viewport" content="width=device-width, initial-scale=1" />
55

66
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
7-
<title>Bibliography &mdash; COLMAP 3.11.0.dev0 documentation</title>
7+
<title>Bibliography &mdash; COLMAP 3.12.0.dev0 documentation</title>
88
<link rel="stylesheet" type="text/css" href="_static/pygments.css?v=fa44fd50" />
99
<link rel="stylesheet" type="text/css" href="_static/css/theme.css?v=19f00094" />
1010
<link rel="stylesheet" type="text/css" href="_static/custom.css?v=4eec7147" />
@@ -16,7 +16,7 @@
1616

1717
<script src="_static/jquery.js?v=5d32c60e"></script>
1818
<script src="_static/_sphinx_javascript_frameworks_compat.js?v=2cd50e6c"></script>
19-
<script src="_static/documentation_options.js?v=bf522350"></script>
19+
<script src="_static/documentation_options.js?v=3a07dcc1"></script>
2020
<script src="_static/doctools.js?v=9a2dae69"></script>
2121
<script src="_static/sphinx_highlight.js?v=dc90522c"></script>
2222
<script src="_static/js/theme.js"></script>
@@ -37,7 +37,7 @@
3737
COLMAP
3838
</a>
3939
<div class="version">
40-
3.11.0.dev0
40+
3.12.0.dev0
4141
</div>
4242
<div role="search">
4343
<form id="rtd-search-form" class="wy-form" action="search.html" method="get">

cameras.html

+21-21
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<meta charset="utf-8" /><meta name="viewport" content="width=device-width, initial-scale=1" />
55

66
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
7-
<title>Camera Models &mdash; COLMAP 3.11.0.dev0 documentation</title>
7+
<title>Camera Models &mdash; COLMAP 3.12.0.dev0 documentation</title>
88
<link rel="stylesheet" type="text/css" href="_static/pygments.css?v=fa44fd50" />
99
<link rel="stylesheet" type="text/css" href="_static/css/theme.css?v=19f00094" />
1010
<link rel="stylesheet" type="text/css" href="_static/custom.css?v=4eec7147" />
@@ -16,7 +16,7 @@
1616

1717
<script src="_static/jquery.js?v=5d32c60e"></script>
1818
<script src="_static/_sphinx_javascript_frameworks_compat.js?v=2cd50e6c"></script>
19-
<script src="_static/documentation_options.js?v=bf522350"></script>
19+
<script src="_static/documentation_options.js?v=3a07dcc1"></script>
2020
<script src="_static/doctools.js?v=9a2dae69"></script>
2121
<script src="_static/sphinx_highlight.js?v=dc90522c"></script>
2222
<script src="_static/js/theme.js"></script>
@@ -38,7 +38,7 @@
3838
COLMAP
3939
</a>
4040
<div class="version">
41-
3.11.0.dev0
41+
3.12.0.dev0
4242
</div>
4343
<div role="search">
4444
<form id="rtd-search-form" class="wy-form" action="search.html" method="get">
@@ -95,24 +95,24 @@ <h1>Camera Models<a class="headerlink" href="#camera-models" title="Link to this
9595
parameters are known a priori, it is generally best to use the simplest camera
9696
model that is complex enough to model the distortion effects:</p>
9797
<ul class="simple">
98-
<li><p><code class="docutils literal notranslate"><span class="pre">SIMPLE_PINHOLE</span></code>, <code class="docutils literal notranslate"><span class="pre">PINHOLE</span></code>: Use these camera models,
99-
if your images are undistorted a priori. These use one and two focal length
100-
parameters, respectively. Note that even in the case of undistorted images,
101-
COLMAP could try to improve the intrinsics with a more complex camera model.</p></li>
102-
<li><p><code class="docutils literal notranslate"><span class="pre">SIMPLE_RADIAL</span></code>, <code class="docutils literal notranslate"><span class="pre">RADIAL</span></code>: This should be the camera model of choice,
103-
if the intrinsics are unknown and every image has a different camera
104-
calibration, e.g., in the case of Internet photos. Both models are simplified
105-
versions of the <code class="docutils literal notranslate"><span class="pre">OPENCV</span></code> model only modeling radial distortion
106-
effects with one and two parameters, respectively.</p></li>
107-
<li><p><code class="docutils literal notranslate"><span class="pre">OPENCV</span></code>, <code class="docutils literal notranslate"><span class="pre">FULL_OPENCV</span></code>: Use these camera models, if
108-
you know the calibration parameters a priori. You can also try to let COLMAP
109-
estimate the parameters, if you share the intrinsics for multiple images. Note
110-
that the automatic estimation of parameters will most likely fail, if every
111-
image has a separate set of intrinsic parameters.</p></li>
112-
<li><p><code class="docutils literal notranslate"><span class="pre">SIMPLE_RADIAL_FISHEYE</span></code>, <code class="docutils literal notranslate"><span class="pre">RADIAL_FISHEYE</span></code>, <code class="docutils literal notranslate"><span class="pre">OPENCV_FISHEYE</span></code>, <code class="docutils literal notranslate"><span class="pre">FOV</span></code>,
113-
<code class="docutils literal notranslate"><span class="pre">THIN_PRISM_FISHEYE</span></code>: Use these camera models for fisheye lenses
114-
and note that all other models are not really capable of modeling the
115-
distortion effects of fisheye lenses. The <code class="docutils literal notranslate"><span class="pre">FOV</span></code> model is used by
98+
<li><p><cite>SIMPLE_PINHOLE</cite>, <cite>PINHOLE</cite>: Use these camera models, if your images are
99+
undistorted a priori. These use one and two focal length parameters,
100+
respectively. Note that even in the case of undistorted images, COLMAP could
101+
try to improve the intrinsics with a more complex camera model.</p></li>
102+
<li><p><cite>SIMPLE_RADIAL</cite>, <cite>RADIAL</cite>: This should be the camera model of choice, if the
103+
intrinsics are unknown and every image has a different camera calibration,
104+
e.g., in the case of Internet photos. Both models are simplified versions of
105+
the <cite>OPENCV</cite> model only modeling radial distortion effects with one and two
106+
parameters, respectively.</p></li>
107+
<li><p><cite>OPENCV</cite>, <cite>FULL_OPENCV</cite>: Use these camera models, if you know the calibration
108+
parameters a priori. You can also try to let COLMAP estimate the parameters,
109+
if you share the intrinsics for multiple images. Note that the automatic
110+
estimation of parameters will most likely fail, if every image has a separate
111+
set of intrinsic parameters.</p></li>
112+
<li><p><cite>SIMPLE_RADIAL_FISHEYE</cite>, <cite>RADIAL_FISHEYE</cite>, <cite>OPENCV_FISHEYE</cite>, <cite>FOV</cite>,
113+
<cite>THIN_PRISM_FISHEYE</cite>, <cite>RAD_TAN_THIN_PRISM_FISHEYE</cite>: Use these camera models
114+
for fisheye lenses and note that all other models are not really capable of
115+
modeling the distortion effects of fisheye lenses. The <cite>FOV</cite> model is used by
116116
Google Project Tango (make sure to not initialize <cite>omega</cite> to zero).</p></li>
117117
</ul>
118118
<p>You can inspect the estimated intrinsic parameters by double-clicking specific

0 commit comments

Comments
 (0)