diff options
Diffstat (limited to 'intern/libmv/libmv/simple_pipeline/reconstruction.h')
-rw-r--r-- | intern/libmv/libmv/simple_pipeline/reconstruction.h | 41 |
1 files changed, 21 insertions, 20 deletions
diff --git a/intern/libmv/libmv/simple_pipeline/reconstruction.h b/intern/libmv/libmv/simple_pipeline/reconstruction.h index 544aeac042e..56b2ba34c91 100644 --- a/intern/libmv/libmv/simple_pipeline/reconstruction.h +++ b/intern/libmv/libmv/simple_pipeline/reconstruction.h @@ -21,14 +21,15 @@ #ifndef LIBMV_SIMPLE_PIPELINE_RECONSTRUCTION_H_ #define LIBMV_SIMPLE_PIPELINE_RECONSTRUCTION_H_ -#include "libmv/base/vector.h" #include "libmv/base/map.h" +#include "libmv/base/vector.h" #include "libmv/numeric/numeric.h" namespace libmv { /*! - A EuclideanCamera is the location and rotation of the camera viewing \a image. + A EuclideanCamera is the location and rotation of the camera viewing \a + image. \a image identify which image from \link Tracks this camera represents. \a R is a 3x3 matrix representing the rotation of the camera. @@ -38,7 +39,7 @@ namespace libmv { */ struct EuclideanCamera { EuclideanCamera() : image(-1) {} - EuclideanCamera(const EuclideanCamera &c) : image(c.image), R(c.R), t(c.t) {} + EuclideanCamera(const EuclideanCamera& c) : image(c.image), R(c.R), t(c.t) {} int image; Mat3 R; @@ -55,7 +56,7 @@ struct EuclideanCamera { */ struct EuclideanPoint { EuclideanPoint() : track(-1) {} - EuclideanPoint(const EuclideanPoint &p) : track(p.track), X(p.X) {} + EuclideanPoint(const EuclideanPoint& p) : track(p.track), X(p.X) {} int track; Vec3 X; }; @@ -78,9 +79,9 @@ class EuclideanReconstruction { EuclideanReconstruction(); /// Copy constructor. - EuclideanReconstruction(const EuclideanReconstruction &other); + EuclideanReconstruction(const EuclideanReconstruction& other); - EuclideanReconstruction &operator=(const EuclideanReconstruction &other); + EuclideanReconstruction& operator=(const EuclideanReconstruction& other); /*! Insert a camera into the set. If there is already a camera for the given @@ -92,7 +93,7 @@ class EuclideanReconstruction { \note You should use the same \a image identifier as in \link Tracks. */ - void InsertCamera(int image, const Mat3 &R, const Vec3 &t); + void InsertCamera(int image, const Mat3& R, const Vec3& t); /*! Insert a point into the reconstruction. If there is already a point for @@ -104,18 +105,18 @@ class EuclideanReconstruction { \note You should use the same \a track identifier as in \link Tracks. */ - void InsertPoint(int track, const Vec3 &X); + void InsertPoint(int track, const Vec3& X); /// Returns a pointer to the camera corresponding to \a image. - EuclideanCamera *CameraForImage(int image); - const EuclideanCamera *CameraForImage(int image) const; + EuclideanCamera* CameraForImage(int image); + const EuclideanCamera* CameraForImage(int image) const; /// Returns all cameras. vector<EuclideanCamera> AllCameras() const; /// Returns a pointer to the point corresponding to \a track. - EuclideanPoint *PointForTrack(int track); - const EuclideanPoint *PointForTrack(int track) const; + EuclideanPoint* PointForTrack(int track); + const EuclideanPoint* PointForTrack(int track) const; /// Returns all points. vector<EuclideanPoint> AllPoints() const; @@ -139,7 +140,7 @@ class EuclideanReconstruction { */ struct ProjectiveCamera { ProjectiveCamera() : image(-1) {} - ProjectiveCamera(const ProjectiveCamera &c) : image(c.image), P(c.P) {} + ProjectiveCamera(const ProjectiveCamera& c) : image(c.image), P(c.P) {} int image; Mat34 P; @@ -155,7 +156,7 @@ struct ProjectiveCamera { */ struct ProjectivePoint { ProjectivePoint() : track(-1) {} - ProjectivePoint(const ProjectivePoint &p) : track(p.track), X(p.X) {} + ProjectivePoint(const ProjectivePoint& p) : track(p.track), X(p.X) {} int track; Vec4 X; }; @@ -184,7 +185,7 @@ class ProjectiveReconstruction { \note You should use the same \a image identifier as in \link Tracks. */ - void InsertCamera(int image, const Mat34 &P); + void InsertCamera(int image, const Mat34& P); /*! Insert a point into the reconstruction. If there is already a point for @@ -196,18 +197,18 @@ class ProjectiveReconstruction { \note You should use the same \a track identifier as in \link Tracks. */ - void InsertPoint(int track, const Vec4 &X); + void InsertPoint(int track, const Vec4& X); /// Returns a pointer to the camera corresponding to \a image. - ProjectiveCamera *CameraForImage(int image); - const ProjectiveCamera *CameraForImage(int image) const; + ProjectiveCamera* CameraForImage(int image); + const ProjectiveCamera* CameraForImage(int image) const; /// Returns all cameras. vector<ProjectiveCamera> AllCameras() const; /// Returns a pointer to the point corresponding to \a track. - ProjectivePoint *PointForTrack(int track); - const ProjectivePoint *PointForTrack(int track) const; + ProjectivePoint* PointForTrack(int track); + const ProjectivePoint* PointForTrack(int track) const; /// Returns all points. vector<ProjectivePoint> AllPoints() const; |