Enrico Turri
ef32cd6059
Fixed conflicts after merge with master
2020-02-06 15:28:50 +01:00
Enrico Turri
c6ca180142
Use frontend data to update labels
2020-02-06 15:19:53 +01:00
bubnikv
fb235cb675
Color change - handling Color Change data stored for different
...
printer configuration:
ss -> sm : Just apply the color changes of the original ss project at the active extruder.
ss -> mm : There are no tool changes stored. Ignore color changes, they are invalid because they are extruder non-specific.
sm -> ss : Apply tool changes as color changes (tool changes remember the target color), apply original color changes.
sm -> mm : Ignore both color changes and tool changes.
mm -> ss/sm : Ignore both color changes and tool changes.
2020-02-06 14:03:27 +01:00
Enrico Turri
3981e25f75
Fixed labels auto-sizing
2020-02-06 12:06:39 +01:00
Enrico Turri
bfea105c2e
Fixed mmissing #if ENABLE_SHOW_SCENE_LABELS
2020-02-06 10:39:42 +01:00
Enrico Turri
5c4b481e35
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_labels
2020-02-05 15:27:20 +01:00
Enrico Turri
a04c72b0c9
Fixed unneded auto-extra frame render
2020-02-05 15:27:11 +01:00
Enrico Turri
fce9f77472
Translations with arrow keys with modifiers:
...
Shift -> slower translations
Ctrl -> translations in camera space
2020-02-05 13:14:50 +01:00
Lukas Matena
617912ecc1
Fixed a crash on deleting object with SLA gizmo active
...
Rephrased text informing about hidden objects in both SLA gizmos
2020-02-04 15:03:10 +01:00
Lukas Matena
0e3ebb3e07
Hollowing gizmo: Invalidate drilled mesh in case a hole is manipulated
...
This way the holes cannot be placed on its own walls
Downside is that AABB trees have to be recalculated
2020-02-04 15:03:10 +01:00
Enrico Turri
3ec4b77dcd
Added item menu 'Edit/Show labels' and removed labels activation from preferences dialog
2020-02-04 14:42:26 +01:00
Enrico Turri
dc393e2f0a
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_labels
2020-02-04 12:28:06 +01:00
Enrico Turri
87daba9288
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
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
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
1ee2f16a71
3D scene labels transparent to mouse click
2020-02-03 13:24:11 +01:00
Enrico Turri
6fa49f5931
Added sequential print order id to 3D scene labels
2020-02-03 11:44:26 +01:00
Enrico Turri
251a7d1329
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_labels
2020-02-03 08:23:55 +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
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
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
08dcbd0271
Hollowing gizmo - most of updating now assumes that common data struct is updated properly
2020-01-30 14:31:39 +01:00
Enrico Turri
0407634824
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_labels
2020-01-29 15:46:48 +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
504413cc91
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_labels
2020-01-29 12:31:50 +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
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
Enrico Turri
9032dadff3
Added extra frame renders to let labels grow to their final size
2020-01-28 15:57:02 +01:00
Enrico Turri
d5b258c267
1st installment of object/instance labels in 3D scene
2020-01-28 13:15:21 +01:00
tamasmeszaros
6b0af43665
Use mesh boolean in the backend to drill holes.
2020-01-24 10:53:40 +01:00
tamasmeszaros
b45e95877e
Merge branch 'master' into lm_tm_hollowing
2020-01-23 17:43:18 +01:00
YuSanka
5ff8ae955b
Implemented editing for extruder of existing ToolChangeCode tick
...
+ Code refactoring: DoubleSlider is extracted from wxExtensions
2020-01-23 16:11:21 +01:00
YuSanka
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
bubnikv
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
Lukas Matena
63b0eec5a9
Merge branch 'master' into lm_tm_hollowing
2020-01-21 13:00:07 +01:00
Enrico Turri
b368f8ff24
Fixed conflicts after merge with master
2020-01-17 14:58:19 +01:00
YuSanka
2259f7b3e8
Code refactoring to mode comparison
2020-01-17 12:24:58 +01:00
Enrico Turri
94a3d38afd
ENABLE_3DCONNEXION_DEVICES_CLOSE_SETTING_DIALOG set as default
2020-01-17 11:45:52 +01:00
Enrico Turri
4eee702984
ENABLE_ADAPTIVE_LAYER_HEIGHT_PROFILE set as default
2020-01-17 11:26:26 +01:00
Enrico Turri
b6ab6378d7
ENABLE_VIEW_TOOLBAR_BACKGROUND_FIX set as default
2020-01-17 10:50:25 +01:00
Enrico Turri
34aac7e292
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_6dof_camera
2020-01-17 08:13:58 +01:00
YuSanka
52c590f57a
Merge remote-tracking branch 'origin/ys_cp_improvements'
2020-01-16 16:06:19 +01:00
YuSanka
89fcd7f95a
Added "mode" variable for custom_gcode_per_print_z
2020-01-16 16:01:19 +01:00
Enrico Turri
6be4b3865b
Merge remote-tracking branch 'foxox/feature/ScaleSpeedLegendToVisible2'
2020-01-16 13:55:59 +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
Enrico Turri
3f2ccf08d2
3Dconnexion devices translation linearly dependent on zoom
2020-01-16 10:17:07 +01:00
Enrico Turri
9df7eb4e08
Customizable use of 6 dof camera
2020-01-16 09:12:36 +01:00
Enrico Turri
62e60bcb43
Six degrees of freedom camera - 1st installment
2020-01-15 12:49:34 +01:00
YuSanka
4f1f507d5a
Fix of #3371
2020-01-06 12:41:27 +01:00