Commit Graph

9869 Commits

Author SHA1 Message Date
Enrico Turri
e5be8adadf Fixed build on MacOS 2019-06-20 11:05:05 +02:00
Enrico Turri
b7f67369c9 Serialized camera type and fixed Mac build 2019-06-20 10:02:52 +02:00
Enrico Turri
6af69667a3 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_perspective_camera 2019-06-20 08:51:08 +02:00
YuSanka
09f4831f4e Merge remote-tracking branch 'origin/master' into ys_bugfixing 2019-06-19 16:32:40 +02:00
YuSanka
7f8bb94a55 Fixed wxEVT_CHAR handling for DoubleSlider 2019-06-19 16:28:56 +02:00
tamasmeszaros
8ffd79cdd8 Fix for debug build on Visual Studio 2019-06-19 16:23:53 +02:00
tamasmeszaros
2ae2672ee9 Building igl statically and moving to the dep scripts
Fixing dep build script on Windows and removing some warnings.

Use bundled igl by default.

Not building with the dependency scripts if not explicitly stated. This way, it will stay in
Fix the libigl patch to include C source files in header only mode.
2019-06-19 14:52:55 +02:00
Enrico Turri
5dcc6c7f36 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_perspective_camera 2019-06-19 14:33:31 +02:00
Enrico Turri
b91b94ad3c Key K set as camera type toggle and updated keyboard shortcuts dialog 2019-06-19 14:33:09 +02:00
Enrico Turri
da8179d9c7 More camera related functionalities moved from GLCanvas3D to Camera 2019-06-19 14:18:51 +02:00
tamasmeszaros
89e39e3895 Eliminate magic constant 2019-06-19 13:19:11 +02:00
tamasmeszaros
1e7b5c5a81 Merge branch 'tm_rotcalipers' 2019-06-19 13:11:18 +02:00
Enrico Turri
a3e6412113 Enabled perspective camera 2019-06-19 13:01:18 +02:00
tamasmeszaros
670a563226 Fix for issue #2536 2019-06-19 12:04:11 +02:00
tamasmeszaros
4a71c42f9b Merge branch 'master' into tm_rotcalipers 2019-06-19 11:07:21 +02:00
Enrico Turri
b0b54ed0e6 Fixed flickering of 3D view when moving objects on NVIDIA graphic cards 2019-06-19 11:05:34 +02:00
Enrico Turri
a15cb597ab Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_perspective_camera 2019-06-19 10:35:27 +02:00
tamasmeszaros
78610de473 Fix build on vs2013
Fix 2 for vs2013
2019-06-19 10:18:51 +02:00
Enrico Turri
28dd52d88b Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_perspective_camera 2019-06-19 08:17:58 +02:00
tamasmeszaros
967dba2b90 Merge branch 'tm_sla_printer_mirror' 2019-06-18 17:58:23 +02:00
tamasmeszaros
2d1f13620c Merge branch 'tm_ui_jobs' 2019-06-18 17:55:56 +02:00
tamasmeszaros
b4ef812d32 Merge branch 'master' into tm_sla_printer_mirror 2019-06-18 17:42:10 +02:00
tamasmeszaros
18bbf493c1 Merge branch 'master' into tm_ui_jobs 2019-06-18 16:26:56 +02:00
tamasmeszaros
468516aa31 Apply fixes for the ui jobs.
- Localization
- Mutual exclusion (ExclusiveJobGroup), only one UI job can run at a time, and background processing is stopped
- m_range not used for finalization anymore
- stop_jobs called before Window is closed
2019-06-18 16:24:30 +02:00
Enrico Turri
b001eca21f #2528 - New project command automatically switches to 3D editor view 2019-06-18 14:45:10 +02:00
tamasmeszaros
d60ecb3788 Merge remote-tracking branch 'origin/master' into tm_ui_jobs 2019-06-18 12:16:24 +02:00
YuSanka
917702f252 Fixed DoubleSlider manipulation from Preview scene 2019-06-18 11:40:26 +02:00
bubnikv
a892fa6105 Merge remote-tracking branch 'remotes/origin/ys_bugfixing' 2019-06-18 09:57:55 +02:00
bubnikv
f72f55dc08 A bit of documentation of the mirroring and reset buttons at the side panel. 2019-06-18 09:57:07 +02:00
bubnikv
1cbd6845d5 Merge remote-tracking branch 'remotes/origin/lm_reset_buttons' 2019-06-18 09:33:33 +02:00
bubnikv
c95a324c3f Merge branch 'vb_admesh_fix' 2019-06-18 08:54:50 +02:00
bubnikv
630883ad0f Extended the error message when the G-code cannot be copied to the SD card 2019-06-18 08:54:28 +02:00
Enrico Turri
5ee695b629 #2506 - Fixed crash while manually editing SLA supports 2019-06-18 08:53:13 +02:00
YuSanka
90beadb65f Check a possibility to load SLA project if there is at least one multi-part object on the bed 2019-06-17 17:04:19 +02:00
YuSanka
f70b25d2f8 Fixed SPE 957 - Impossible to add a part by "Load..." to an object, if the object has some instances 2019-06-17 15:33:58 +02:00
YuSanka
72479428d7 Merge remote-tracking branch 'origin/master' into ys_bugfixing 2019-06-17 14:02:43 +02:00
tamasmeszaros
ce22251707 Warning hunt session followup 2019-06-17 10:05:46 +02:00
Enrico Turri
ddb4c1ff3f Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_perspective_camera 2019-06-17 09:34:25 +02:00
Enrico Turri
9ffd294f07 Fixed functions declaration template<class Tf> inline constexpr coord_t scaled(Tf val) and template<class Tf> inline constexpr Tf unscaled(coord_t val) to use constexpr on versions of Visual Studio which support it 2019-06-17 09:28:41 +02:00
tamasmeszaros
c5037540e9 Warning hunt session. 2019-06-14 18:17:17 +02:00
bubnikv
f8c5570155 Removed unnecessary copy / move constructors / assignment operators. 2019-06-14 15:47:40 +02:00
Enrico Turri
ac8de0bcaf Follow-up of 1a91add2e6 -> Improvements to tighter camera frustrum to reduce z-fighting 2019-06-14 15:37:29 +02:00
Lukas Matena
7b07a8da83 Reset buttons: synchronization of instances/volumes 2019-06-14 15:28:09 +02:00
Lukas Matena
980c6673d4 Reset buttons - fixed rotation of instances with multiple volumes
Mirroring buttons now hide where appropriate
2019-06-14 15:28:09 +02:00
Lukas Matena
a3c1644ead Added mirroring buttons into object manipulation panel 2019-06-14 15:03:42 +02:00
Lukas Matena
9f236bc603 Added transformation reset buttons in object manipulation panel 2019-06-14 15:03:42 +02:00
bubnikv
77954a13b9 Fix of admesh import due to boost::pool::destroy taking O(n).
Why on earth?!
2019-06-14 11:07:07 +02:00
Enrico Turri
541f58c656 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_perspective_camera 2019-06-14 10:57:29 +02:00
Enrico Turri
ed4b71eb15 Layers editing overlay rendering modified to use a texture drawn on a quad lying in a plane parallel to the camera viewport 2019-06-14 10:55:56 +02:00
Enrico Turri
1a91add2e6 Tighter camera frustrum to reduce z-fighting 2019-06-14 10:38:09 +02:00