Skip to content

Commit 78a79e4

Browse files
Jesus Brialesmeta-codesync[bot]
authored andcommitted
Use terse Eigen aliases for small Vectors
Summary: Execute T250116725 (Use terse Eigen aliases for small Vectors and square-Matrices) on arvr/projects/ariane/. # Why: Makes code terser. # Context: It seems `Eigen::Vector3<Scalar>` is a thing (also for sizes 2,4 and small square matrices). Terser and closer to `Eigen::Vector3{f/d}` we use when not templated. Reviewed By: aforster Differential Revision: D89955586 fbshipit-source-id: e1d5a52d6bd9c393264d5d3f14e4e5b13eea9d88
1 parent 399158a commit 78a79e4

3 files changed

Lines changed: 15 additions & 15 deletions

File tree

core/calibration/camera_projections/CameraProjection.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -92,9 +92,9 @@ int CameraProjectionTemplated<Scalar>::numDistortionParameters() const {
9292
}
9393

9494
template <typename Scalar>
95-
Eigen::Vector<Scalar, 2> CameraProjectionTemplated<Scalar>::getFocalLengths() const {
95+
Eigen::Vector2<Scalar> CameraProjectionTemplated<Scalar>::getFocalLengths() const {
9696
return std::visit(
97-
[this](auto&& projection) -> Eigen::Vector<Scalar, 2> {
97+
[this](auto&& projection) -> Eigen::Vector2<Scalar> {
9898
using T = std::decay_t<decltype(projection)>;
9999
int focalXIdx = T::kFocalXIdx;
100100
int focalYIdx = T::kFocalYIdx;
@@ -104,9 +104,9 @@ Eigen::Vector<Scalar, 2> CameraProjectionTemplated<Scalar>::getFocalLengths() co
104104
}
105105

106106
template <typename Scalar>
107-
Eigen::Vector<Scalar, 2> CameraProjectionTemplated<Scalar>::getPrincipalPoint() const {
107+
Eigen::Vector2<Scalar> CameraProjectionTemplated<Scalar>::getPrincipalPoint() const {
108108
return std::visit(
109-
[this](auto&& projection) -> Eigen::Vector<Scalar, 2> {
109+
[this](auto&& projection) -> Eigen::Vector2<Scalar> {
110110
using T = std::decay_t<decltype(projection)>;
111111
int principalPointColIdx = T::kPrincipalPointColIdx;
112112
int principalPointRowIdx = T::kPrincipalPointRowIdx;
@@ -116,8 +116,8 @@ Eigen::Vector<Scalar, 2> CameraProjectionTemplated<Scalar>::getPrincipalPoint()
116116
}
117117

118118
template <typename Scalar>
119-
Eigen::Vector<Scalar, 2> CameraProjectionTemplated<Scalar>::project(
120-
const Eigen::Vector<Scalar, 3>& pointInCamera,
119+
Eigen::Vector2<Scalar> CameraProjectionTemplated<Scalar>::project(
120+
const Eigen::Vector3<Scalar>& pointInCamera,
121121
Eigen::Ref<Eigen::Matrix<Scalar, 2, 3>> jacobianWrtPoint,
122122
Eigen::Ref<Eigen::Matrix<Scalar, 2, Eigen::Dynamic>> jacobianWrtParams) const {
123123
return std::visit(
@@ -133,8 +133,8 @@ Eigen::Vector<Scalar, 2> CameraProjectionTemplated<Scalar>::project(
133133
}
134134

135135
template <typename Scalar>
136-
Eigen::Vector<Scalar, 3> CameraProjectionTemplated<Scalar>::unproject(
137-
const Eigen::Vector<Scalar, 2>& cameraPixel) const {
136+
Eigen::Vector3<Scalar> CameraProjectionTemplated<Scalar>::unproject(
137+
const Eigen::Vector2<Scalar>& cameraPixel) const {
138138
return std::visit(
139139
[&](auto&& projection) {
140140
using T = std::decay_t<decltype(projection)>;

core/calibration/camera_projections/CameraProjection.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -102,25 +102,25 @@ struct CameraProjectionTemplated {
102102
*
103103
* @return The 2D pixel coordinates of the projected point in the image space.
104104
*/
105-
Eigen::Vector<Scalar, 2> project(
106-
const Eigen::Vector<Scalar, 3>& pointInCamera,
105+
Eigen::Vector2<Scalar> project(
106+
const Eigen::Vector3<Scalar>& pointInCamera,
107107
Eigen::Ref<Eigen::Matrix<Scalar, 2, 3>> jacobianWrtPoint = NullRef(),
108108
Eigen::Ref<Eigen::Matrix<Scalar, 2, Eigen::Dynamic>> jacobianWrtParams = NullRef()) const;
109109

110110
/**
111111
* @brief unprojects a 2d pixel in the image space to a 3d world point in homogenous coordinate.
112112
* No checks performed in this process.
113113
*/
114-
Eigen::Vector<Scalar, 3> unproject(const Eigen::Vector<Scalar, 2>& cameraPixel) const;
114+
Eigen::Vector3<Scalar> unproject(const Eigen::Vector2<Scalar>& cameraPixel) const;
115115

116116
/**
117117
* @brief returns principal point location as {cx, cy}
118118
*/
119-
Eigen::Vector<Scalar, 2> getPrincipalPoint() const;
119+
Eigen::Vector2<Scalar> getPrincipalPoint() const;
120120
/**
121121
* @brief returns focal lengths as {fx, fy}
122122
*/
123-
Eigen::Vector<Scalar, 2> getFocalLengths() const;
123+
Eigen::Vector2<Scalar> getFocalLengths() const;
124124

125125
/**
126126
* @brief scales the projection parameters as the image scales without the offset changing

core/image/Image.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -208,8 +208,8 @@ struct Zero<Eigen::Matrix<T, M, N, Opts>> {
208208
} // namespace
209209

210210
template <typename Scalar, std::enable_if_t<std::is_floating_point<Scalar>::value, int> = 0>
211-
Eigen::Vector<Scalar, 2> imageCenter(size_t imageWidth, size_t imageHeight) {
212-
return Eigen::Vector<Scalar, 2>{
211+
Eigen::Vector2<Scalar> imageCenter(size_t imageWidth, size_t imageHeight) {
212+
return Eigen::Vector2<Scalar>{
213213
static_cast<Scalar>(imageWidth) / Scalar(2.0) - Scalar(0.5),
214214
static_cast<Scalar>(imageHeight) / Scalar(2.0) - Scalar(0.5)};
215215
}

0 commit comments

Comments
 (0)