Commit eeb52678 authored by Patrik Huber's avatar Patrik Huber

Using init-list in c'tor, added getters

Fixed previously uninitialised screen_width/height in constructor from ScaledOrthoProjectionParameters

These changes are for the closest edge fitting.
parent 44df7039
...@@ -125,18 +125,19 @@ public: ...@@ -125,18 +125,19 @@ public:
}; };
// This assumes estimate_sop was run on points with OpenCV viewport! I.e. y flipped. // This assumes estimate_sop was run on points with OpenCV viewport! I.e. y flipped.
RenderingParameters(ScaledOrthoProjectionParameters ortho_params, int image_width, int image_height) { RenderingParameters(ScaledOrthoProjectionParameters ortho_params, int screen_width, int screen_height) : camera_type(CameraType::Orthographic), t_x(ortho_params.tx), t_y(ortho_params.ty), screen_width(screen_width), screen_height(screen_height) {
camera_type = CameraType::Orthographic;
rotation = glm::quat(ortho_params.R); rotation = glm::quat(ortho_params.R);
t_x = ortho_params.tx;
t_y = ortho_params.ty;
const auto l = 0.0; const auto l = 0.0;
const auto r = image_width / ortho_params.s; const auto r = screen_width / ortho_params.s;
const auto b = 0.0; // The b and t values are not tested for what happens if the SOP parameters const auto b = 0.0; // The b and t values are not tested for what happens if the SOP parameters
const auto t = image_height / ortho_params.s; // were estimated on a non-flipped viewport. const auto t = screen_height / ortho_params.s; // were estimated on a non-flipped viewport.
frustum = Frustum(l, r, b, t); frustum = Frustum(l, r, b, t);
}; };
auto get_camera_type() const {
return camera_type;
};
glm::quat get_rotation() const { glm::quat get_rotation() const {
return rotation; return rotation;
}; };
...@@ -158,6 +159,18 @@ public: ...@@ -158,6 +159,18 @@ public:
} }
}; };
Frustum get_frustum() const {
return frustum;
};
int get_screen_width() const {
return screen_width;
};
int get_screen_height() const {
return screen_height;
};
private: private:
CameraType camera_type = CameraType::Orthographic; CameraType camera_type = CameraType::Orthographic;
Frustum frustum; // Can construct a glm::ortho or glm::perspective matrix from this. Frustum frustum; // Can construct a glm::ortho or glm::perspective matrix from this.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment