Commit Graph

18540 Commits

Author SHA1 Message Date
enricoturri1966
4a5ad304ad Fixed conflicts after merge with master 2022-03-11 09:35:02 +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
9d2314557d Tech ENABLE_GL_SHADERS_ATTRIBUTES - Removed remaining pairs glPushMatrix()/glPopMatrix() 2022-03-10 13:40:37 +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
Lukas Matena
f196294da5 Bumped up version number to 2.4.1 2022-03-10 11:35:03 +01:00
enricoturri1966
a9465ddedc A few small refactorings 2022-03-10 11:27:05 +01:00
rtyr
7a9be87775
Added Anycubic 4Max Pro 2.0 profile and resources.
based on https://hartrusion.com/en/prusaslicer-config-for-anycubic-4max-pro-2-0/
2022-03-10 10:12:41 +01:00
rtyr
578b80e12c
Readded Photon Mono X 2022-03-10 09:41:09 +01:00
rtyr
c2140b4b1e
Added 4Max Pro 2.0 profile and resources 2022-03-10 09:22:57 +01:00
enricoturri1966
2f572d3cf0 Merge remote-tracking branch 'origin/et_opengl_3' 2022-03-09 12:07:18 +01:00
enricoturri1966
57ffa4d9ee Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_opengl_3 2022-03-09 12:06:09 +01:00
enricoturri1966
f8ce187262 Tech ENABLE_LEGACY_OPENGL_REMOVAL - Refactoring of GLModel to automatically detect the data type to use into the index buffer in dependence of vertices count 2022-03-09 11:51:02 +01:00
enricoturri1966
46283cfde3 Tech ENABLE_GLBEGIN_GLEND_SHADERS_ATTRIBUTES renamed as ENABLE_GL_SHADERS_ATTRIBUTES 2022-03-09 08:22:07 +01:00
enricoturri1966
5ffe010a9d Tech ENABLE_GLINDEXEDVERTEXARRAY_REMOVAL merged into ENABLE_LEGACY_OPENGL_REMOVAL 2022-03-08 14:50:32 +01:00
enricoturri1966
05efb88e3f Tech ENABLE_GLBEGIN_GLEND_REMOVAL renamed as ENABLE_LEGACY_OPENGL_REMOVAL 2022-03-08 14:08:11 +01:00
enricoturri1966
80717bbdec Tech ENABLE_GLBEGIN_GLEND_SHADERS_ATTRIBUTES - Some code cleanup 2022-03-08 13:27:51 +01:00
enricoturri1966
31c3952e2d Removed obsolete shaders 2022-03-08 12:50:00 +01:00
enricoturri1966
65b5af9561 Tech ENABLE_GLBEGIN_GLEND_SHADERS_ATTRIBUTES - Use vertex attributes and matrices in shaders.
Shader: variable_layer_height
2022-03-08 12:48:21 +01:00
enricoturri1966
dbdc272c4e Tech ENABLE_GLBEGIN_GLEND_SHADERS_ATTRIBUTES - Use vertex attributes and matrices in shaders.
Shader: mm_gouraud
2022-03-08 11:17:34 +01:00
enricoturri1966
3e47253725 Follow-up of 66fa2b1e26 - Cleanup 2022-03-08 10:59:12 +01:00
enricoturri1966
66fa2b1e26 Tech ENABLE_GLBEGIN_GLEND_SHADERS_ATTRIBUTES - Use vertex attributes and matrices in shaders.
Shader: mm_contour
2022-03-08 10:57:43 +01:00
davidjuanesb
0ffba3c484 Catalan language updated to 2.4.1 RC1 2022-03-08 10:29:14 +01:00
enricoturri1966
c17c4d2e9a Follow-up of 005fef7bf6 - Fixed imgui dialogs associated to gizmo bar and toolbar items 2022-03-08 09:24:42 +01:00
Lukas Matena
62cc48188d Fix background color in InfoDialog on older macOSes (#3775, #7603) 2022-03-07 16:43:21 +01:00
enricoturri1966
9fb350e3dd Tech ENABLE_GLBEGIN_GLEND_SHADERS_ATTRIBUTES - Use vertex attributes and matrices in shaders.
Shader: gouraud
2022-03-07 15:31:23 +01:00
enricoturri1966
f4726f738c Follow-up of 005fef7bf6 - Fixed highlight arrows for gizmos bar and toolbars 2022-03-07 15:06:45 +01:00
rtyr
8d3f4e633e
Added Ender 3 Pro thumbnail 2022-03-07 15:06:43 +01:00
rtyr
ea88d0b0ae
added Ender 3 Pro thumbnail 2022-03-07 15:05:23 +01:00
enricoturri1966
568f42660a Follow-up of 005fef7bf6 - Fixed Toolbars 2022-03-07 12:02:19 +01:00
Lukáš Hejl
6c51e5148c Fix of #7994 (Travel very close to the inner holes, could cross external perimeter when the avoid crossing perimeters was enabled.) 2022-03-07 10:48:17 +01:00
enricoturri1966
a6f84d9d74 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_opengl_3 2022-03-07 09:45:39 +01:00
enricoturri1966
005fef7bf6 Tech ENABLE_GLBEGIN_GLEND_SHADERS_ATTRIBUTES - Use vertex attributes and matrices in shaders.
Shader: flat_texture
2022-03-07 09:45:29 +01:00
Lukáš Hejl
3bf704932a Ignore CLion IDE files. 2022-03-04 19:10:50 +01:00
enricoturri1966
545056bf7c Fixed warnings 2022-03-04 14:17:55 +01:00
enricoturri1966
93610ebb02 Tech ENABLE_GLBEGIN_GLEND_SHADERS_ATTRIBUTES - Use vertex attributes and matrices in shaders.
Shader: printbed
2022-03-04 14:10:41 +01:00
enricoturri1966
4323b602f5 Code cleanup 2022-03-04 13:57:11 +01:00
enricoturri1966
44a00be329 Tech ENABLE_GLBEGIN_GLEND_SHADERS_ATTRIBUTES - Use vertex attributes and matrices in shaders.
Shader: toolpaths_cog
2022-03-04 13:50:31 +01:00
enricoturri1966
b84b6af32a Tech ENABLE_GLBEGIN_GLEND_SHADERS_ATTRIBUTES - Use vertex attributes and matrices in shaders.
Shader: background
2022-03-04 13:30:21 +01:00
enricoturri1966
191222c3a8 Tech ENABLE_GLBEGIN_GLEND_SHADERS_ATTRIBUTES - Use vertex attributes and matrices in shaders.
Shader: flat - Travel moves in gcode preview
2022-03-04 13:14:03 +01:00
enricoturri1966
cdf3cb83b6 Tech ENABLE_GLBEGIN_GLEND_SHADERS_ATTRIBUTES - Use vertex attributes and matrices in shaders.
Shader: gouraud_light_instanced_attr - Instanced options in gcode preview
2022-03-04 12:46:01 +01:00
enricoturri1966
bca966039e Tech ENABLE_GLBEGIN_GLEND_SHADERS_ATTRIBUTES - Use vertex attributes and matrices in shaders.
Shader: gouraud_light - Toolpaths and batched options in gcode preview
2022-03-04 12:07:08 +01:00
enricoturri1966
c344a633ee Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_opengl_3 2022-03-04 10:52:45 +01:00
enricoturri1966
d6b0a9858b Tech ENABLE_GLBEGIN_GLEND_SHADERS_ATTRIBUTES - Use vertex attributes and matrices in shaders.
Shader: gouraud_light - Selection sidebar hints
2022-03-04 10:52:30 +01:00
YuSanka
3505e5a290 Fix of leaking GDI resources on Win7 #8002:
- Code refactoring for draw_focus_rect.
- Use one PaintDC for rendering
- DoubleSlider::Control::Ruler refactoring
- Suppress to update ruler for horizontal slider
2022-03-04 09:27:29 +01:00
enricoturri1966
f7d06f4ec8 Tech ENABLE_GLBEGIN_GLEND_SHADERS_ATTRIBUTES - Use vertex attributes and matrices in shaders.
Shader: gouraud_light - Gizmo Simplify
2022-03-04 09:16:17 +01:00
enricoturri1966
d71ad7177e Tech ENABLE_GLBEGIN_GLEND_SHADERS_ATTRIBUTES - Use vertex attributes and matrices in shaders.
Shader: gouraud_light - Gizmo Rotate grabber extensions
2022-03-04 09:08:15 +01:00
enricoturri1966
7df713d471 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_opengl_3 2022-03-04 09:08:02 +01:00
enricoturri1966
ead51d69b7 Tech ENABLE_GLBEGIN_GLEND_SHADERS_ATTRIBUTES - Use vertex attributes and matrices in shaders.
Shader: gouraud_light - Gizmo Move grabber extensions
2022-03-04 09:01:10 +01:00