Commit graph

4514 commits

Author SHA1 Message Date
YuSanka
629584e28f Editing of the custom GCodes like ColorChange and PausePrint 2020-06-07 22:42:54 +02:00
enricoturri1966
bd5a5bf78f Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer 2020-06-05 16:51:11 +02:00
enricoturri1966
70a6fb0e20 Added new tech ENABLE_GCODE_VIEWER_AS_STATE -> GCodeViewer as a new application state (WIP) + fix of conflicts after merge with master 2020-06-05 16:50:17 +02:00
enricoturri1966
13a2e8e64d Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2020-06-05 14:25:29 +02:00
enricoturri1966
2b19f471bd Follow-up of 4f63095d9a -> Collapse toolbar disabled by default 2020-06-05 14:25:15 +02:00
YuSanka
530786fca4 Object merge: fixed merge of the objects with changed rotation, scale and mirror
+ Fixed get_object_stl_stats()
2020-06-05 13:15:49 +02:00
enricoturri1966
4f63095d9a Collapse toolbar moved from GLCanvas3D to Plater::priv 2020-06-05 12:33:09 +02:00
Vojtech Bubnik
1e3290fee1 Reduced ugly copy / paste for ENABLE_OPENGL_ERROR_LOGGING 2020-06-04 15:53:58 +02:00
enricoturri1966
ad7e7ae1cd Added tech ENABLE_OPENGL_ERROR_LOGGING -> log opengl errors when SLIC3R_LOGLEVEL=5 2020-06-04 14:48:52 +02:00
enricoturri1966
c3d643ead3 Fixed conflicts after merge with master 2020-06-04 13:57:39 +02:00
Lukas Matena
1e5d1cb616 Fixed a crash when switching from SLA to FDM with a gizmo active
If a gizmo used SupportsClipper or HollowedMesh common data, it would attempt to update from a dead SLAPrintObject
2020-06-03 16:39:12 +02:00
Lukas Matena
ed98a859af Fix of #3919 (extremely wide wipe tower with 0.35mm FAST profile)
This is an excerpt from ec86d94, which was recently reverted because
the other changes from that commit broke some functionality.
2020-06-03 15:34:33 +02:00
Lukas Matena
2cc1dffc82 Fix of several issues related to gizmos updating and undo/redo
Common gizmos data cannot be used in on_set_state method
Also prevented calling render on empty GLVertexArrays
2020-06-03 15:33:39 +02:00
Lukas Matena
dc725ecbad Fixup of previous commit 2020-06-02 14:49:40 +02:00
Lukas Matena
a4d30fc9bb Fixed a crash when switching between tabs
Introduced in ba963ac
2020-06-02 11:42:25 +02:00
enricoturri1966
06a8bfa588 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2020-06-02 10:03:00 +02:00
enricoturri1966
aa92cbf051 New tech ENABLE_SMOOTH_NORMALS (disabled) -> Added two experimental functions to smooth normals using libigl (none of them working properly in detecting edges) when calling GLIndexedVertexArray::load_mesh_full_shading() 2020-06-02 10:02:50 +02:00
YuSanka
9146ef2f61 Copy/Paste for the Settings and Layers in the ObjectList 2020-06-01 11:11:38 +02:00
enricoturri1966
707268d41d ENABLE_GCODE_VIEWER -> Improvements in shaders for options 2020-06-01 08:55:44 +02:00
enricoturri1966
71db69ef41 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer 2020-05-29 12:29:24 +02:00
enricoturri1966
dcec684cc7 ENABLE_GCODE_VIEWER -> Refactoring of shaders for options 2020-05-29 12:29:04 +02:00
Lukas Matena
21de9d23ec Bugfix: Cut gizmo ignored SLA elevation and the cut ended up shifted
It is still possible to set the plane into the space under an object,
but at least it always cuts where indicated.
2020-05-28 16:15:49 +02:00
enricoturri1966
e9d57c932a Fixed conflicts after merge with master 2020-05-28 15:50:21 +02:00
enricoturri1966
0599dc4df7 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2020-05-28 15:27:39 +02:00
enricoturri1966
c63e03c367 1st installment of tech ENABLE_ENVIRONMENT_MAP 2020-05-28 15:27:29 +02:00
YuSanka
ba963ac404 Save a position and size of the settings dialog
+ Added a check of the printer technology inside can_merge_to_multipart_object() => suppress merge for the SLA printing
+ clear MainFrame.cpp from unused commented code
2020-05-28 14:38:56 +02:00
Lukas Matena
b376e2c703 FDM supports gizmo: clicking the clipping plane starts painting 2020-05-28 13:10:40 +02:00
enricoturri1966
96db6aaadb Attempt to fix rambling crash on Mac Asan 2020-05-28 11:14:56 +02:00
enricoturri1966
2904ee6e1a Added missing include 2020-05-28 09:38:08 +02:00
enricoturri1966
9c8892c869 GCodeViewer -> Shaders code cleanup 2020-05-28 09:23:30 +02:00
enricoturri1966
edaabf3fbd GCodeViewer -> Experimental hexagonal icons for toolpaths in legend 2020-05-28 07:52:11 +02:00
YuSanka
4b6bcd7028 Merge: Implemented merge to the separate object, when some instance is selected 2020-05-27 22:30:24 +02:00
Lukas Matena
6d432f5426 Fixes second part of #4282 (wxWidgets 3.0 compatibility) 2020-05-27 17:30:56 +02:00
enricoturri1966
0e018e6690 Merge branch 'et_gcode_viewer' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer 2020-05-27 16:31:26 +02:00
enricoturri1966
abd7d74800 GCodeViewer -> Small refactoring 2020-05-27 16:31:02 +02:00
enricoturri1966
35190936a3 GCodeViewer -> Newer version of shader for options 2020-05-27 16:19:40 +02:00
enricoturri1966
af3765c04c Follow up of e77fa3512a -> changed logic for DoubleSlider::Control accelerators 2020-05-27 16:14:14 +02:00
enricoturri1966
e77fa3512a DoubleSlider::Control -> Shift and Ctrl used as accelerators for moving thumbs with arrows key and mouse wheel 2020-05-27 16:03:40 +02:00
enricoturri1966
100484dabe Added missing include 2020-05-27 15:28:24 +02:00
enricoturri1966
448d92df68 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer 2020-05-27 14:29:54 +02:00
enricoturri1966
a0acf24ab8 DoubleSlider::Control -> Fixed crash when pressing numpad [+] and [-] keys while the horizontal slider has focus 2020-05-27 14:29:27 +02:00
Lukas Matena
d9b764bd10 Removed obsolete LambdaObjectDialog.cpp/hpp, more include cleanups:
BedShapeDialog.hpp (needs not include) OptionsGroup.hpp
Tab.hpp            GUI_App.hpp
2020-05-27 14:01:48 +02:00
Lukas Matena
48c186331a Includes cleanup:
GUI_App.hpp      (should not include) MainFrame.hpp
MainFrame.hpp    Plater.hpp
ModelArrange.hpp Model.hpp
Slicing.hpp      PrintConfig.hpp
FillBase.hpp     PrintConfig.hpp
GUI_App.hpp      PrintConfig.hpp
OptionsGroup.hpp GUI_App.hpp
2020-05-27 14:01:47 +02:00
YuSanka
ee1942e4e9 Implemented merge of the objects to the one multi-part object
+ Implemented merge of the parts to the one object. But now this function doesn't used.

+ Fixed Model::looks_like_imperial_units()
2020-05-27 11:59:43 +02:00
enricoturri1966
94a4689b00 DoubleSlider::Control -> Change text position at the edges of horizontal slider 2020-05-27 11:50:29 +02:00
Lukas Matena
f2f1cfef9a Fix of #4282 (wxOVERRIDE macro not available in wxWidgets 3.0)
Now that we use C++17, there is no point in using it in PrusaSlicer codebase
2020-05-27 10:58:38 +02:00
enricoturri1966
2eb4b2caed Fixed conflicts after merge with master 2020-05-27 10:32:02 +02:00
enricoturri1966
aa04f0e555 ENABLE_GCODE_VIEWER -> Completed implementation of new GLModel class 2020-05-27 08:06:02 +02:00
Lukas Matena
55395e046f EigenMesh3D does not store a copy of the mesh
Instead, it stores a pointer to extern TriangleMesh (which must not be destroyed before the EigenMesh3D object)
2020-05-27 00:51:11 +02:00
Lukas Matena
32a353058f Fixed few warnings 2020-05-26 16:06:11 +02:00