Commit Graph

1121 Commits

Author SHA1 Message Date
b3676e9753 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer 2020-08-21 11:10:27 +02:00
2de6016b99 Forbid translation of objects when SLA/Hollow/FDM gizmos are active 2020-08-21 09:49:39 +02:00
02f159fa99 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer 2020-08-10 14:22:46 +02:00
e7f21d1e0e Merge remote-tracking branch 'origin/master' into ys_ph_printers 2020-08-06 17:02:48 +02:00
90b78deae6 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
40febf0fb1 Fixed conflicts after merge with master 2020-08-04 09:58:19 +02:00
0c38f234d0 Notifications & warning dialog
notifications
dialog with warnings produced by slicing is shown before exporting
2020-08-03 15:49:25 +02:00
dfed8d8d83 Tech ENABLE_GCODE_VIEWER_AS_STATE set as default 2020-08-03 15:00:19 +02:00
a2a64b5577 Fixed conflicts after merge with master 2020-08-03 08:56:58 +02:00
af6c85f114 Use ImGui::TextColored() 2020-08-03 08:28:43 +02:00
6f543016d7 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
ebef3bcb5d Merge remote-tracking branch 'origin/master' into ys_ph_printers 2020-07-28 14:14:16 +02:00
2b2091d46c Modal estimated printing time dialog
Fixed conflicts after merge with master
2020-07-27 14:53:17 +02:00
c6066ab459 Added handling of mouse wheel events to ImGuiWrapper 2020-07-27 12:18:21 +02:00
32e5d73a53 GCodeViewer -> Added imgui dialog for estimated printing times 2020-07-08 13:33:50 +02:00
a0b89dc5ce GCodeViewer -> Export of extrude toolpaths to obj files 2020-07-03 12:17:12 +02:00
eb3042f39f GCodeViewer -> Fixed incorrect detection of out of printbed for toolpaths 2020-06-24 16:57:09 +02:00
5ab5709603 ENABLE_GCODE_VIEWER_AS_STATE -> Do not show warning texture in gcode viewer mode 2020-06-22 12:43:52 +02:00
a1eeb569db Preset and PresetBundle are moved to the _libslic3r_ folder 2020-06-16 17:03:06 +02:00
250687b71a Fixed conflicts after merge with master 2020-06-12 10:35:18 +02:00
fef4e8dae2 ENABLE_GCODE_VIEWER_AS_STATE -> Use default printbed in gcode viewer 2020-06-08 12:27:32 +02:00
8eb1f34ef0 Merge remote-tracking branch 'origin/master' into custom_gcodes 2020-06-08 12:27:29 +02:00
06dacd1c84 Editing of the custom GCodes like ColorChange and PausePrint 2020-06-07 22:42:54 +02:00
bf91b34021 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
f0b2d05162 Collapse toolbar moved from GLCanvas3D to Plater::priv 2020-06-05 12:33:09 +02:00
fdac77be36 Fixed conflicts after merge with master 2020-06-04 13:57:39 +02:00
866a3ad357 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
6bdb0afca9 Fixed conflicts after merge with master 2020-05-28 15:50:21 +02:00
e765cebcdd 1st installment of tech ENABLE_ENVIRONMENT_MAP 2020-05-28 15:27:29 +02:00
5bbc804744 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer 2020-05-27 14:29:54 +02:00
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
acd8801d3a Fixed conflicts after merge with master 2020-05-27 10:32:02 +02:00
ae8772b90d Few more include chains broken 2020-05-26 13:46:59 +02:00
a8628a040c Include cleanup: do not include Model.hpp from 3DScene.hpp 2020-05-26 13:45:36 +02:00
afdb571bb2 GCodeViewer -> Temporary ImGui dialog for editing shaders parameters 2020-05-26 08:16:08 +02:00
7635b8b931 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer 2020-05-25 07:07:49 +02:00
1eb6ec97ed ENABLE_SHADERS_MANAGER set as default 2020-05-22 16:08:02 +02:00
09d197cdc8 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
cb2d747063 Fix in ENABLE_CAMERA_STATISTICS 2020-05-22 09:51:57 +02:00
0ad53b6036 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer 2020-05-21 10:15:24 +02:00
3f675370fc ENABLE_SHADERS_MANAGER -> Unified client code of new GLShadersManager and GLShaderProgram classes 2020-05-21 10:15:00 +02:00
2e64da5c1d 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
4194c347ab 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
89255d2c9c OSX specific bug fixing 2020-05-19 17:00:41 +02:00
9c2ae7c9a1 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer 2020-05-15 17:58:07 +02:00
af9b363e41 ENABLE_CANVAS_TOOLTIP_USING_IMGUI set as default 2020-05-15 13:40:45 +02:00
de9294daab Tech ENABLE_GCODE_VIEWER -> Refactoring and code cleanup 2020-05-15 12:25:38 +02:00
f98cfb81c9 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer 2020-05-13 12:34:50 +02:00
1cd2ffa6fe Tech ENABLE_GCODE_VIEWER -> Selection straight arrows rendered using the new OpenGL model class 2020-05-13 09:07:06 +02:00
d949c43817 Fixed a place on tool toolbar for collapse_toolbar_width in respect to its enable 2020-05-12 23:34:08 +02:00