Commit Graph

5637 Commits

Author SHA1 Message Date
tamasmeszaros
8ebcbc8ef1 Merging new steps integration 2019-03-27 11:05:51 +01:00
tamasmeszaros
6c5fb6430d Integrating new step, removing old and unused steps. 2019-03-27 10:59:29 +01:00
bubnikv
9cd63af034 Merge branch 'master' of https://github.com/prusa3d/Slic3r 2019-03-27 10:27:01 +01:00
bubnikv
69614c17f5 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
00e19f6bd7 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
0426ff1122 Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_canvas_gui_refactoring 2019-03-27 08:33:48 +01:00
tamasmeszaros
7c20c21255 Reusing unified polygons from statistics 2019-03-26 18:51:27 +01:00
tamasmeszaros
d12f4724f3 Adding new step for statistics 2019-03-26 18:04:04 +01:00
YuSanka
431399daf9 Fix of #2029
+ Some improvements for the language changing
2019-03-26 18:02:26 +01:00
bubnikv
9a7030bd9f Merge branch 'master' of https://github.com/prusa3d/Slic3r 2019-03-26 18:00:23 +01:00
bubnikv
17acae6587 Visual Studio specific. Fixed a clash in the name of a symbol file
for the slic3r.exe wrapper and slic3r.dll
2019-03-26 18:00:07 +01:00
Vojtech Kral
f527ed0a92 imgui: Fix assert caused by set_language() while new frame is open 2019-03-26 17:57:54 +01:00
tamasmeszaros
a7f2e63271 Merge branch 'tm_slice_index_lyrh' 2019-03-26 17:47:27 +01:00
tamasmeszaros
2e9905c1e8 Add check for missing support points if supports are enabled. 2019-03-26 17:28:51 +01:00
tamasmeszaros
fccf1692d8 Fixing broken statistics. 2019-03-26 16:45:04 +01:00
tamasmeszaros
1bc35159ed Merge branch 'master' into tm_slice_index_lyrh 2019-03-26 16:06:52 +01:00
tamasmeszaros
9a4a0caa01 Reverting manual unification. It does not help performance. 2019-03-26 16:06:24 +01:00
Enrico Turri
9fd9572691 void GLCanvas3D::update_gizmos_data() moved into void GLGizmosManager::update_data(GLCanvas3D& canvas) 2019-03-26 15:55:47 +01:00
tamasmeszaros
502212cb3b Optimizing manual unification. 2019-03-26 15:05:57 +01:00
Enrico Turri
2f1a35b49e 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
871c365cc7 Handling of gizmos related key events moved into new method GLGizmosManager::on_key() 2019-03-26 14:38:30 +01:00
Enrico Turri
0119df2dfc Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_canvas_gui_refactoring 2019-03-26 14:08:46 +01:00
Enrico Turri
ae402c1010 Handling of gizmos related char events moved into new method GLGizmosManager::on_char() 2019-03-26 14:08:02 +01:00
tamasmeszaros
af086efab8 Manual unification of print polygons.
With clipper not with the agg rasterizer, because they can be reused for the statistics.
2019-03-26 14:06:40 +01:00
bubnikv
6736b7d3a7 Added tooltip [Ctrl - R] to the Slice now button 2019-03-26 14:00:53 +01:00
Enrico Turri
e3fa7b15be Code cleanup 2019-03-26 12:39:40 +01:00
Enrico Turri
a6a344a014 Handling of gizmos related mouse events moved into GLGizmosManager::on_mouse() 2019-03-26 12:30:17 +01:00
tamasmeszaros
0841e799e8 Fix for missing support polygons 2019-03-26 11:30:55 +01:00
tamasmeszaros
58082a26d8 Move SliceRecord into SLAPrintObject 2019-03-26 11:22:35 +01:00
tamasmeszaros
b1a331e43a Merging with master, solving conflicts. 2019-03-26 11:13:28 +01:00
tamasmeszaros
d2c0d2641c Further refactor and simplification of slice index and print data. 2019-03-26 10:57:45 +01:00
bubnikv
4d1f8d0d46 Merge branch 'master' of https://github.com/prusa3d/Slic3r 2019-03-26 10:39:08 +01:00
bubnikv
df51a16ffe Improved SLA layer view: Low layer shall be rendered from the slice above,
triangulated slices are shifted slightly away from the clipping planes.

FDM: Ported a "(bridged)" G-code comment from upstream.
2019-03-26 10:38:50 +01:00
YuSanka
3d1c0f182f Fixed crash after change of a language
+ Updating of a mode after recreation
2019-03-26 10:09:53 +01:00
Enrico Turri
48f4831ffc Code cleanup 2019-03-26 09:10:35 +01:00
Enrico Turri
3466b9a946 Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_canvas_gui_refactoring 2019-03-26 09:01:53 +01:00
Enrico Turri
0337ac0839 1st installment of gizmos refactoring
1) GLCanvas3D::Gizmos moved into a standalone class GLGizmosManager

2) GLGizmosManager handles mouse events by calling its on_mouse method (wip)
2019-03-26 09:01:04 +01:00
tamasmeszaros
d9d34630a5 Merge branch 'master' into tm_slice_index_lyrh 2019-03-25 19:02:35 +01:00
tamasmeszaros
811c781852 Refactoring and commenting slice index solution. 2019-03-25 19:02:05 +01:00
Sijmen Schoon
e2ca6761f2 Merge branch 'master' into fix-assertions 2019-03-25 17:24:04 +01:00
Vojtech Kral
49af1ff0bc Build: Add an option to choose GTK version on Linux, fix #1937 2019-03-25 15:50:57 +01:00
tamasmeszaros
07961c43b4 Further fixes and some refactor. 2019-03-25 14:53:25 +01:00
Enrico Turri
c50986d7fd Code cleanup 2019-03-25 14:13:20 +01:00
Enrico Turri
4fa2a5e3b2 Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_multivolume_models 2019-03-25 14:12:40 +01:00
tamasmeszaros
3a7ef2936f Fix for orbital bug: using delete for memory created by minz. 2019-03-25 14:01:50 +01:00
tamasmeszaros
8d4bb07cb9 Next try to fix build on msvc2013 2019-03-25 13:45:28 +01:00
Enrico Turri
b7691980f1 Fix of #1998 2019-03-25 12:07:43 +01:00
tamasmeszaros
9a85d07100 Trying to fix build on msvc2013 2019-03-25 11:00:21 +01:00
Vojtech Kral
5f776e1509 Build: Fix libz dependency required by libcurl 2019-03-25 11:40:45 +01:00
tamasmeszaros
e4b2ec8a95 Add static assert instead of returning empty result. 2019-03-25 10:35:42 +01:00