Commit Graph

13712 Commits

Author SHA1 Message Date
enricoturri1966
b3404fe6fb Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2020-05-28 15:27:39 +02:00
enricoturri1966
e765cebcdd 1st installment of tech ENABLE_ENVIRONMENT_MAP 2020-05-28 15:27:29 +02:00
YuSanka
b77af5c0eb 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
b0a139c411 FDM supports gizmo: clicking the clipping plane starts painting 2020-05-28 13:10:40 +02:00
Lukas Matena
8311e2917b Introduced a limit on max print z (1.2 m)
A follow-up of 815989d, related to #2877
2020-05-28 12:03:48 +02:00
enricoturri1966
a0483d2350 Attempt to fix rambling crash on Mac Asan 2020-05-28 11:14:56 +02:00
enricoturri1966
087cf30bf7 Added missing include 2020-05-28 09:38:08 +02:00
enricoturri1966
18fa76326b GCodeViewer -> Shaders code cleanup 2020-05-28 09:23:30 +02:00
enricoturri1966
71557d317d GCodeViewer -> Experimental hexagonal icons for toolpaths in legend 2020-05-28 07:52:11 +02:00
enricoturri1966
000921dfc9 GCodeViewer -> Improved depth detection in shader for options 2020-05-28 07:06:54 +02:00
YuSanka
2013285040 Merge: Implemented merge to the separate object, when some instance is selected 2020-05-27 22:30:24 +02:00
Lukas Matena
ac710216de Fixes second part of #4282 (wxWidgets 3.0 compatibility) 2020-05-27 17:30:56 +02:00
enricoturri1966
e06be8338a Merge branch 'et_gcode_viewer' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer 2020-05-27 16:31:26 +02:00
enricoturri1966
f760fa1305 GCodeViewer -> Small refactoring 2020-05-27 16:31:02 +02:00
enricoturri1966
6a1d3787e5 GCodeViewer -> Newer version of shader for options 2020-05-27 16:19:40 +02:00
enricoturri1966
b4a1da9506 Follow up of e77fa3512a -> changed logic for DoubleSlider::Control accelerators 2020-05-27 16:14:14 +02:00
enricoturri1966
05cbb8093e Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer 2020-05-27 16:03:56 +02:00
enricoturri1966
3bf4d3eb45 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
8cbb040b20 Added missing include 2020-05-27 15:28:24 +02:00
Yuri D'Elia
d331efe2db Ironingy typo 2020-05-27 14:31:17 +02:00
enricoturri1966
5bbc804744 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer 2020-05-27 14:29:54 +02:00
enricoturri1966
64e585d4c6 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
ffab25560c 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
edcaab8b0a 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
00878e21e9 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
3431cfc752 DoubleSlider::Control -> Change text position at the edges of horizontal slider 2020-05-27 11:50:29 +02:00
Lukas Matena
84b151c558 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
5857f1f2e3 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer 2020-05-27 10:45:19 +02:00
enricoturri1966
acd8801d3a Fixed conflicts after merge with master 2020-05-27 10:32:02 +02:00
Lukas Matena
9f07cbaff0 Reenabled SLIC3R_HOLE_RAYCASTER before unit tests are updated properly
There are still tests of removing holes on slices and raycasting on unaltered mesh (which was eventually superseded by CGAL boolean operations)
2020-05-27 10:05:54 +02:00
enricoturri1966
ce42c67a2a ENABLE_GCODE_VIEWER -> Completed implementation of new GLModel class 2020-05-27 08:06:02 +02:00
Lukas Matena
a7354f722e Merge branch 'lm_aabb_improvements' 2020-05-27 02:15:54 +02:00
Lukas Matena
27b3d906da 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
20aafec26e More code cleaning,...
optimizations regarding normals calculation
removed unused EigenMesh3D(const Contour3D &other) constructor
removed unused class si_result
2020-05-27 00:51:11 +02:00
Lukas Matena
8183e65071 EigenMesh3D now stores TriangleMesh inside, not a mesh in Eigen format
Rotfinder was apparently building the AABB tree needlessly
2020-05-27 00:51:11 +02:00
Lukas Matena
5de468a01a Removed some unused code
- removed define USE_AABB_INDIRECT (which switched between old and new AABB implementation)
- removed define SLIC3R_SLA_NEEDS_WINDTREE (relied on igl and was not used anyway)
- new define SLIC3R_HOLE_RAYCASTER (hides currently unused code)
- slight include cleanup
- removed obsolete source file SupportTreeIGL.cpp
2020-05-27 00:51:11 +02:00
Lukas Matena
972957995a Switched to new AABB tree implementation for raycasting 2020-05-27 00:13:38 +02:00
Lukas Matena
a47ed6e597 Merge branch 'lm_includes_warnings'
No functional changes (hopefully).
2020-05-26 16:14:09 +02:00
Lukas Matena
e8e004ab5e Fixed few warnings 2020-05-26 16:06:11 +02:00
Lukas Matena
c15a0d91bf Fixed unit tests after previous include manipulations 2020-05-26 15:33:44 +02:00
Lukas Matena
937af2a2ce Include cleanup: Selection.hpp
It does not need 3DScene.hpp and Model.hpp
And it does not to be included by GLGizmoBase.hpp
2020-05-26 13:46:59 +02:00
Lukas Matena
ae8772b90d Few more include chains broken 2020-05-26 13:46:59 +02:00
Lukas Matena
4fa702c570 Slight include cleanup 2020-05-26 13:45:36 +02:00
Lukas Matena
802a58cdb4 Include cleanup: GUI_ObjectManipulation.hpp, GUI, GUI_Preview 2020-05-26 13:45:36 +02:00
Lukas Matena
a8628a040c Include cleanup: do not include Model.hpp from 3DScene.hpp 2020-05-26 13:45:36 +02:00
enricoturri1966
230c32667c DoubleSlider::Control -> Tweaks to text position for horizontal case 2020-05-26 08:34:19 +02:00
enricoturri1966
afdb571bb2 GCodeViewer -> Temporary ImGui dialog for editing shaders parameters 2020-05-26 08:16:08 +02:00
enricoturri1966
c91fcc4778 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer 2020-05-25 13:55:23 +02:00
Enrico Turri
1002f9c42b DoubleSlider:Control platform dependent background color 2020-05-25 13:53:41 +02:00
Enrico Turri
06157ea5af Merge branch 'et_gcode_viewer' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer 2020-05-25 12:08:26 +02:00