bc15ebaf40
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
27c7ecda1a
Fixed labels auto-sizing
2020-02-06 12:06:39 +01:00
fe14e0d883
Fixed mmissing #if ENABLE_SHOW_SCENE_LABELS
2020-02-06 10:39:42 +01:00
1f8a8089f9
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_labels
2020-02-05 15:27:20 +01:00
5ac404c4dc
Fixed unneded auto-extra frame render
2020-02-05 15:27:11 +01:00
e8da7007b1
Translations with arrow keys with modifiers:
...
Shift -> slower translations
Ctrl -> translations in camera space
2020-02-05 13:14:50 +01:00
26f871a6d3
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
6a1d9e6d09
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
feed9b9fd0
Added item menu 'Edit/Show labels' and removed labels activation from preferences dialog
2020-02-04 14:42:26 +01:00
308defea94
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_labels
2020-02-04 12:28:06 +01:00
c8d288cb5d
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
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
18ca88013f
Merge branch 'master' into lm_drilling_backend_rebased
2020-02-03 15:20:16 +01:00
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
30c1ca3b58
3D scene labels transparent to mouse click
2020-02-03 13:24:11 +01:00
3423e05248
Added sequential print order id to 3D scene labels
2020-02-03 11:44:26 +01:00
d344e3e2b4
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_labels
2020-02-03 08:23:55 +01:00
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
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
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
80842be583
Hollowing gizmo - most of updating now assumes that common data struct is updated properly
2020-01-30 14:31:39 +01:00
084be76425
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_labels
2020-01-29 15:46:48 +01:00
0218baf66d
Follow-up of 17a6b696e7 -> Fixed missing imgui window size initialization
2020-01-29 15:40:56 +01:00
b9562e8754
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_labels
2020-01-29 12:31:50 +01:00
763d0ee01a
Workaround to fix SPE-1082 + refactoring of 6 dof camera
2020-01-29 12:08:38 +01:00
5da2825f6f
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
d4b957f86a
Added extra frame renders to let labels grow to their final size
2020-01-28 15:57:02 +01:00
7930e60a97
1st installment of object/instance labels in 3D scene
2020-01-28 13:15:21 +01:00
1bc1ba5a1b
Use mesh boolean in the backend to drill holes.
2020-01-24 10:53:40 +01:00
322092a2f8
Merge branch 'master' into lm_tm_hollowing
2020-01-23 17:43:18 +01:00
46739c0c47
Implemented editing for extruder of existing ToolChangeCode tick
...
+ Code refactoring: DoubleSlider is extracted from wxExtensions
2020-01-23 16:11:21 +01:00
eef74403bf
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
ec31ef90e9
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
a5ccb7a6c2
Merge branch 'master' into lm_tm_hollowing
2020-01-21 13:00:07 +01:00
f131909353
Fixed conflicts after merge with master
2020-01-17 14:58:19 +01:00
e452247a97
Code refactoring to mode comparison
2020-01-17 12:24:58 +01:00
ecccddbc67
ENABLE_3DCONNEXION_DEVICES_CLOSE_SETTING_DIALOG set as default
2020-01-17 11:45:52 +01:00
5940e4f476
ENABLE_ADAPTIVE_LAYER_HEIGHT_PROFILE set as default
2020-01-17 11:26:26 +01:00
dd809882b9
ENABLE_VIEW_TOOLBAR_BACKGROUND_FIX set as default
2020-01-17 10:50:25 +01:00
f4304608a0
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_6dof_camera
2020-01-17 08:13:58 +01:00
0c750a350f
Merge remote-tracking branch 'origin/ys_cp_improvements'
2020-01-16 16:06:19 +01:00
dfdd2c8cb9
Added "mode" variable for custom_gcode_per_print_z
2020-01-16 16:01:19 +01:00
69599c574d
Merge remote-tracking branch 'foxox/feature/ScaleSpeedLegendToVisible2'
2020-01-16 13:55:59 +01:00
75a4de0213
Fixed issues in SLA gizmos related to showing/hiding of the model/support structures
2020-01-16 13:18:43 +01:00
0dd7bc26d7
3Dconnexion devices translation linearly dependent on zoom
2020-01-16 10:17:07 +01:00
c393521ffe
Customizable use of 6 dof camera
2020-01-16 09:12:36 +01:00
94a95f9786
Six degrees of freedom camera - 1st installment
2020-01-15 12:49:34 +01:00
e4ca98cca6
Fix of #3371
2020-01-06 12:41:27 +01:00
51050f4a29
Merge branch 'master' into lm_tm_hollowing
2019-12-20 10:33:53 +01:00
237e78eb6d
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer
2019-12-17 14:16:58 +01:00
