From 445a45b75618fd68a52daac74fb8844c7957430f Mon Sep 17 00:00:00 2001 From: Brian Chen Date: Fri, 22 Jul 2022 11:51:26 -0700 Subject: [PATCH] make projection a sibling to intrinsics Signed-off-by: Brian Chen --- src/Camera.cc | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/src/Camera.cc b/src/Camera.cc index 79ff0c7f2..c089810d4 100644 --- a/src/Camera.cc +++ b/src/Camera.cc @@ -402,18 +402,23 @@ Errors Camera::Load(ElementPtr _sdf) this->dataPtr->lensIntrinsicsCy).first; this->dataPtr->lensIntrinsicsS = intrinsics->Get("s", this->dataPtr->lensIntrinsicsS).first; - this->dataPtr->lensProjectionFx = intrinsics->Get("p_fx", + } + + if (elem->HasElement("projection")) { + sdf::ElementPtr projection = elem->GetElement("projection"); + this->dataPtr->lensProjectionFx = projection->Get("p_fx", this->dataPtr->lensProjectionFx).first; - this->dataPtr->lensProjectionFy = intrinsics->Get("p_fy", + this->dataPtr->lensProjectionFy = projection->Get("p_fy", this->dataPtr->lensProjectionFy).first; - this->dataPtr->lensProjectionCx = intrinsics->Get("p_cx", + this->dataPtr->lensProjectionCx = projection->Get("p_cx", this->dataPtr->lensProjectionCx).first; - this->dataPtr->lensProjectionCy = intrinsics->Get("p_cy", + this->dataPtr->lensProjectionCy = projection->Get("p_cy", this->dataPtr->lensProjectionCy).first; - this->dataPtr->lensProjectionTx = intrinsics->Get("tx", + this->dataPtr->lensProjectionTx = projection->Get("tx", this->dataPtr->lensProjectionTx).first; - this->dataPtr->lensProjectionTy = intrinsics->Get("ty", + this->dataPtr->lensProjectionTy = projection->Get("ty", this->dataPtr->lensProjectionTy).first; + } }