Commit graph

7436 commits

Author SHA1 Message Date
enricoturri1966
ea55f16ce4 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_opengl_3 2022-03-22 08:18:51 +01:00
enricoturri1966
9be3d926c5 Tech ENABLE_LEGACY_OPENGL_REMOVAL - A few refactorings and fixes 2022-03-22 08:18:39 +01:00
Filip Sykala
9c56e43f1d Merge branch 'master' into fs_emboss 2022-03-21 21:40:50 +01:00
Filip Sykala
fec171d14e Merge branch 'master' into fs_emboss
# Conflicts:
#	src/libslic3r/Technologies.hpp
2022-03-21 21:40:37 +01:00
tamasmeszaros
c1e54675f5 Prevent hard crash in rare circumstances 2022-03-21 17:16:25 +01:00
Filip Sykala
ee78a17ab9 Fix Unix directory delimiters 2022-03-21 13:47:50 +01:00
enricoturri1966
76d1d4949b Tech ENABLE_GL_SHADERS_ATTRIBUTES - Added shaders for glsl version 140 2022-03-21 13:10:47 +01:00
Filip Sykala
2621d66cb0 Const improve 2022-03-21 12:50:46 +01:00
enricoturri1966
4964d6ecd5 ENABLE_GL_IMGUI_SHADERS - Fixes in ImGuiWrapper::render_draw_data() 2022-03-21 11:31:32 +01:00
enricoturri1966
93d703518d Tech ENABLE_PROCESS_G2_G3_LINES - Improved detection of layer zs for gcode produced by other slicers 2022-03-21 08:53:55 +01:00
enricoturri1966
21e6dccc12 Fixed conflicts after merge with master 2022-03-18 13:36:32 +01:00
enricoturri1966
8c8e908325 Tech ENABLE_PROCESS_G2_G3_LINES - Processing of gcode G2 and G3 lines 2022-03-18 13:34:53 +01:00
Lukas Matena
f3d92bdeff Fixup of 5de93c8 (incorrectly solved merge conflict) 2022-03-18 10:25:00 +01:00
enricoturri1966
45e4d90504 GCodeViewer - Hide bottom toolbar when loading a new gcode file 2022-03-17 15:44:03 +01:00
enricoturri1966
493050a279 Removed redundant line of code 2022-03-17 15:29:18 +01:00
enricoturri1966
fb22612d0d Tech ENABLE_SPIRAL_VASE_LAYERS set as default 2022-03-17 15:12:03 +01:00
enricoturri1966
8d5dd759ad SPE-1208 - Fix for 3mf from another SW is loaded as a project and not as geometry 2022-03-17 14:31:14 +01:00
enricoturri1966
99861f1b6e SPE-1207 - Extensions in Open/Save/Export dialogs - alternative implementation for file_wildcards() 2022-03-17 14:20:35 +01:00
Vojtech Bubnik
c11948a084 FontItem improvmement: Use default constructors to let the compiler
generate move constructor and move assignement.
Also used some move operators to reduce unnecessary memory allocations.

Cherry picked commit: 120a85d4c4b90ffafced442ee5e63e5f794f6945
2022-03-17 12:37:21 +01:00
Lukas Matena
ff2b8da8dc Fixed crash when pressing 'Reset rotation' button while editing SLA support points (mentioned in #7359) 2022-03-17 11:39:58 +01:00
Lukas Matena
5de93c8784 Fixed incorrect handling of 3rd party 3MFs in SLA mode (#6100 and others) 2022-03-17 11:13:20 +01:00
enricoturri1966
9701d3b01d Follow-up of 033bee6431 - Fixed warnings 2022-03-15 10:31:30 +01:00
enricoturri1966
4e17c02505 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_new_camera_movements 2022-03-15 09:18:04 +01:00
enricoturri1966
568bd39c5a Tech ENABLE_GL_SHADERS_ATTRIBUTES - Fixed rendering of default bed in thumbnails 2022-03-15 09:16:06 +01:00
enricoturri1966
58701b237d Tech ENABLE_GL_SHADERS_ATTRIBUTES - Fixed rendering of bed texture in thumbnails 2022-03-15 09:05:16 +01:00
enricoturri1966
887ce89558 Limit width of GCodeViewer::SequentialView::GCodeWindow 2022-03-15 08:50:00 +01:00
enricoturri1966
033bee6431 Removed obsolete code from GCodeViewer 2022-03-14 14:55:25 +01:00
enricoturri1966
9174fc4872 Removed obsolete tech ENABLE_FIXED_SCREEN_SIZE_POINT_MARKERS 2022-03-14 14:25:09 +01:00
enricoturri1966
2ab8469cb6 Refactoring in ImGuiWrapper::render_draw_data() 2022-03-14 13:34:08 +01:00
enricoturri1966
f0bad14748 Tech ENABLE_GL_SHADERS_ATTRIBUTES - Small refactoring into GCodeViewer::render_toolpaths() 2022-03-14 09:59:38 +01:00
enricoturri1966
4eee0d05f3 Tech ENABLE_GL_SHADERS_ATTRIBUTES - Use shader's vertex attributes and matrices in GLMmSegmentationGizmo3DScene 2022-03-14 09:50:42 +01:00
enricoturri1966
5586fd92f2 Follow-up of d0d89a4d5b - Fixed warnings 2022-03-14 09:50:25 +01:00
enricoturri1966
d0d89a4d5b Tech ENABLE_GL_IMGUI_SHADERS - Render imgui using shaders 2022-03-14 09:04:44 +01:00
enricoturri1966
ac0ec5fa43 Tech ENABLE_NEW_CAMERA_MOVEMENTS_CTRL_ROTATE renamed as ENABLE_NEW_CAMERA_MOVEMENTS
Tech ENABLE_NEW_CAMERA_MOVEMENTS_MIDMOUSE_ROTATE merged into ENABLE_NEW_CAMERA_MOVEMENTS

Tech ENABLE_NEW_CAMERA_MOVEMENTS_SHIFT_SELECTION renamed as ENABLE_NEW_RECTANGLE_SELECTION
2022-03-11 12:36:09 +01:00
enricoturri1966
2342002151 Tech ENABLE_NEW_CAMERA_MOVEMENTS_CTRL_ROTATE - Fixed volumes moving after releasing CTRL key
Tech ENABLE_NEW_CAMERA_MOVEMENTS_SHIFT_SELECTION - Selection rectangle not started while hovering on a volume
2022-03-11 11:28:08 +01:00
enricoturri1966
4a5ad304ad Fixed conflicts after merge with master 2022-03-11 09:35:02 +01:00
enricoturri1966
2c80ecca41 Tech ENABLE_GL_SHADERS_ATTRIBUTES - Fixed rendering of gizmo rotate 2022-03-11 08:43:07 +01:00
enricoturri1966
3dddfa919a Debug tech ENABLE_GLMODEL_STATISTICS - Shows an imgui dialog with GLModel statistics data 2022-03-10 15:55:15 +01:00
enricoturri1966
56e597aef8 Tech ENABLE_GL_SHADERS_ATTRIBUTES - Fixed rendering of sidebar hints reference system 2022-03-10 14:42:05 +01:00
enricoturri1966
6ef5da5a73 Tech ENABLE_GL_SHADERS_ATTRIBUTES - Fixed rendering of selection bounding box 2022-03-10 14:03:50 +01:00
enricoturri1966
f1160e2562 Tech ENABLE_GL_SHADERS_ATTRIBUTES - Fixed rendering of bed axes 2022-03-10 13:56:33 +01:00
enricoturri1966
0fa4e51c8f Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_world_coordinates 2022-03-10 13:40:51 +01:00
enricoturri1966
9d2314557d Tech ENABLE_GL_SHADERS_ATTRIBUTES - Removed remaining pairs glPushMatrix()/glPopMatrix() 2022-03-10 13:40:37 +01:00
enricoturri1966
321f94afd0 Merge remote-tracking branch 'origin/et_world_coordinates' into fs_emboss 2022-03-10 13:22:36 +01:00
enricoturri1966
05b65c3a43 Fixed conflicts after merge with branch et_world_coordinates 2022-03-10 13:22:20 +01:00
enricoturri1966
43db64be05 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_world_coordinates 2022-03-10 12:49:10 +01:00
enricoturri1966
27861fa0bd Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2022-03-10 12:48:40 +01:00
enricoturri1966
f0a4fd1123 Fixed GLVolumes color when tech ENABLE_LEGACY_OPENGL_REMOVAL is disabled 2022-03-10 12:48:31 +01:00
Lukas Matena
68ca42abbf Merge branch 'stable' 2022-03-10 12:29:17 +01:00
enricoturri1966
fb38d80458 Fixed conflicts after merge with master 2022-03-10 11:33:59 +01:00