From ceb34dcc0d54c1f375a9eb26a8a06a4b1e7de43d Mon Sep 17 00:00:00 2001
From: svsalem <54895424+svsalem@users.noreply.github.com>
Date: Mon, 26 Apr 2021 22:48:59 -0500
Subject: [PATCH] compacted
---
src/gui/widgets.cpp | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/src/gui/widgets.cpp b/src/gui/widgets.cpp
index 9c6879a..a3d386e 100644
--- a/src/gui/widgets.cpp
+++ b/src/gui/widgets.cpp
@@ -182,18 +182,14 @@ Pose Widgets::apply_action(const Pose& pose) {
case Widget_Type::scale: {
if(univ_scl) {
result.scale = drag_end;
- Mat4 rot = pose.rotation_mat();
- Mat4 trans =
- Mat4::transpose(rot) * Mat4::scale(result.scale) * rot * Mat4::scale(pose.scale);
- result.scale = Vec3(trans[0][0], trans[1][1], trans[2][2]);
} else {
result.scale = Vec3{1.0f};
result.scale[(int)axis] = drag_end[(int)axis];
- Mat4 rot = pose.rotation_mat();
- Mat4 trans =
- Mat4::transpose(rot) * Mat4::scale(result.scale) * rot * Mat4::scale(pose.scale);
- result.scale = Vec3(trans[0][0], trans[1][1], trans[2][2]);
}
+ Mat4 rot = pose.rotation_mat();
+ Mat4 trans =
+ Mat4::transpose(rot) * Mat4::scale(result.scale) * rot * Mat4::scale(pose.scale);
+ result.scale = Vec3(trans[0][0], trans[1][1], trans[2][2]);
} break;
case Widget_Type::bevel: {
Vec2 off = bevel_start - bevel_end;
--
GitLab