From b71ca11f67ad0af37dda689561cbead9a6677e93 Mon Sep 17 00:00:00 2001
From: svsalem <54895424+svsalem@users.noreply.github.com>
Date: Mon, 26 Apr 2021 22:24:04 -0500
Subject: [PATCH] universal scale
---
src/gui/widgets.h | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/gui/widgets.h b/src/gui/widgets.h
index dc5daac..ad7b343 100644
--- a/src/gui/widgets.h
+++ b/src/gui/widgets.h
@@ -30,6 +30,7 @@ enum class Widget_IDs : Scene_ID {
x_scl,
y_scl,
z_scl,
+ xyz_scl,
count
};
static const int n_Widget_IDs = (int)Widget_IDs::count;
@@ -149,20 +150,21 @@ private:
void generate_lines(Vec3 pos);
bool to_axis(Vec3 obj_pos, Vec3 cam_pos, Vec3 dir, Vec3& hit);
bool to_plane(Vec3 obj_pos, Vec3 cam_pos, Vec3 dir, Vec3 norm, Vec3& hit);
-
+ bool to_axis3(Vec3 obj_pos, Vec3 cam_pos, Vec3 dir, Vec3& hit);
// interface data
Axis axis = Axis::X;
Vec3 drag_start, drag_end;
Vec2 bevel_start, bevel_end;
bool dragging = false, drag_plane = false;
bool start_dragging = false;
-
+ bool univ_scl = false;
// render data
GL::Lines lines;
Scene_Object x_mov, y_mov, z_mov;
Scene_Object xy_mov, yz_mov, xz_mov;
Scene_Object x_rot, y_rot, z_rot;
Scene_Object x_scl, z_scl, y_scl;
+ Scene_Object xyz_scl;
};
} // namespace Gui
--
GitLab