Commit Graph

8648 Commits

Author SHA1 Message Date
Enrico Turri
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
tamasmeszaros
91928629e9 use vsnprintf instead of snprintf in string_printf function
Also, revert to old location: Utils.hpp and utils.cpp
2020-02-03 16:00:53 +01:00
Enrico Turri
b1c841a52f Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2020-02-03 15:48:56 +01:00
Enrico Turri
5b9b73602e Follow-up of 3a99b23ec7 -> F5 accelerator added also to objects list 2020-02-03 15:47:09 +01:00
Lukas Matena
61cc8765bf 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
18ca88013f Merge branch 'master' into lm_drilling_backend_rebased 2020-02-03 15:20:16 +01:00
Lukas Matena
3d2cdc9706 Hollowing gizmo - controls layout improvements 2020-02-03 15:17:18 +01:00
Lukas Matena
9fdaf8b31a Clipping plane is now common for Hollowing and SLA supports gizmos 2020-02-03 15:17:18 +01:00
bubnikv
6c3d4f6ac2 Implemented reload of original mesh volume in case the SLA hollowing
step is no more valid.
2020-02-03 15:17:18 +01:00
Enrico Turri
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
Enrico Turri
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
Enrico Turri
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
bubnikv
cae4e5bcca Speed up of libigl SelfIntersectMesh:
The test for intersection of two triangles sharing a common edge
has been optimized to reject non-overlaping triangles with
the least amount of exact arithmetics predicates.

Cherry pick of
d367762468
2020-02-03 14:01:35 +01:00
Enrico Turri
30c1ca3b58 3D scene labels transparent to mouse click 2020-02-03 13:24:11 +01:00
Enrico Turri
3423e05248 Added sequential print order id to 3D scene labels 2020-02-03 11:44:26 +01:00
Enrico Turri
651f6db83b Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_labels 2020-02-03 11:43:37 +01:00
tamasmeszaros
b65893025a remove duplicate string_printf
#3594, #3592
2020-02-03 11:19:11 +01:00
tamasmeszaros
937ade7379 string_printf Wformat-security hack #
#3594, #3592
2020-02-03 11:09:54 +01:00
Slic3rPE
5cb61dc789 missing includes 2020-02-03 10:13:15 +01:00
YuSanka
cb49940662 Added missed include under OSX 2020-02-03 09:24:58 +01:00
Enrico Turri
d344e3e2b4 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_labels 2020-02-03 08:23:55 +01:00
YuSanka
530c586277 ObjectDataViewModel is extracted from wxExtentions to the separated file
+ parse_color function is moved to BitmapCache from PresetBundle
2020-02-02 22:22:40 +01:00
YuSanka
1a6c8d786e Mark a tick as a conflict, if it has a ToolChange to the same extruder 2020-02-02 21:20:48 +01:00
YuSanka
737715c317 Fixed build under OSX 2020-02-02 19:40:00 +01:00
YuSanka
1278f0a93b Added missed include for OSX 2020-01-31 21:03:17 +01:00
YuSanka
82bb5be1f6 To fix blurred icons under OSX there is implemented PresetBitmapComboBox, derived from wxBitmapComboBox,
which now will be used for preset choosers on sidebar a preset tabs.

+ for BitmapCache class added m_scale used for correct scaling of SVG images on Retina displays

+ some code clearing from unused functions or function's parameters
2020-01-31 16:57:45 +01:00
Lukas Matena
9e0614f416 Fix of tripping glAssert after switching to Preview on Linux/GTK2
(fix suggested and thus approved by @enricoturri1966)
2020-01-31 14:50:37 +01:00
Enrico Turri
43520a50fa Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2020-01-31 12:15:14 +01:00
Enrico Turri
30c2e0145d #3580 - Added menu item 'Edit/Reload from disk' and F5 key acceleration to reload the entire plater 2020-01-31 12:15:04 +01:00
tamasmeszaros
9c68f20898 Put hole drilling into separate step 2020-01-31 08:58:21 +01:00
Lukas Matena
fed51de77f Fixed a crash during cut (typo introduced in 645f13a) 2020-01-31 08:54:41 +01:00
bubnikv
b4d20a1198 Implemented loading of hollowed SLA mesh into the scene
in place of the normal mesh.

WIP: The code is inefficient (it does not store the timestamp
of the hollowed mesh, therefore it refreshes the hollowed mesh on each
scene update) and if the hollowing gets invalidated, the original mesh
is currently not being reloaded and the hollowed mesh is still visible.
2020-01-30 17:58:49 +01:00
Lukas Matena
5ba0e67c35 Gizmo updates - forget everything about the loaded mesh when an object is deselected 2020-01-30 15:26:23 +01:00
YuSanka
4bb45f01cc Implemented DnD for objects inside ObjectList 2020-01-30 15:01:47 +01:00
Lukas Matena
021944dde7 SlaSupports gizmo - most of updating now assumes that common data struct is updated properly 2020-01-30 14:31:52 +01:00
Lukas Matena
80842be583 Hollowing gizmo - most of updating now assumes that common data struct is updated properly 2020-01-30 14:31:39 +01:00
bubnikv
d575b662d3 Fixed some compiler warnings. 2020-01-30 13:00:51 +01:00
bubnikv
6687c029e8 Fixed regression of 71fa411100
where the PrintObject bounding box was not invalidated correctly
when the transformation matrices of instances changed.

Also refactored PrintObject::size() for const correctness.
2020-01-30 12:22:30 +01:00
Lukas Matena
5ef96b1216 Trying to improve drilling stability by handling CGAL exceptions 2020-01-29 15:57:49 +01:00
Enrico Turri
084be76425 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_labels 2020-01-29 15:46:48 +01:00
Enrico Turri
0218baf66d Follow-up of 17a6b696e7 -> Fixed missing imgui window size initialization 2020-01-29 15:40:56 +01:00
Enrico Turri
0b5d0cfe38 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_labels 2020-01-29 14:46:09 +01:00
Enrico Turri
2f2fc2f17b Follow-up of 17a6b696e7 -> Fixed build when tech ENABLE_6DOF_CAMERA is disabled 2020-01-29 14:44:03 +01:00
tamasmeszaros
2aa3b9c0a6 Remove redundant code 2020-01-29 14:13:21 +01:00
Lukas Matena
0f62f0a010 Refuse to drill a broken mesh
Hole parameters defaults and limits changed a bit
2020-01-29 14:07:12 +01:00
Enrico Turri
b9562e8754 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_labels 2020-01-29 12:31:50 +01:00
Enrico Turri
61d4fe5c35 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2020-01-29 12:09:34 +01:00
Enrico Turri
763d0ee01a Workaround to fix SPE-1082 + refactoring of 6 dof camera 2020-01-29 12:08:38 +01:00
Lukas Matena
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
Lukas Matena
3155e844bb SLA gizmos can now fetch hollowed and drilled mesh from the backend 2020-01-29 10:08:26 +01:00