Skip to content
Snippets Groups Projects
Commit d4f86dc5 authored by Sebastian Hahta's avatar Sebastian Hahta
Browse files

disable zoom/pan in camera3d

parent 8bca20f8
No related branches found
No related tags found
1 merge request!316Resolves #343 GUI and Frame Refactor
Pipeline #28147 passed
......@@ -16,7 +16,9 @@ static Eigen::Affine3d create_rotation_matrix(float ax, float ay, float az) {
// ==== CameraView3D ===========================================================
CameraView3D::CameraView3D(ftl::gui2::Screen *parent, ftl::gui2::Camera *ctrl) : CameraView(parent, ctrl) {
CameraView3D::CameraView3D(ftl::gui2::Screen *parent, ftl::gui2::Camera *ctrl) :
CameraView(parent, ctrl) {
eye_ = Eigen::Vector3d::Zero();
neye_ = Eigen::Vector4d::Zero();
rotmat_.setIdentity();
......@@ -27,6 +29,9 @@ CameraView3D::CameraView3D(ftl::gui2::Screen *parent, ftl::gui2::Camera *ctrl) :
ftime_ = 0.0;
delta_ = 0.0;
lerp_speed_ = 0.999f;
imview_->setFixedScale(true);
imview_->setFixedOffset(true);
}
bool CameraView3D::keyboardEvent(int key, int scancode, int action, int modifiers) {
......@@ -99,3 +104,8 @@ Eigen::Matrix4d CameraView3D::getUpdatedPose() {
Eigen::Affine3d t(trans);
return t.matrix() * rotmat_;
}
void CameraView3D::draw(NVGcontext* ctx) {
imview_->fit(); // TODO: should be moved to ::performLayout(ctx)?
CameraView::draw(ctx);
}
......@@ -18,6 +18,8 @@ public:
virtual bool mouseMotionEvent(const Eigen::Vector2i &p, const Eigen::Vector2i &rel, int button, int modifiers) override;
virtual bool mouseButtonEvent(const Eigen::Vector2i &p, int button, bool down, int modifiers) override;
virtual void draw(NVGcontext* ctx) override;
Eigen::Matrix4d getUpdatedPose();
protected:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment