Commit Graph

12100 Commits

Author SHA1 Message Date
Enrico Turri
f09bed32b6 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2020-02-03 15:48:56 +01:00
Enrico Turri
03680bb014 Follow-up of 3a99b23ec7 -> F5 accelerator added also to objects list 2020-02-03 15:47:09 +01:00
Lukas Matena
6a2604cfe0 Merge branch 'lm_drilling_backend_rebased' 2020-02-03 15:46:02 +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
bubnikv
f28d0ebc18 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
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
bubnikv
73f69f3387 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
tamasmeszaros
992a0c3d7a remove duplicate string_printf
#3594, #3592
2020-02-03 11:19:11 +01:00
tamasmeszaros
8aec5f6726 string_printf Wformat-security hack #
#3594, #3592
2020-02-03 11:09:54 +01:00
Slic3rPE
e50825ce05 missing includes 2020-02-03 10:13:15 +01:00
YuSanka
5b103116c5 Added missed include under OSX 2020-02-03 09:24:58 +01:00
YuSanka
3f7ebee396 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
eb6e0c06e4 Mark a tick as a conflict, if it has a ToolChange to the same extruder 2020-02-02 21:20:48 +01:00
YuSanka
438f4fd1aa Fixed build under OSX 2020-02-02 19:40:00 +01:00
YuSanka
be92e10985 Added missed include for OSX 2020-01-31 21:03:17 +01:00
YuSanka
1472ad9b14 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
378321231f 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
61e9cb0f72 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2020-01-31 12:15:14 +01:00
Enrico Turri
3a99b23ec7 #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
36e92b0141 Put hole drilling into separate step 2020-01-31 08:58:21 +01:00
tamasmeszaros
7f476f38b9 [refactor] Move remaining utility functions into sla_test_utils 2020-01-31 08:56:46 +01:00
Lukas Matena
4bc4e347fb Fixed a crash during cut (typo introduced in 645f13a) 2020-01-31 08:54:41 +01:00
bubnikv
9ef65b23d8 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
a6f7fc93f4 Gizmo updates - forget everything about the loaded mesh when an object is deselected 2020-01-30 15:26:23 +01:00
YuSanka
570f77cbdc Implemented DnD for objects inside ObjectList 2020-01-30 15:01:47 +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
bubnikv
1278aabf3e Fixed some compiler warnings. 2020-01-30 13:00:51 +01:00
bubnikv
d590d5cad8 Created Creality.idx
bumped up the version number for Creality.ini
2020-01-30 13:00:26 +01:00
bubnikv
c5fa400208 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
b0aa937215 Trying to improve drilling stability by handling CGAL exceptions 2020-01-29 15:57:49 +01:00
Enrico Turri
e679bcced6 Follow-up of 17a6b696e7 -> Fixed missing imgui window size initialization 2020-01-29 15:40:56 +01:00
Enrico Turri
da3cb30b7c Follow-up of 17a6b696e7 -> Fixed build when tech ENABLE_6DOF_CAMERA is disabled 2020-01-29 14:44:03 +01:00
tamasmeszaros
7156ed9987 Remove redundant code 2020-01-29 14:13:21 +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
Enrico Turri
f7f1e2ce42 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2020-01-29 12:09:34 +01:00
Enrico Turri
17a6b696e7 Workaround to fix SPE-1082 + refactoring of 6 dof camera 2020-01-29 12:08:38 +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
76927ce399 REVERT LATER: TEMPORARILY MANGLED reload_scene FUNCTION
This commit horribly cripples reload_scene function just to update volumes in scene so that Hollowing and SLASupport gizmos can be updated to the new logic
    It should be later reverted and the same be achieved in a better way
2020-01-29 10:07:59 +01:00
Lukas Matena
5ae2f8a467 Function sla_trafo made accessible from outside SLAPrint.cpp unit 2020-01-29 10:07:10 +01:00
YuSanka
d45744b7bb Typo fix for a38735b4ae 2020-01-28 16:40:31 +01:00
YuSanka
cd2973fad3 Typo fix for a38735b4ae 2020-01-28 16:23:55 +01:00
YuSanka
a38735b4ae More fix of svg icons scaling under OSX (to avoid icon's blurring)
+ some code cleaning from unused text
2020-01-28 16:17:51 +01:00
tamasmeszaros
6988752d05 Re-apply fix for Win32 2020-01-28 15:24:23 +01:00