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
a1d4dab999
Merge branch 'master' into lm_drilling_backend_rebased
2020-02-03 15:20:16 +01:00
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
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
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
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
08dcbd0271
Hollowing gizmo - most of updating now assumes that common data struct is updated properly
2020-01-30 14:31:39 +01:00
e679bcced6
Follow-up of 17a6b696e7 -> Fixed missing imgui window size initialization
2020-01-29 15:40:56 +01:00
17a6b696e7
Workaround to fix SPE-1082 + refactoring of 6 dof camera
2020-01-29 12:08:38 +01:00
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
6b0af43665
Use mesh boolean in the backend to drill holes.
2020-01-24 10:53:40 +01:00
b45e95877e
Merge branch 'master' into lm_tm_hollowing
2020-01-23 17:43:18 +01:00
5ff8ae955b
Implemented editing for extruder of existing ToolChangeCode tick
...
+ Code refactoring: DoubleSlider is extracted from wxExtensions
2020-01-23 16:11:21 +01:00
1ed313ab79
Synchronized mode of color_print data to/from 3mf/amf
...
+ Code refactoring " CustomGCode extracted to separate namespace and file
2020-01-23 16:11:21 +01:00
71fa411100
Refactored PrintObject::m_copies to PrintInstances,
...
so that the ordering code at G-code export may work directly with
pointers to PrintInstances instead of with pair of <PrintObject, copy idx>.
Also the PrintInstance knows its source ModelInstance, which allows
sorting of PrintInstances for sequential printing in the order
they appear in Plater's object list.
2020-01-23 09:53:06 +01:00
63b0eec5a9
Merge branch 'master' into lm_tm_hollowing
2020-01-21 13:00:07 +01:00
b368f8ff24
Fixed conflicts after merge with master
2020-01-17 14:58:19 +01:00
2259f7b3e8
Code refactoring to mode comparison
2020-01-17 12:24:58 +01:00
94a3d38afd
ENABLE_3DCONNEXION_DEVICES_CLOSE_SETTING_DIALOG set as default
2020-01-17 11:45:52 +01:00
4eee702984
ENABLE_ADAPTIVE_LAYER_HEIGHT_PROFILE set as default
2020-01-17 11:26:26 +01:00
b6ab6378d7
ENABLE_VIEW_TOOLBAR_BACKGROUND_FIX set as default
2020-01-17 10:50:25 +01:00
34aac7e292
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_6dof_camera
2020-01-17 08:13:58 +01:00
52c590f57a
Merge remote-tracking branch 'origin/ys_cp_improvements'
2020-01-16 16:06:19 +01:00
89fcd7f95a
Added "mode" variable for custom_gcode_per_print_z
2020-01-16 16:01:19 +01:00
6be4b3865b
Merge remote-tracking branch 'foxox/feature/ScaleSpeedLegendToVisible2'
2020-01-16 13:55:59 +01:00
822f9ff4a6
Fixed issues in SLA gizmos related to showing/hiding of the model/support structures
2020-01-16 13:18:43 +01:00
3f2ccf08d2
3Dconnexion devices translation linearly dependent on zoom
2020-01-16 10:17:07 +01:00
9df7eb4e08
Customizable use of 6 dof camera
2020-01-16 09:12:36 +01:00
62e60bcb43
Six degrees of freedom camera - 1st installment
2020-01-15 12:49:34 +01:00
4f1f507d5a
Fix of #3371
2020-01-06 12:41:27 +01:00
b3f15b1c98
Merge branch 'master' into lm_tm_hollowing
2019-12-20 10:33:53 +01:00
f7e06ded67
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer
2019-12-17 14:16:58 +01:00
afcc6bbb08
Code refactoring for Color change implementation
2019-12-17 08:37:50 +01:00
43213b9548
Added [X] and [Close] buttons to close 3Dconnexion setting imgui dialog by clicking on them
2019-12-16 13:35:45 +01:00
e649a28ffc
Merge branch 'master' of https://github.com/Prusa3d/PrusaSlicer
2019-12-13 13:43:31 +01:00
65772958b7
Improved adaptive layer height metrics: Using the area of a triangle
...
delimited by the extrusion stepping and the sloping surface.
This leads to a yet different metric from Cura or upstream Slic3r.
2019-12-13 13:43:16 +01:00
f2b8607d11
Fixed positioning of gizmos' imgui dialogs
2019-12-12 13:38:08 +01:00
537260494d
Merge branch 'master' into lm_tm_hollowing
2019-12-12 11:37:33 +01:00
57d069bd0a
Some rework on layout of imgui dialogs
2019-12-11 15:30:25 +01:00
64fc278212
GLCanvas3D - render methods set as constant methods
2019-12-10 12:57:55 +01:00
03bb8a60a3
Merge branch 'master' of https://github.com/Prusa3d/PrusaSlicer
2019-12-10 11:13:09 +01:00
b12bc5c4d5
Optimization in GLCanvas3D::reload_scene():
...
Use sorting and binary search instead of linear search.
O(n log n) versus O(n^2)
2019-12-10 11:12:17 +01:00
bdfed9d9ef
Attempt to fix view toolbar background not showing up on Mac when using dark mode
2019-12-10 10:56:21 +01:00
68812b081f
Removed obsolete (and unused) code
2019-12-09 15:40:14 +01:00
dea83da5b7
Speed legend scales depending on travel visibility.
2019-12-08 00:03:41 -05:00
3acbc07caf
Localization improvements
2019-12-06 16:20:59 +01:00
805a6c936c
Localization improvements: Text correction
2019-12-06 13:58:23 +01:00
45f10a3730
ENABLE_ADAPTIVE_LAYER_HEIGHT_PROFILE -> Removed debug output and cleanup
2019-12-02 11:44:11 +01:00
40498eee44
ENABLE_ADAPTIVE_LAYER_HEIGHT_PROFILE -> Extended debug output to investigate issues on Mac and Linux
2019-11-29 14:24:24 +01:00
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
