Unverified Commit b71ca11f authored by svsalem's avatar svsalem Committed by GitHub
Browse files

universal scale

parent b325f724
...@@ -30,6 +30,7 @@ enum class Widget_IDs : Scene_ID { ...@@ -30,6 +30,7 @@ enum class Widget_IDs : Scene_ID {
x_scl, x_scl,
y_scl, y_scl,
z_scl, z_scl,
xyz_scl,
count count
}; };
static const int n_Widget_IDs = (int)Widget_IDs::count; static const int n_Widget_IDs = (int)Widget_IDs::count;
...@@ -149,20 +150,21 @@ private: ...@@ -149,20 +150,21 @@ private:
void generate_lines(Vec3 pos); void generate_lines(Vec3 pos);
bool to_axis(Vec3 obj_pos, Vec3 cam_pos, Vec3 dir, Vec3& hit); 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_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 // interface data
Axis axis = Axis::X; Axis axis = Axis::X;
Vec3 drag_start, drag_end; Vec3 drag_start, drag_end;
Vec2 bevel_start, bevel_end; Vec2 bevel_start, bevel_end;
bool dragging = false, drag_plane = false; bool dragging = false, drag_plane = false;
bool start_dragging = false; bool start_dragging = false;
bool univ_scl = false;
// render data // render data
GL::Lines lines; GL::Lines lines;
Scene_Object x_mov, y_mov, z_mov; Scene_Object x_mov, y_mov, z_mov;
Scene_Object xy_mov, yz_mov, xz_mov; Scene_Object xy_mov, yz_mov, xz_mov;
Scene_Object x_rot, y_rot, z_rot; Scene_Object x_rot, y_rot, z_rot;
Scene_Object x_scl, z_scl, y_scl; Scene_Object x_scl, z_scl, y_scl;
Scene_Object xyz_scl;
}; };
} // namespace Gui } // namespace Gui
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