YuSanka
15902766d0
Workaround for extruder editing under OSX
2019-10-02 11:53:50 +02:00
Enrico Turri
644cc8c6b4
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_3dconnexion
2019-10-02 11:01:31 +02:00
Enrico Turri
fbe38fb2a4
#3008 - Generate all mipmaps up to size 1x1
2019-10-02 10:57:07 +02:00
YuSanka
a0b46a4019
Merge remote-tracking branch 'origin/master' into ys_extruders_color
2019-10-01 18:20:59 +02:00
YuSanka
d7ebc4de5b
Added color for extruder
2019-10-01 18:19:28 +02:00
tamasmeszaros
e675a5d5c6
Reworked pad creation algorithm with new parameters:
...
* brim size
* force pad around object everywhere
2019-10-01 14:58:37 +02:00
tamasmeszaros
710adca6fe
Don't disable pad around object parameters if supports are disabled.
2019-10-01 14:57:37 +02:00
YuSanka
45b81f1805
Fixed "unhandled unknown exception", when try to change an extruder count.
...
Side effect after 86b258f727 .
2019-10-01 14:27:51 +02:00
Lukas Matena
61cee54dd3
Merge branch 'master' into lm_low_wipe_tower
2019-10-01 13:24:25 +02:00
bubnikv
93a157e26c
Merge branch 'master' of https://github.com/Prusa3d/PrusaSlicer
2019-09-30 16:25:31 +02:00
bubnikv
272479826f
Refactoring of the G-code preview for lower memory allocation
...
and for separation of concerns:
The final G-code preview no more uses ExtrusionPaths structure
to hold the G-code path data extracted by parsing the G-code.
Instead, the ExtrusionPath class has been trimmed down back to
the original size before the G-code preview was introduced,
and a new GCodePreviewData::Extrusion::Path class was created to hold
the additional path data as the extruder ID, color change ID
and fan speed.
2019-09-30 16:25:26 +02:00
Vojtech Kral
eb93d2a32d
Merge branch 'master' into materials
2019-09-30 16:12:48 +02:00
Enrico Turri
d58dedd459
ENABLE_3DCONNEXION_DEVICES -> Increased limit of device buttons
2019-09-30 15:58:45 +02:00
Enrico Turri
b11704d380
Merge branch 'et_3dconnexion' of https://github.com/prusa3d/PrusaSlicer into et_3dconnexion
2019-09-30 15:38:13 +02:00
Vojtech Kral
520a51c62f
hidapi: Fix include path
2019-09-30 15:20:23 +02:00
Enrico Turri
7c8732d560
Merge branch 'et_3dconnexion' of https://github.com/prusa3d/PrusaSlicer into et_3dconnexion
2019-09-30 15:19:36 +02:00
Enrico Turri
eabaa21df2
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_3dconnexion
2019-09-30 15:19:21 +02:00
Vojtech Kral
82fed1790a
3D connexion support on Linux:
...
- Replace hidapi/linux/hid.c with the hidraw variant (link to udev)
- Add CMakeLists.txt for hidapi, refactor
- Add udev rules file (no installation so far)
2019-09-30 14:59:21 +02:00
YuSanka
c07a193b4e
Implemented BitmapChoiseRenderer
2019-09-30 14:34:29 +02:00
YuSanka
f5593c05aa
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer
2019-09-30 14:04:45 +02:00
YuSanka
904bbcc006
Fix of SPE-1035 (Wrong filament color updating for multi-material print)
2019-09-30 13:59:26 +02:00
bubnikv
b425ee50a9
Merge remote-tracking branch 'remotes/origin/et_pull_2922'
2019-09-30 10:23:16 +02:00
Enrico Turri
7f7b3e0b0b
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_3dconnexion
2019-09-30 08:15:20 +02:00
Lukas Matena
5ded376fe2
An attempt to fix #2997
...
More fixes might be needed on the other platforms
2019-09-28 09:57:26 +02:00
Enrico Turri
1aa559585c
Added missing include
2019-09-27 15:26:13 +02:00
Enrico Turri
4b3eab0ed9
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_3dconnexion
2019-09-27 14:52:30 +02:00
Enrico Turri
f958cfd2ff
ENABLE_3DCONNEXION_DEVICES - 1st installment of support for 3Dconnexion devices
...
Implemented using hidapi library (https://github.com/libusb/hidapi ) and https://github.com/koenieee/CrossplatformSpacemouseDriver/tree/master/SpaceMouseDriver as reference
Unsolved issues:
- When manipulating the SpaceNavigator wxWidgets generates a mouse wheel event that needs to be filtered out
- wxWidgets does not detect devices being connected/disconnected to the pc
- Current state forces a continuous rendering
- Current state misses dependence on camera zoom
- Non intuitive movement limits
- Translation and rotation speed factors are hardcoded
- Number of device buttons hardcoded
2019-09-27 14:52:19 +02:00
YuSanka
c370fccd8b
Changed default values.
...
And bottle_volume is preferred to recalculation instead of bottle_weight
2019-09-27 12:08:08 +02:00
YuSanka
82bc243281
Implemented possibility to set a resin cost
2019-09-26 16:36:31 +02:00
YuSanka
1a03b664b9
Some changes for alignments in manipulation panel
2019-09-25 15:04:39 +02:00
Enrico Turri
6f8a9bc1ff
Fixed visual hints in 3D scene not disappearing when tabbing out of size z field in object manipulators sidebar
2019-09-25 13:05:18 +02:00
Lukas Matena
dbc51a140d
Fixed erroneous use of logical OR where bitwise OR was meant
...
Also, PrintBase::SlicingStatus enum had two entries assigned to 0 - removed the one that was never used
2019-09-25 12:18:30 +02:00
YuSanka
efb9ef37f6
Merge remote-tracking branch 'origin/master' into ys_manipulation_panel_rw
2019-09-25 11:33:19 +02:00
Enrico Turri
fdbe339622
Fixed gizmo scale for objects added to scene using the new context menu
2019-09-25 11:25:14 +02:00
YuSanka
6faf67d90c
Add binding for ManipulationEditors
2019-09-25 11:25:05 +02:00
Lukas Matena
7861fa5086
Whitespace changes to supress misleading indentation warnings
...
These appear in newer gcc when spaces and tabs are mixed
2019-09-24 16:01:01 +02:00
YuSanka
b2e7081d31
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer
2019-09-24 14:33:20 +02:00
YuSanka
9607fbeb6d
Fix of SPE-1027
2019-09-24 14:32:59 +02:00
Enrico Turri
2fd5044460
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer
2019-09-24 14:13:22 +02:00
Enrico Turri
7c1706f7ee
Follow-up of f4910cafed -> Fix extended to Mac
2019-09-24 14:13:03 +02:00
Lukas Matena
c1e3be9b27
MeshUtils.cpp: MeshRaycaster is now aware of the clipping plane
2019-09-24 12:58:12 +02:00
Enrico Turri
a68a72a660
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer
2019-09-24 09:11:43 +02:00
Enrico Turri
e6604afd05
#2972 - Fixed selection after adding an instance with autocenter active
2019-09-24 09:11:27 +02:00
YuSanka
a234193dea
Fixed localization for "Configuration Wizard" menu item
2019-09-23 16:29:07 +02:00
Enrico Turri
2dc9949a4c
ENABLE_ENHANCED_RELOAD_FROM_DISK set as default
2019-09-23 15:35:49 +02:00
Enrico Turri
82a52e8b21
#2922 - Port of commit: f42edd35ce by jschuh
2019-09-23 14:56:27 +02:00
YuSanka
d90a27d5f8
Merge remote-tracking branch 'origin' into ys_manipulation_panel_rw
2019-09-23 14:37:06 +02:00
YuSanka
c0c937425f
Added missed comment to 7e060f84bd
2019-09-23 14:24:53 +02:00
Enrico Turri
4a45c1aa41
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_reload_from_disk
2019-09-23 12:34:18 +02:00
YuSanka
4e22761f95
Fix of #2977
2019-09-23 10:17:53 +02:00