1
0
mirror of https://github.com/FULU-Foundation/OrcaSlicer-bambulab.git synced 2026-07-12 08:14:26 +00:00
Commit Graph

1127 Commits

Author SHA1 Message Date
Lukas Matena 6646198a9b Merge branch lm_seam_painter_frontend 2020-09-01 23:03:16 +02:00
Lukas Matena 01b59ff57b Seam gizmo created on frontend 2020-09-01 18:18:57 +02:00
Lukas Matena db7559157c Revert "Forbid translation of objects when SLA/Hollow/FDM gizmos are active"
This reverts commit c291717909. Translation of object when those
gizmos are active should already be supressed by previous commit (ba97ebb0). The FDM gizmo was
erroneously not blocking the translation, the commit that is reverted is therefore needless
after this was fixed the way it should have been fixed in the first place.
2020-09-01 18:18:57 +02:00
Lukas Matena d3e7684a5a Forbid translation of objects when SLA/Hollow/FDM gizmos are active 2020-09-01 18:18:56 +02:00
David Kocik bca60821d8 notifications: plater warning refactor 2020-09-01 15:57:48 +02:00
enricoturri1966 e32930aa6c Code cleanup 2020-09-01 09:28:02 +02:00
enricoturri1966 34759f9a70 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer 2020-08-21 11:10:27 +02:00
Lukas Matena c291717909 Forbid translation of objects when SLA/Hollow/FDM gizmos are active 2020-08-21 09:49:39 +02:00
enricoturri1966 dea641183c Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer 2020-08-10 14:22:46 +02:00
YuSanka a6dc3d37f5 Merge remote-tracking branch 'origin/master' into ys_ph_printers 2020-08-06 17:02:48 +02:00
enricoturri1966 8fc5be7e4f Refactoring to allow to quickly build the various options to show the estimated printing time in gcode viewer scene 2020-08-05 15:43:46 +02:00
enricoturri1966 25c3552555 Fixed conflicts after merge with master 2020-08-04 09:58:19 +02:00
David Kocik b3f8ae5ca7 Notifications & warning dialog
notifications
dialog with warnings produced by slicing is shown before exporting
2020-08-03 15:49:25 +02:00
enricoturri1966 0840b2328a Tech ENABLE_GCODE_VIEWER_AS_STATE set as default 2020-08-03 15:00:19 +02:00
enricoturri1966 69a0a1c96e Fixed conflicts after merge with master 2020-08-03 08:56:58 +02:00
enricoturri1966 a29b00a0b4 Use ImGui::TextColored() 2020-08-03 08:28:43 +02:00
enricoturri1966 39d08441cc ENABLE_GCODE_VIEWER_AS_STATE -> Fixed collapse toolbar showing-up when presing [T] in gcode preview mode 2020-07-29 15:40:28 +02:00
YuSanka 3c3e463f50 Merge remote-tracking branch 'origin/master' into ys_ph_printers 2020-07-28 14:14:16 +02:00
enricoturri1966 48ae8dc9a2 Modal estimated printing time dialog
Fixed conflicts after merge with master
2020-07-27 14:53:17 +02:00
enricoturri1966 18594261d2 Added handling of mouse wheel events to ImGuiWrapper 2020-07-27 12:18:21 +02:00
enricoturri1966 73b885fc37 GCodeViewer -> Added imgui dialog for estimated printing times 2020-07-08 13:33:50 +02:00
enricoturri1966 0b1086f390 GCodeViewer -> Export of extrude toolpaths to obj files 2020-07-03 12:17:12 +02:00
enricoturri1966 648ecb47c2 GCodeViewer -> Fixed incorrect detection of out of printbed for toolpaths 2020-06-24 16:57:09 +02:00
enricoturri1966 7207f215e9 ENABLE_GCODE_VIEWER_AS_STATE -> Do not show warning texture in gcode viewer mode 2020-06-22 12:43:52 +02:00
YuSanka 19c4f32604 Preset and PresetBundle are moved to the _libslic3r_ folder 2020-06-16 17:03:06 +02:00
enricoturri1966 ab60499298 Fixed conflicts after merge with master 2020-06-12 10:35:18 +02:00
enricoturri1966 70478f226f ENABLE_GCODE_VIEWER_AS_STATE -> Use default printbed in gcode viewer 2020-06-08 12:27:32 +02:00
YuSanka befbd6b0fe Merge remote-tracking branch 'origin/master' into custom_gcodes 2020-06-08 12:27:29 +02:00
YuSanka 629584e28f Editing of the custom GCodes like ColorChange and PausePrint 2020-06-07 22:42:54 +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 4f63095d9a Collapse toolbar moved from GLCanvas3D to Plater::priv 2020-06-05 12:33:09 +02:00
enricoturri1966 c3d643ead3 Fixed conflicts after merge with master 2020-06-04 13:57:39 +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
enricoturri1966 e9d57c932a Fixed conflicts after merge with master 2020-05-28 15:50:21 +02:00
enricoturri1966 c63e03c367 1st installment of tech ENABLE_ENVIRONMENT_MAP 2020-05-28 15:27:29 +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
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
enricoturri1966 2eb4b2caed Fixed conflicts after merge with master 2020-05-27 10:32:02 +02:00
Lukas Matena c2cd430941 Few more include chains broken 2020-05-26 13:46:59 +02:00
Lukas Matena fb9d8b2025 Include cleanup: do not include Model.hpp from 3DScene.hpp 2020-05-26 13:45:36 +02:00
enricoturri1966 1d317489fd GCodeViewer -> Temporary ImGui dialog for editing shaders parameters 2020-05-26 08:16:08 +02:00
enricoturri1966 ed252f1741 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer 2020-05-25 07:07:49 +02:00
enricoturri1966 314995fa0b ENABLE_SHADERS_MANAGER set as default 2020-05-22 16:08:02 +02:00
YuSanka a56bbea140 Reworked sys_color_changed() functions
Fixed OSX specific bugs:
- toolbar flashing for some mainframe sizes (Retina specific)
- size of mainframe when settings layout in slNew mode

Added missed icons to the "white" folder
2020-05-22 15:26:35 +02:00
enricoturri1966 f345e58358 Fix in ENABLE_CAMERA_STATISTICS 2020-05-22 09:51:57 +02:00
enricoturri1966 cae84d2857 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer 2020-05-21 10:15:24 +02:00
enricoturri1966 5aa8cc5779 ENABLE_SHADERS_MANAGER -> Unified client code of new GLShadersManager and GLShaderProgram classes 2020-05-21 10:15:00 +02:00
enricoturri1966 cbfb09a241 Fixed build for all 4 cases of tech ENABLE_SHADERS_MANAGER and ENABLE_GCODE_VIEWER enabled/disabled and code cleanup 2020-05-20 17:03:53 +02:00
enricoturri1966 c7c87973b7 First installment of tech ENABLE_SHADERS_MANAGER, using class GLShadersManager as a central point to manage OpenGL shaders 2020-05-20 14:11:22 +02:00
YuSanka fce1943b94 OSX specific bug fixing 2020-05-19 17:00:41 +02:00