Commit graph

310 commits

Author SHA1 Message Date
Enrico Turri
e042cab8fa 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
Lukas Matena
227cc4dc33 Fixed conflicts after merge
slaposHollowing was divided into slaposHollowing and slaposDrillHoles on master
This commit takes this into account on the code that was merged from lm_drilling_backend_rebased
2020-02-03 15:42:54 +01:00
Lukas Matena
a1d4dab999 Merge branch 'master' into lm_drilling_backend_rebased 2020-02-03 15:20:16 +01:00
Lukas Matena
d407fda433 Hollowing gizmo - controls layout improvements 2020-02-03 15:17:18 +01:00
Lukas Matena
79da3a95e1 Clipping plane is now common for Hollowing and SLA supports gizmos 2020-02-03 15:17:18 +01:00
Enrico Turri
8453c88482 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
Enrico Turri
c09091c407 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
Enrico Turri
9d55121695 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
Lukas Matena
a6f7fc93f4 Gizmo updates - forget everything about the loaded mesh when an object is deselected 2020-01-30 15:26:23 +01:00
Lukas Matena
4f43c6d3f8 SlaSupports gizmo - most of updating now assumes that common data struct is updated properly 2020-01-30 14:31:52 +01:00
Lukas Matena
08dcbd0271 Hollowing gizmo - most of updating now assumes that common data struct is updated properly 2020-01-30 14:31:39 +01:00
Lukas Matena
b41c6d7d64 Refuse to drill a broken mesh
Hole parameters defaults and limits changed a bit
2020-01-29 14:07:12 +01:00
Lukas Matena
3f73261fdb 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
Lukas Matena
46fdce1169 SLA gizmos can now fetch hollowed and drilled mesh from the backend 2020-01-29 10:08:26 +01:00
Lukas Matena
1c0aedbbe5 Hollowing gizmo can now trigger the backend calculation 2020-01-24 10:53:40 +01:00
Lukas Matena
63b0eec5a9 Merge branch 'master' into lm_tm_hollowing 2020-01-21 13:00:07 +01:00
foxox
07d6fd8f7e Platter->Plater 2020-01-20 11:16:49 -05:00
Enrico Turri
b368f8ff24 Fixed conflicts after merge with master 2020-01-17 14:58:19 +01:00
Enrico Turri
dad09c737c ENABLE_GIZMO_ICONS_NON_ACTIVABLE_STATE set as default 2020-01-17 10:34:32 +01:00
Lukas Matena
d9786f2bcd Fixed SLA gizmos picking problem - hollowed mesh was not rendered for picking 2020-01-16 13:18:43 +01:00
Lukas Matena
822f9ff4a6 Fixed issues in SLA gizmos related to showing/hiding of the model/support structures 2020-01-16 13:18:43 +01:00
Lukas Matena
902d3bb904 Fixed loading of hole_height when a hole is selected (hollowing gizmo) 2020-01-16 13:18:43 +01:00
Lukas Matena
6e8bdb2c86 Fixed update of clipping plane when a gizmo was turned off 2020-01-16 13:18:43 +01:00
Lukas Matena
8c8256c6a2 Fixed diameter/radius mismatch in gizmo UI 2020-01-16 13:18:43 +01:00
Lukas Matena
a3f3c868eb Removed needless calls to instance_bounding_box 2020-01-16 13:18:43 +01:00
Enrico Turri
3f2ccf08d2 3Dconnexion devices translation linearly dependent on zoom 2020-01-16 10:17:07 +01:00
Lukas Matena
d0d73e6109 Hollowing config values contain min/max values, these are respected when setting through the gizmo
Rendering and hole transformation fixes (still WIP, though)
2020-01-14 10:33:10 +01:00
Lukas Matena
e9d340c87f Fixed transformations of the hollowed GLVolume 2020-01-09 14:09:26 +01:00
Lukas Matena
ff065aa9ba Switched order of hollowing and support points gizmos 2020-01-09 10:01:21 +01:00
Enrico Turri
5a63b9a6a0 Follow-up of 5b2e2fe7b3 -> Fixed uv mapping on gizmobar 2020-01-08 10:04:39 +01:00
Enrico Turri
5b2e2fe7b3 Fixed artifacts on toolbar and gizmobar icons showing up when changing screen or toolbar scale factors 2020-01-07 12:40:03 +01:00
Lukas Matena
6a870ef8bb Fixed incorrect z-shift when showing hollowed object 2020-01-06 16:02:55 +01:00
Lukas Matena
4d182a5748 Fixed scaling of the holes and instance showing/hiding 2019-12-20 11:33:14 +01:00
Lukas Matena
b3f15b1c98 Merge branch 'master' into lm_tm_hollowing 2019-12-20 10:33:53 +01:00
Lukas Matena
d1f86e0a80 SLA supports gizmo now uses hollowed mesh when available
Bugfix: SLA support tree is is now given the hollowed mesh, not the original
Added ImGui separators and change background alpha in hollowing gizmo dialog (to match the other gizmos)
2019-12-20 10:17:59 +01:00
Lukas Matena
57cf3d17e2 First steps on SLA and Hollowing gizmo data sharing 2019-12-17 15:57:24 +01:00
Lukas Matena
2cb30f3641 First prototype of CGAL hole-drilling 2019-12-13 13:42:10 +01:00
Enrico Turri
f2b8607d11 Fixed positioning of gizmos' imgui dialogs 2019-12-12 13:38:08 +01:00
Lukas Matena
537260494d Merge branch 'master' into lm_tm_hollowing 2019-12-12 11:37:33 +01:00
Enrico Turri
d6f5ed9ad0 Refactoring in GLGizmosManager to simplify code 2019-12-12 11:11:11 +01:00
Lukas Matena
135660decf SLA gizmos fix: clipping of points/holes always used coords from the first instance
Few warnings fixed
2019-12-12 10:40:28 +01:00
Enrico Turri
57d069bd0a Some rework on layout of imgui dialogs 2019-12-11 15:30:25 +01:00
Enrico Turri
a7b12f97db Gray icons for gizmos in disabled state 2019-12-09 15:21:18 +01:00
tamasmeszaros
3b0241c98b Fix trianglemesh slicer error with empty meshes 2019-12-06 10:59:05 +01:00
Enrico Turri
8728f192c6 Follow-up of c370bb7141 -> Do not force even size of toolbars icon textures 2019-12-05 14:43:18 +01:00
Enrico Turri
c370bb7141 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
YuSanka
ee71f83939 Localization improvements:
* fixed "\n" at the end of phrases
 + updated list of files to localization
 + new PrusaSlicer.pot
 + Japanese localization
2019-12-04 11:14:13 +01:00
Lukas Matena
a6e737f05a Various small changes in hollowing gizmo:
- changed layout of controls
- fixed supports appearing when they shouldn't
- fixed clipping plane (holes were hidden at a bit different position of the plane then appropriate)
- when hollowing is done, clipping plane is automatically moved to show the cavity
- the dialog should no longed overlap bottom-left corner controls
- gizmo controls now correspond to config values in ObjectSettings box and both update each other
- added undo/redo support when manipulating holes
2019-12-03 10:45:49 +01:00
Lukas Matena
14d56929e7 SLA drain holes can be removed by right click, Ctrl+A selects all holes 2019-11-29 14:12:31 +01:00
Lukas Matena
735f82c019 Hollowing gizmo has now its own shortcut [H], fixed a situation with supports showed in editing mode 2019-11-29 13:56:39 +01:00