78a0893d6a
Fixed conflicts after merge with master
2020-03-25 14:41:47 +01:00
c5ed253b1b
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_bug_fixes
2020-03-25 09:34:17 +01:00
ca652035bf
Fixed build when ENABLE_GIZMO_TOOLBAR_DRAGGING_FIX is disabled
2020-03-25 09:33:59 +01:00
63f16adafb
ENABLE_MODIFIED_GIZMOBAR_MOUSE_EVENT_HANDLING merged into ENABLE_CANVAS_TOOLTIP_USING_IMGUI
2020-03-25 09:05:35 +01:00
ac501bdf8b
Merge branch 'master' into dev
2020-03-24 21:51:05 +01:00
a6d47d15fd
Modified mouse events handling for gizmobar
...
The gizmobar was consuming the mouse up event preventing the gizmos to update their tooltip
The gizmobar was also consuming the mouse dragging event transforming a gizmo manipulation into a scene rotation
2020-03-19 14:05:49 +01:00
0eb46d09b9
Fixed gizmos' tooltips
2020-03-16 12:45:39 +01:00
9cfa59df52
Fix of a rare crash on opening an SLA gizmo (supports or hollow)
2020-03-13 15:58:59 +01:00
35b59a3e13
Include cleanup in Plater, GLCanvas3D and GLGizmosManager
2020-03-03 15:53:26 +01:00
5407256c73
Fixed conflicts after merge with master
2020-03-02 11:35:03 +01:00
f61f6a98a5
GLCanvas3DManager moved from being a static member of _3DScene to be a normal member of GUI_App
2020-03-02 10:58:46 +01:00
239ab3a8e3
Slight change in clipping plane updating after hollowing finishes
...
The clipping plane in SLA gizmos is only moved in case that the gizmo is currently active and hollowing is actually enabled.
2020-02-27 15:18:15 +01:00
0fa849b9b8
Shared data for SLA gizmos have been removed from GLGizmoBase
...
This commit introduces no functional changes, only code-shuffling
2020-02-27 15:18:15 +01:00
b2ad9d564b
Fixed a crash when deleting an object after switching from SLA to FDM
2020-02-27 15:18:15 +01:00
01ba32595a
AABB trees for SLA gizmos are not calculated when the object is selected, but only after one of the gizmos is opened
2020-02-21 09:46:40 +01:00
184c4b96e7
ENABLE_MODIFIED_TOOLBAR_TEXTURES set as default
2020-02-13 09:50:06 +01:00
9377989297
Don't calculate the AABB tree in FDM mode
2020-02-08 17:17:51 +01:00
adf8f7c3bf
SLA gizmos: make sure that the clipping plane is properly reset to zero when the shown meshes are exchanged
2020-02-06 14:46:02 +01:00
c8d288cb5d
Movements and rotations by keyboard indipendent from gizmos:
...
Left arrow = Decrease X by 1mm
Right arrow = Increase X by 1mm
Up arrow = Decrease Y by 1mm
Down arrow = Increase Y by 1mm
PgUp = Rotate 45 degrees CCW
PgDown = Rotate 45 degrees CW
2020-02-04 11:42:58 +01:00
f0e3964f36
Smoother movements/rotations when using arrow keys
2020-02-04 10:31:50 +01:00
5de5a3746d
Follow-up of e042cab8fa -> Avoid polluting undo/redo stack
2020-02-04 09:32:09 +01:00
a3d34e8943
Follow-up of 8453c88482, c09091c407 and 9d55121695 -> Use key down event in place of key up event
2020-02-03 16:05:13 +01:00
18ca88013f
Merge branch 'master' into lm_drilling_backend_rebased
2020-02-03 15:20:16 +01:00
212beb4fd4
Cut Gizmo -> added movements using arrow keys:
...
Up arrow = increase Z by 1mm
Down arrow = decrease Z by 1mm
2020-02-03 15:00:49 +01:00
23f8bebcd1
Rotate Gizmo -> added rotations using arrow keys:
...
Left arrow = 90 degrees around Z axis CCW
Right arrow = 90 degrees around Z axis CW
Up arrow = 45 degrees around Z axis CCW
Down arrow = 45 degrees around Z axis CW
2020-02-03 14:51:25 +01:00
3d80934c9e
Move Gizmo -> added movements using arrow keys:
...
Left arrow = decrease X by 1mm
Right arrow = increase X by 1mm
Up arrow = increase Y by 1mm
Down arrow = decrease Y by 1mm
2020-02-03 14:39:16 +01:00
80842be583
Hollowing gizmo - most of updating now assumes that common data struct is updated properly
2020-01-30 14:31:39 +01:00
370255ac6a
Fixed transformation of the hollowed mesh to be used at frontend
...
Common gizmos data update is called from GLGizmoManager
2020-01-29 10:08:26 +01:00
a5ccb7a6c2
Merge branch 'master' into lm_tm_hollowing
2020-01-21 13:00:07 +01:00
d0955e38de
Platter->Plater
2020-01-20 11:16:49 -05:00
f131909353
Fixed conflicts after merge with master
2020-01-17 14:58:19 +01:00
5b4194446b
ENABLE_GIZMO_ICONS_NON_ACTIVABLE_STATE set as default
2020-01-17 10:34:32 +01:00
0dd7bc26d7
3Dconnexion devices translation linearly dependent on zoom
2020-01-16 10:17:07 +01:00
e0a6dbf7f5
Switched order of hollowing and support points gizmos
2020-01-09 10:01:21 +01:00
d3e057bf60
Follow-up of 5b2e2fe7b3 -> Fixed uv mapping on gizmobar
2020-01-08 10:04:39 +01:00
55549220eb
Fixed artifacts on toolbar and gizmobar icons showing up when changing screen or toolbar scale factors
2020-01-07 12:40:03 +01:00
51050f4a29
Merge branch 'master' into lm_tm_hollowing
2019-12-20 10:33:53 +01:00
013d150094
First steps on SLA and Hollowing gizmo data sharing
2019-12-17 15:57:24 +01:00
11feb259a3
Merge branch 'master' into lm_tm_hollowing
2019-12-12 11:37:33 +01:00
4d581a8778
Refactoring in GLGizmosManager to simplify code
2019-12-12 11:11:11 +01:00
9a4b6c2287
Gray icons for gizmos in disabled state
2019-12-09 15:21:18 +01:00
918e73fb50
Follow-up of c370bb7141 -> Do not force even size of toolbars icon textures
2019-12-05 14:43:18 +01:00
a76b7e0a97
Forces even size and disable compression for toolbar icon texture to try to solve artifacts on OsX Catalina
2019-12-05 12:22:24 +01:00
68dc478e25
SLA drain holes can be removed by right click, Ctrl+A selects all holes
2019-11-29 14:12:31 +01:00
617dc3e46f
Drain holes are now saved in ModelObject
...
Internal changes in GLGizmoHollow.cpp
2019-11-08 14:05:56 +01:00
28ba8d19f8
Hollowing gizmo can now actually trigger the hollowing and render result
2019-11-05 14:40:22 +01:00
87986bf99c
Added new hollowing gizmo
...
Basically just copied SLA support gizmo and removed all functionality that will not be needed
2019-11-05 10:17:27 +01:00
d911925d72
Do not show context menu when the user deletes sla support points by right clicking on them and the mouse pointer is hovering the selected object
2019-10-10 16:00:32 +02:00
2e377cdbe2
Merge remote-tracking branch 'remotes/origin/master' into dev
2019-09-09 17:49:07 +02:00
f935e217ac
Fixed handling of mouse left up event when moving an object while the place on face gizmo is active
2019-09-09 14:56:55 +02:00
