Commit Graph

34 Commits

Author SHA1 Message Date
Enrico Turri
2193d38d5c Added Esc shortcut and menu item for command deselect all 2019-05-14 11:57:39 +02:00
Enrico Turri
36da59ba39 Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_copy_and_paste 2019-05-10 13:08:19 +02:00
Enrico Turri
e0023eb5c0 Constrained gizmo-scaling -> code cleanup and simplification 2019-05-10 13:07:59 +02:00
Enrico Turri
8fb97d009b Removed duplicated line 2019-05-10 11:44:47 +02:00
Enrico Turri
f14a203953 Merge branch 'lm_arrange_wipe_tower' of https://github.com/prusa3d/Slic3r 2019-05-10 11:14:42 +02:00
Enrico Turri
59b9f04120 1st installment of constrained gizmo-scaling 2019-05-10 11:13:55 +02:00
Lukas Matena
0b4c7125b7 Arrange is accounting for the wipe tower now 2019-05-06 08:14:45 +02:00
Lukas Matena
5fa55fc51f Allow wipe tower rotation by the rotation gizmo 2019-05-06 08:14:45 +02:00
bubnikv
a7868d45f1 Merge remote-tracking branch 'remotes/origin/master' into vb_wold_object_manipulation 2019-05-03 12:37:43 +02:00
bubnikv
50758c4cd0 Changed the "non-uniform scaling is not possible" message. 2019-05-03 12:36:26 +02:00
bubnikv
d35894d6f7 Fix of anisotropic scaling from the 3D scene. 2019-04-29 16:01:52 +02:00
Enrico Turri
276d5384c0 Rectangle selection -> Removed cursor change 2019-04-29 08:26:08 +02:00
Enrico Turri
adac77ca39 GLCanvas3D -> added support for cursor change and change cursor when using SLA support gizmo rectangle selection 2019-04-24 15:43:52 +02:00
Enrico Turri
d31610c5b7 int GLCanvas3D::m_hover_volume_id replaced with std::vector<int> GLCanvas3D::m_hover_volume_idxs 2019-04-24 15:07:28 +02:00
bubnikv
fbf6dd5af9 WIP: Transformations of an instance in world coordinate system
from the side panel.
2019-04-24 11:01:59 +02:00
Lukas Matena
eef7781029 SLA gizmo clipping plane is now not necessarily perpendicular to camera direction 2019-04-17 14:27:20 +02:00
Lukas Matena
0cd5bb0338 SLA clipping plane can now be controlled by Ctrl + mouse wheel rotation 2019-04-17 14:27:20 +02:00
Enrico Turri
402b013e48 Attempt to fix Ctrl+C from 3D scene on Mac 2019-04-17 10:27:33 +02:00
Lukas Matena
ba1bfa9e66 Merge branch 'master' into lm_sla_gizmo_clipping_plane 2019-04-10 13:43:02 +02:00
bubnikv
27c9c15222 Fixed Cmd-A selection in the SLA gizmo. 2019-04-10 10:16:04 +02:00
Lukas Matena
a2d48dbd3e SLA gizmo now uses ctrl to add to selection and alt to remove from selection 2019-04-08 15:34:42 +02:00
Lukas Matena
0a963c1768 Merge branch 'master' into lm_sla_gizmo_clipping_plane 2019-04-08 10:50:10 +02:00
Enrico Turri
0f657b772b Camera refactoring
1) All camera related OpenGL calls moved into class

2) The Camera class now stores the view matrix, the projection matrix and the viewport

3) The Camera class now exposes methods to get the camera orientation vectors, the camera position, the view matrix, the projection matrix and the viewport

4) All the code operating on the camera or requiring camera data has been modified to use the new methods
2019-04-01 10:00:10 +02:00
Enrico Turri
e2ad83fa92 Small refactoring -> GLGizmosManager gets model from selection and not from canvas 2019-03-28 09:30:01 +01:00
Enrico Turri
0fb2c4cfd7 Fixed conflicts after merge with master 2019-03-27 12:51:40 +01:00
Enrico Turri
9fd9572691 void GLCanvas3D::update_gizmos_data() moved into void GLGizmosManager::update_data(GLCanvas3D& canvas) 2019-03-26 15:55:47 +01:00
Enrico Turri
871c365cc7 Handling of gizmos related key events moved into new method GLGizmosManager::on_key() 2019-03-26 14:38:30 +01:00
Enrico Turri
ae402c1010 Handling of gizmos related char events moved into new method GLGizmosManager::on_char() 2019-03-26 14:08:02 +01:00
Enrico Turri
e3fa7b15be Code cleanup 2019-03-26 12:39:40 +01:00
Enrico Turri
a6a344a014 Handling of gizmos related mouse events moved into GLGizmosManager::on_mouse() 2019-03-26 12:30:17 +01:00
Enrico Turri
48f4831ffc Code cleanup 2019-03-26 09:10:35 +01:00
Enrico Turri
0337ac0839 1st installment of gizmos refactoring
1) GLCanvas3D::Gizmos moved into a standalone class GLGizmosManager

2) GLGizmosManager handles mouse events by calling its on_mouse method (wip)
2019-03-26 09:01:04 +01:00
Enrico Turri
788aea7a61 Fixed conflicts after merge with master 2019-03-20 16:09:14 +01:00
Enrico Turri
e9eb5b21ef GLCanvas3D::Gizmos as a standalone class (GLGizmosManager) 2019-03-20 13:51:25 +01:00