18687 Commits

Author SHA1 Message Date
enricoturri1966
4858bf02fb Fixed conflicts after merge with et_opengl_3
Partial revert of 0260c81c9e2b715b69550b5c99e0cbb8d5503021 - OpenGL ES 2.0 set as minimum version

Fixed shaders version
2022-04-06 14:04:38 +02:00
enricoturri1966
d8b534f96e Merge branch 'et_opengl_3' of https://github.com/prusa3d/PrusaSlicer into et_opengl_3 2022-04-06 12:45:55 +02:00
enricoturri1966
0ce06b2484 Tech ENABLE_GL_CORE_PROFILE - Fix in generate_system_info_json() 2022-04-06 12:45:41 +02:00
enricoturri1966
0260c81c9e Added tech ENABLE_OPENGL_ES_2_0:
ENABLE_OPENGL_ES -> Use the default version of OpenGL ES given by the driver

ENABLE_OPENGL_ES_2_0-> Select OpenGL ES 2.0 as minimum version
2022-04-06 09:41:40 +02:00
enricoturri1966
dd86650c5e Merge branch 'et_opengl_3' of https://github.com/prusa3d/PrusaSlicer into et_opengl_es 2022-04-05 14:33:25 +02:00
enricoturri1966
7410cc5653 Fixed warning 2022-04-05 14:33:11 +02:00
enricoturri1966
1383927bae Techs ENABLE_OPENGL_ES - Added shader dashed_lines to render dashed lines 2022-04-05 13:53:25 +02:00
enricoturri1966
3bf470c1ac Merge branch 'et_opengl_3' of https://github.com/prusa3d/PrusaSlicer into et_opengl_es 2022-04-05 13:39:50 +02:00
enricoturri1966
9b67f9812d Refactoring in shader dashed_thick_lines 2022-04-05 13:39:14 +02:00
enricoturri1966
2b4a9526b7 Merge branch 'et_opengl_3' of https://github.com/prusa3d/PrusaSlicer into et_opengl_es 2022-04-05 13:04:07 +02:00
enricoturri1966
e7bc861f3a Fix into OpenGLManager::GLInfo::to_string() 2022-04-05 13:03:44 +02:00
enricoturri1966
c719a84eaf Merge branch 'et_opengl_3' of https://github.com/prusa3d/PrusaSlicer into et_opengl_es 2022-04-05 12:14:24 +02:00
enricoturri1966
7532b7b729 Refactoring in shader dashed_thick_lines 2022-04-05 12:14:01 +02:00
enricoturri1966
6e77e82774 Merge branch 'et_opengl_3' of https://github.com/prusa3d/PrusaSlicer into et_opengl_es 2022-04-05 11:32:01 +02:00
enricoturri1966
c997514636 Techs ENABLE_LEGACY_OPENGL_REMOVAL and ENABLE_GL_CORE_PROFILE set as default into GLShaderProgram 2022-04-05 11:31:01 +02:00
enricoturri1966
b7a47a58b0 Tech ENABLE_GL_CORE_PROFILE set as default into Point.hpp 2022-04-05 11:11:52 +02:00
enricoturri1966
45b3b48222 Tech ENABLE_GL_CORE_PROFILE set as default into GLModel::Geometry 2022-04-05 10:46:39 +02:00
enricoturri1966
cecafe6d00 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_opengl_3 2022-04-05 10:04:56 +02:00
enricoturri1966
6b6fb9f692 Tech ENABLE_LEGACY_OPENGL_REMOVAL - Removed redundand #if/#endif into GLModel.cpp 2022-04-05 10:04:36 +02:00
rtyr
74b80cf7bf
Reduced/reworked resources. 2022-04-05 08:34:27 +02:00
enricoturri1966
0967974479 Fixed GLModel::reserve_indices() 2022-04-04 12:23:01 +02:00
enricoturri1966
4d611b8043 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_opengl_3 2022-04-01 08:50:58 +02:00
enricoturri1966
5307114969 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2022-04-01 08:35:19 +02:00
enricoturri1966
a821668dc7 Fixed comparison operators of ColorRGB and ColorRGBA 2022-04-01 08:35:10 +02:00
enricoturri1966
9b5d17dfbd Follow-up of e01d32d01afec11dd1b149fc983a15f2875a36d4 - Fixed typo 2022-04-01 08:28:58 +02:00
Lukas Matena
ad610ffe2b Merge branch 'lm_improvements' 2022-03-31 16:45:54 +02:00
Lukas Matena
aa2a8178f8 Fixed some compiler warnings 2022-03-31 16:42:15 +02:00
Lukas Matena
e01d32d01a Fixed several std::moves that had no effect, moved GCode data to heap 2022-03-31 16:42:15 +02:00
Lukas Matena
96a6c8538f Some refactoring and fixes based on static source code analysis 2022-03-31 16:33:52 +02:00
enricoturri1966
426adcc5e6 Tech ENABLE_OPENGL_ES - Use OpenGL ES context - 1st installment 2022-03-31 14:57:05 +02:00
YuSanka
807f380d3f Fix for #8091 - Design bug: Yes/No response to save dialogue 2022-03-31 14:34:53 +02:00
enricoturri1966
c89a95f5ef Merge branch 'et_opengl_3' of https://github.com/prusa3d/PrusaSlicer into et_opengl_es 2022-03-31 13:57:12 +02:00
enricoturri1966
21ef9167c4 Fixed conflicts after merge with master 2022-03-31 13:40:54 +02:00
enricoturri1966
0763a48ce5 Tech ENABLE_GL_SHADERS_ATTRIBUTES - Fixed OpenGL clipping planes while rendering picking pass 2022-03-31 13:23:04 +02:00
rtyr
8b73d8b65a
Added Zonestar bundle
based on https://github.com/slic3r/slic3r-profiles/pull/19
2022-03-30 16:12:14 +02:00
rtyr
6922cd8cf1
Added Trident 350mm resources
https://github.com/prusa3d/PrusaSlicer-settings/issues/154
2022-03-30 16:10:11 +02:00
Lukas Matena
8004e19879 Fix of #8126: crash on startup with wx3.0:
this appeared after 1f362af. The wxEXEC_SYNC is the default, but not using
wxEXEC_NOEVENTS caused a crash in wxWidgets3.0 (see #8126)
2022-03-30 15:28:44 +02:00
enricoturri1966
2e6d9dc4dd Merge branch 'et_opengl_3' of https://github.com/prusa3d/PrusaSlicer into et_opengl_es 2022-03-30 15:23:23 +02:00
enricoturri1966
3f9f52dcfc Tech ENABLE_GL_CORE_PROFILE - Modified message for required OpenGL version 2022-03-30 15:20:39 +02:00
enricoturri1966
536e633748 Follow-up of 09ad6d704060a6a2a9a08771e796bc9bec09479f - Code for Mesa drivers in Windows only builds 2022-03-30 15:19:31 +02:00
enricoturri1966
f221983233 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_opengl_3 2022-03-30 15:02:53 +02:00
enricoturri1966
09ad6d7040 Tech ENABLE_GL_CORE_PROFILE - Fixed detection of OpenGL extensions and support for newer Mesa drivers 2022-03-30 14:46:08 +02:00
tamasmeszaros
674f1683a1 Fix boost build on windows 2022-03-30 12:47:13 +02:00
tamasmeszaros
d5e55a3c62 Fix boost build on arm mac 2022-03-30 11:31:12 +02:00
tamasmeszaros
c94486cd3c Make boost more independent of the toolchain it was built from 2022-03-30 11:31:06 +02:00
Lukas Matena
e0404fd82c Merge branch 'lm_wipe_tower_base_and_spaces' 2022-03-30 09:25:55 +02:00
Lukas Matena
3934b1dbed Remove repeated spaces from the wipe tower gcode (#7503) 2022-03-30 09:25:36 +02:00
Lukas Matena
684733af52 Enforce first layer on experimental wipe tower (#7090) 2022-03-30 09:25:31 +02:00
enricoturri1966
a99f3cd9f7 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_opengl_es 2022-03-29 13:19:38 +02:00
enricoturri1966
55aef05fbf Fix into GCodeViewer::refresh_render_paths() 2022-03-29 13:18:04 +02:00