eessppeelllloo/vimix
1
0
Fork 0
mirror of https://github.com/brunoherbelin/vimix.git synced 2025-12-14 19:59:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

BugFix Preview overlay on crop action in Geometry

Browse Source
This commit is contained in:
Bruno Herbelin
2024-11-10 14:38:22 +01:00
parent 120909f8d6
commit 803231c558
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/GeometryView.cpp
View File

@@ -1019,8 +1019,8 @@ View::Cursor GeometryView::grab (Source *s, glm::vec2 from, glm::vec2 to, std::p
// prepare overlay frame showing full image size // prepare overlay frame showing full image size
glm::vec3 _c_s = glm::vec3(s->stored_status_->crop_[0] glm::vec3 _c_s = glm::vec3(s->stored_status_->crop_[0]
- s->stored_status_->crop_[1], - s->stored_status_->crop_[1],
s->stored_status_->crop_[3] s->stored_status_->crop_[2]
- s->stored_status_->crop_[2], - s->stored_status_->crop_[3],
2.f) 2.f)
* 0.5f; * 0.5f;
overlay_crop_->scale_ = s->stored_status_->scale_ / _c_s; overlay_crop_->scale_ = s->stored_status_->scale_ / _c_s;
@@ -1028,7 +1028,7 @@ View::Cursor GeometryView::grab (Source *s, glm::vec2 from, glm::vec2 to, std::p
overlay_crop_->rotation_.z = s->stored_status_->rotation_.z; overlay_crop_->rotation_.z = s->stored_status_->rotation_.z;
overlay_crop_->translation_ = s->stored_status_->translation_; overlay_crop_->translation_ = s->stored_status_->translation_;
glm::vec3 _t((s->stored_status_->crop_[1] + _c_s.x) * overlay_crop_->scale_.x, glm::vec3 _t((s->stored_status_->crop_[1] + _c_s.x) * overlay_crop_->scale_.x,
-s->stored_status_->crop_[3] + _c_s.y, 0.f); (-s->stored_status_->crop_[2] + _c_s.y) * overlay_crop_->scale_.y, 0.f);
_t = glm::rotate(glm::identity<glm::mat4>(), _t = glm::rotate(glm::identity<glm::mat4>(),
overlay_crop_->rotation_.z, overlay_crop_->rotation_.z,
glm::vec3(0.f, 0.f, 1.f)) glm::vec3(0.f, 0.f, 1.f))
@@ -1112,8 +1112,8 @@ View::Cursor GeometryView::grab (Source *s, glm::vec2 from, glm::vec2 to, std::p
// prepare overlay frame showing full image size // prepare overlay frame showing full image size
glm::vec3 _c_s = glm::vec3(s->stored_status_->crop_[0] glm::vec3 _c_s = glm::vec3(s->stored_status_->crop_[0]
- s->stored_status_->crop_[1], - s->stored_status_->crop_[1],
s->stored_status_->crop_[3] s->stored_status_->crop_[2]
- s->stored_status_->crop_[2], - s->stored_status_->crop_[3],
2.f) 2.f)
* 0.5f; * 0.5f;
overlay_crop_->scale_ = s->stored_status_->scale_ / _c_s; overlay_crop_->scale_ = s->stored_status_->scale_ / _c_s;
@@ -1121,7 +1121,7 @@ View::Cursor GeometryView::grab (Source *s, glm::vec2 from, glm::vec2 to, std::p
overlay_crop_->rotation_.z = s->stored_status_->rotation_.z; overlay_crop_->rotation_.z = s->stored_status_->rotation_.z;
overlay_crop_->translation_ = s->stored_status_->translation_; overlay_crop_->translation_ = s->stored_status_->translation_;
glm::vec3 _t((s->stored_status_->crop_[1] + _c_s.x) * overlay_crop_->scale_.x, glm::vec3 _t((s->stored_status_->crop_[1] + _c_s.x) * overlay_crop_->scale_.x,
-s->stored_status_->crop_[3] + _c_s.y, 0.f); (-s->stored_status_->crop_[2] + _c_s.y) * overlay_crop_->scale_.y, 0.f);
_t = glm::rotate(glm::identity<glm::mat4>(), _t = glm::rotate(glm::identity<glm::mat4>(),
overlay_crop_->rotation_.z, overlay_crop_->rotation_.z,
glm::vec3(0.f, 0.f, 1.f)) glm::vec3(0.f, 0.f, 1.f))