9bcdb2ebd0
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_custom_bed
2019-07-25 15:29:25 +02:00
4e4bdb5edd
Removed obsolete code
2019-07-25 15:28:34 +02:00
1b5ba6c823
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_custom_bed
2019-07-23 15:36:39 +02:00
91a5d70a62
Fixed a few warnings in headers (meaning they were reported once for each include)
...
Fixed an identification of CXX compiler in cmake so that 'AppleClang' is recognized
2019-07-23 14:02:20 +02:00
9cb1a584e1
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_custom_bed
2019-07-22 08:21:40 +02:00
33c0683d11
Reworked rendering of toolbars background texture
2019-07-20 12:02:29 +02:00
749bb2bfed
Refactoring in GLTexture
2019-07-19 11:18:19 +02:00
f97a61cdcf
Fixed use of translate macros
2019-07-17 14:13:50 +02:00
401707a6fe
Another refactoring of GLGizmosManager
2019-07-17 12:43:27 +02:00
da1fa0b6e3
Refactoring of GLGizmosXX classes to cleanup their interface
2019-07-17 12:06:23 +02:00
21624f5305
Framework to serialize gizmos into undo/redo stack
...
Serialization into undo/redo of Cut gizmo
Refactoring of GLGizmosManager
2019-07-17 08:38:48 +02:00
ab7ecc1819
Merge remote-tracking branch 'remotes/origin/vb_undo_redo'
2019-07-15 11:34:18 +02:00
cc70c8dff9
Tech ENABLE_SVG_ICONS set as default
2019-07-12 10:13:35 +02:00
d4914441f3
Modified logic to add snapshots to undo/redo stack using GLCanvas::do_xxxxxx() methods
2019-07-09 10:18:57 +02:00
270fec84d3
Fix of the Undo / Redo for Cut.
...
Added some more operations (for example Rotation) to the Undo / Redo.
2019-07-05 19:46:48 +02:00
4e2fda3315
Undo / Redo fixes
2019-07-05 19:06:19 +02:00
4269c8b23c
Removed GLVolume non-VBO rendering
2019-07-01 12:28:16 +02:00
5766e9e915
Fixed conflicts after merge with branch et_perpsective_camera
2019-06-24 11:08:42 +02:00
00b9a3ad32
ENABLE_COMPRESSED_TEXTURES set as default
2019-06-24 09:54:58 +02:00
da8179d9c7
More camera related functionalities moved from GLCanvas3D to Camera
2019-06-19 14:18:51 +02:00
1a91add2e6
Tighter camera frustrum to reduce z-fighting
2019-06-14 10:38:09 +02:00
886da08f89
Texture compression set as an option
2019-05-28 12:53:16 +02:00
bf9740188a
Code cleanup
2019-05-24 15:22:27 +02:00
734d946912
1) Added Scale to print volume menu item to objects list context menu
...
2) Disable [F] key when scale sizmo is dragging
2019-05-24 14:42:59 +02:00
c92940c985
Fixed conflicts after cherry-picking 844e99f84e
2019-05-24 14:42:46 +02:00
77efc33670
Fixed scaling of multiple selection
2019-05-22 13:57:39 +02:00
14c4469cbf
Added Esc shortcut and menu item for command deselect all
2019-05-14 11:57:39 +02:00
86d466688b
Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_copy_and_paste
2019-05-10 13:08:19 +02:00
d69c98b48d
Constrained gizmo-scaling -> code cleanup and simplification
2019-05-10 13:07:59 +02:00
baa8bace8d
Removed duplicated line
2019-05-10 11:44:47 +02:00
f0da19446b
Merge branch 'lm_arrange_wipe_tower' of https://github.com/prusa3d/Slic3r
2019-05-10 11:14:42 +02:00
128da453d5
1st installment of constrained gizmo-scaling
2019-05-10 11:13:55 +02:00
e9a53e49db
Arrange is accounting for the wipe tower now
2019-05-06 08:14:45 +02:00
5f226c5d7f
Allow wipe tower rotation by the rotation gizmo
2019-05-06 08:14:45 +02:00
1c6006f657
Merge remote-tracking branch 'remotes/origin/master' into vb_wold_object_manipulation
2019-05-03 12:37:43 +02:00
0ab96ed6b5
Changed the "non-uniform scaling is not possible" message.
2019-05-03 12:36:26 +02:00
e5c97364a4
Fix of anisotropic scaling from the 3D scene.
2019-04-29 16:01:52 +02:00
fdf1b8af81
Rectangle selection -> Removed cursor change
2019-04-29 08:26:08 +02:00
d79a2b8d2d
GLCanvas3D -> added support for cursor change and change cursor when using SLA support gizmo rectangle selection
2019-04-24 15:43:52 +02:00
9710140948
int GLCanvas3D::m_hover_volume_id replaced with std::vector<int> GLCanvas3D::m_hover_volume_idxs
2019-04-24 15:07:28 +02:00
5d2537af35
WIP: Transformations of an instance in world coordinate system
...
from the side panel.
2019-04-24 11:01:59 +02:00
0c1e223414
SLA gizmo clipping plane is now not necessarily perpendicular to camera direction
2019-04-17 14:27:20 +02:00
8df2a19974
SLA clipping plane can now be controlled by Ctrl + mouse wheel rotation
2019-04-17 14:27:20 +02:00
50516e3b7d
Attempt to fix Ctrl+C from 3D scene on Mac
2019-04-17 10:27:33 +02:00
678c513cb9
Merge branch 'master' into lm_sla_gizmo_clipping_plane
2019-04-10 13:43:02 +02:00
7b8b8b97ef
Fixed Cmd-A selection in the SLA gizmo.
2019-04-10 10:16:04 +02:00
f71e14a4d9
SLA gizmo now uses ctrl to add to selection and alt to remove from selection
2019-04-08 15:34:42 +02:00
eadf7daa37
Merge branch 'master' into lm_sla_gizmo_clipping_plane
2019-04-08 10:50:10 +02:00
d87b478d60
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
9b3f1a8942
Small refactoring -> GLGizmosManager gets model from selection and not from canvas
2019-03-28 09:30:01 +01:00