e40b6ba364
hidapi: Fix include path
2019-09-30 15:20:23 +02:00
f261ee53e4
Merge branch 'et_3dconnexion' of https://github.com/prusa3d/PrusaSlicer into et_3dconnexion
2019-09-30 15:19:36 +02:00
9fa961d693
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_3dconnexion
2019-09-30 15:19:21 +02:00
89d0b105d4
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
6c52a6c192
Implemented BitmapChoiseRenderer
2019-09-30 14:34:29 +02:00
07798b51aa
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer
2019-09-30 14:04:45 +02:00
682b9e0d46
Fix of SPE-1035 (Wrong filament color updating for multi-material print)
2019-09-30 13:59:26 +02:00
4bfc7f9faa
Merge remote-tracking branch 'remotes/origin/et_pull_2922'
2019-09-30 10:23:16 +02:00
8dbbf36466
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_3dconnexion
2019-09-30 08:15:20 +02:00
5bf68de25e
An attempt to fix #2997
...
More fixes might be needed on the other platforms
2019-09-28 09:57:26 +02:00
5bf722f015
Added missing include
2019-09-27 15:26:13 +02:00
c0f4c1d288
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_3dconnexion
2019-09-27 14:52:30 +02:00
f4b29a4107
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
68f099b299
Changed default values.
...
And bottle_volume is preferred to recalculation instead of bottle_weight
2019-09-27 12:08:08 +02:00
515c7e3baf
Implemented possibility to set a resin cost
2019-09-26 16:36:31 +02:00
df4e1dc325
Some changes for alignments in manipulation panel
2019-09-25 15:04:39 +02:00
be6cac24ec
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
2fa1094b4e
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
c5b4789d5c
Merge remote-tracking branch 'origin/master' into ys_manipulation_panel_rw
2019-09-25 11:33:19 +02:00
daaf6079a7
Fixed gizmo scale for objects added to scene using the new context menu
2019-09-25 11:25:14 +02:00
0e5c18aa6a
Add binding for ManipulationEditors
2019-09-25 11:25:05 +02:00
a34a1341c5
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
84756bfc6a
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer
2019-09-24 14:33:20 +02:00
2424b5f267
Fix of SPE-1027
2019-09-24 14:32:59 +02:00
05a3a0627c
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer
2019-09-24 14:13:22 +02:00
6c20cef2cf
Follow-up of f4910cafed -> Fix extended to Mac
2019-09-24 14:13:03 +02:00
b9e86d21ec
MeshUtils.cpp: MeshRaycaster is now aware of the clipping plane
2019-09-24 12:58:12 +02:00
cbd6e9f18a
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer
2019-09-24 09:11:43 +02:00
9a158663b1
#2972 - Fixed selection after adding an instance with autocenter active
2019-09-24 09:11:27 +02:00
a127568500
Fixed localization for "Configuration Wizard" menu item
2019-09-23 16:29:07 +02:00
03507f9b7d
ENABLE_ENHANCED_RELOAD_FROM_DISK set as default
2019-09-23 15:35:49 +02:00
dd503c328f
#2922 - Port of commit: f42edd35ce by jschuh
2019-09-23 14:56:27 +02:00
1f136acc62
Merge remote-tracking branch 'origin' into ys_manipulation_panel_rw
2019-09-23 14:37:06 +02:00
96057e2270
Added missed comment to 7e060f84bd
2019-09-23 14:24:53 +02:00
7b60670971
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_reload_from_disk
2019-09-23 12:34:18 +02:00
46960d10aa
Fix of #2977
2019-09-23 10:17:53 +02:00
b4046dd27e
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_reload_from_disk
2019-09-23 08:27:01 +02:00
94a10eb488
Fix of https://github.com/prusa3d/PrusaSlicer/issues/2953
...
printf-like function argument mismatch: num was long, which was obfuscated by the auto keyword
2019-09-20 16:47:10 +02:00
d8f2a73d64
Merge branch 'dev' of https://github.com/prusa3d/PrusaSlicer into dev
2019-09-20 11:30:53 +02:00
5bb32af88e
Forcing of explicit SetWidth for the columns under OSX, as an attempt to fix a narrow column width on 4(5)K monitors under OSX
2019-09-20 11:30:29 +02:00
b9894c36c4
Follow-up of 8aaff08355 -> Do not show the new context menu when the user pans the scene + cleanup
2019-09-20 11:19:06 +02:00
be71ec207a
Added a config option to not print sparse layers on the wipe tower
2019-09-20 10:54:20 +02:00
8704f35348
Merge branch 'dev' of https://github.com/prusa3d/PrusaSlicer into dev
2019-09-20 09:58:33 +02:00
4e35bf53c7
Added Possibility to create "shape" as an independent object from 3dScene,
...
using right click on empty place
2019-09-20 09:57:27 +02:00
3796ae0343
#2948 - Max zoom takes in account custom bed model size
2019-09-20 09:53:35 +02:00
2b28fe85ab
Merge branch 'dev' of https://github.com/Prusa3d/PrusaSlicer into dev
2019-09-19 17:16:43 +02:00
bb9cb6d793
Slic3r -> PrusaSlicer in config snapshot dialog.
2019-09-19 17:16:37 +02:00
3495625b5b
Merge remote-tracking branch 'origin/dev' into ys_manipulation_panel_rw
2019-09-19 15:39:13 +02:00
3ea32d1fac
Fix of SPE-1026 (Height range value works differently if you press enter and if you leave textbox)
...
Related to GH #2946
2019-09-19 15:28:36 +02:00
05181c80d9
Merge branch 'dev' of https://github.com/prusa3d/PrusaSlicer into dev
2019-09-19 14:12:12 +02:00
