Commit graph

9180 commits

Author SHA1 Message Date
Enrico Turri
7cfcf8fb9a Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_canvas_gui_refactoring 2019-04-01 11:40:08 +02:00
bubnikv
62539bc35b Fix of No preview of position in variable layer editing UI at retina resolution #2050 2019-04-01 11:08:26 +02:00
Enrico Turri
2ae5f386ae Added missing include 2019-04-01 10:28:04 +02:00
Enrico Turri
d87b478d60 Camera refactoring
1) All camera related OpenGL calls moved into class

2) The Camera class now stores the view matrix, the projection matrix and the viewport

3) The Camera class now exposes methods to get the camera orientation vectors, the camera position, the view matrix, the projection matrix and the viewport

4) All the code operating on the camera or requiring camera data has been modified to use the new methods
2019-04-01 10:00:10 +02:00
Enrico Turri
ba89f04429 Fix of visual hints for rotation of full single instance selection 2019-04-01 09:11:23 +02:00
Enrico Turri
1ce3bb690c Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_canvas_gui_refactoring 2019-04-01 08:28:38 +02:00
tamasmeszaros
725f115756 Merging with master for having minz png compression.
Much greater performance boost from better compression algorithm than that from the merged polygons.
2019-03-29 15:21:46 +01:00
Vojtech Kral
3cfb234e86 imgui: Get font size from wxWidgets, fix #2043 2019-03-29 14:58:32 +01:00
YuSanka
ac6a232795 Improved Selection from ObjectList side 2019-03-29 14:36:59 +01:00
Lukas Matena
32ed064797 SLA gizmo fix: occasional crashes after deleting objects 2019-03-29 13:38:33 +01:00
Enrico Turri
aca78cfba2 Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_canvas_gui_refactoring 2019-03-29 12:58:41 +01:00
Enrico Turri
49fe8a9f08 Volumes selected from the sidebar table taken from the currently selected instance 2019-03-29 10:48:20 +01:00
YuSanka
44d3243df1 Added context menu Item "Change Extruder" on 3D-Scene 2019-03-28 16:32:19 +01:00
YuSanka
016b5e35b6 Some _cosmetic_ fixes :
+ Set wxDEFAULT_DIALOG_STYLE for MsgDialog
+ Changed Msg text before language changing
2019-03-28 16:32:19 +01:00
Enrico Turri
af3a32b8a0 Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_canvas_gui_refactoring 2019-03-28 09:30:23 +01:00
Enrico Turri
9b3f1a8942 Small refactoring -> GLGizmosManager gets model from selection and not from canvas 2019-03-28 09:30:01 +01:00
bubnikv
fc49abc2a4 Merge remote-tracking branch 'remotes/origin/tm_sla_png_minz' 2019-03-28 09:14:37 +01:00
Enrico Turri
98a848d239 Layers editing initialized only for 3D view and not for g-code preview 2019-03-28 09:12:32 +01:00
Enrico Turri
a4f404a6a4 Selection enabled only for 3D view and not for g-code preview 2019-03-28 08:44:46 +01:00
Enrico Turri
702186eec3 Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_canvas_gui_refactoring 2019-03-28 08:24:25 +01:00
YuSanka
3c163285e5 Fix of SPE-879 and #2021 2019-03-27 17:00:29 +01:00
Enrico Turri
46eafca0eb Follow-up of 8ea8eb67e4, utf-8 path conversion moved into nanosvg library 2019-03-27 15:42:01 +01:00
Enrico Turri
d0046283fa Added #define glcheck() for the case HAS_GLSAFE not defined 2019-03-27 15:14:40 +01:00
Enrico Turri
8459410e3c Fixed conflicts after merge with master 2019-03-27 14:57:05 +01:00
Enrico Turri
d795f07e7b Added glsafe() around OpenGL calls where missing 2019-03-27 14:42:09 +01:00
Lukas Matena
490074a2dd SLA gizmo now turns off in case someone adds an object/instance (to prevent rendering points in thin air, etc.)
Also, a bug appering when adding an object larger than the bed and scaling it down was fixed (sla gizmo did not work correctly in that case)
2019-03-27 14:19:12 +01:00
Vojtech Kral
1e9e378659 Fix string access in Preferences.cpp 2019-03-27 13:53:00 +01:00
YuSanka
87febaacc0 Fix of #2014 2019-03-27 13:19:27 +01:00
Enrico Turri
30c4e4fed6 Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_canvas_gui_refactoring 2019-03-27 12:51:59 +01:00
Enrico Turri
c44b6a30f9 Fixed conflicts after merge with master 2019-03-27 12:51:40 +01:00
Vojtech Kral
734d57a714 Fix build on MSVC with PCH off 2019-03-27 12:14:34 +01:00
Enrico Turri
8ea8eb67e4 Fixed loading of SVG textures from utf-8 paths 2019-03-27 12:02:50 +01:00
Vojtech Kral
8dbbfc140b
Merge pull request #2005 from SijmenSchoon/fix-assertions
Fix tree-related assertions on startup on Linux
2019-03-27 11:29:32 +01:00
tamasmeszaros
bc74761513 Integrating new step, removing old and unused steps. 2019-03-27 10:59:29 +01:00
bubnikv
84ff7f4221 Merge branch 'master' of https://github.com/prusa3d/Slic3r 2019-03-27 10:27:01 +01:00
bubnikv
3987296b62 Improved glsafe macro to print out file name, line number and function
name on OpenGL assert.
2019-03-27 10:26:55 +01:00
Enrico Turri
3cd6db2278 Fixed selection lost when Place on Face gizmo is active and user click on another object 2019-03-27 09:06:53 +01:00
Enrico Turri
000542f48d Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_canvas_gui_refactoring 2019-03-27 08:33:48 +01:00
YuSanka
c8291c6e52 Fix of #2029
+ Some improvements for the language changing
2019-03-26 18:02:26 +01:00
Vojtech Kral
937f6112ce imgui: Fix assert caused by set_language() while new frame is open 2019-03-26 17:57:54 +01:00
tamasmeszaros
4d8800bc8a Fixing broken statistics. 2019-03-26 16:45:04 +01:00
tamasmeszaros
4c972549fb Merge branch 'master' into tm_slice_index_lyrh 2019-03-26 16:06:52 +01:00
Enrico Turri
fee0a6b6b5 void GLCanvas3D::update_gizmos_data() moved into void GLGizmosManager::update_data(GLCanvas3D& canvas) 2019-03-26 15:55:47 +01:00
Enrico Turri
1fbdf7bdaa Gizmos' grabbers size made uniform as the mean value of the selection's bounding box sides 2019-03-26 14:53:32 +01:00
Enrico Turri
47c39f51e5 Handling of gizmos related key events moved into new method GLGizmosManager::on_key() 2019-03-26 14:38:30 +01:00
Enrico Turri
52f11a6f0d Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_canvas_gui_refactoring 2019-03-26 14:08:46 +01:00
Enrico Turri
d18208458b Handling of gizmos related char events moved into new method GLGizmosManager::on_char() 2019-03-26 14:08:02 +01:00
bubnikv
0a3500b5ab Added tooltip [Ctrl - R] to the Slice now button 2019-03-26 14:00:53 +01:00
Enrico Turri
c1d74d2943 Code cleanup 2019-03-26 12:39:40 +01:00
Enrico Turri
eafdcb04ba Handling of gizmos related mouse events moved into GLGizmosManager::on_mouse() 2019-03-26 12:30:17 +01:00