Commit Graph

19035 Commits

Author SHA1 Message Date
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
Filip Sykala
41e6dba3df Fix fill on edge
change color to enum
2022-03-14 11:12:53 +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
2922710cc4 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2022-03-14 09:04:55 +01:00
enricoturri1966
d0d89a4d5b Tech ENABLE_GL_IMGUI_SHADERS - Render imgui using shaders 2022-03-14 09:04:44 +01:00
Filip Sykala
572207e1c3 partial refactor 2022-03-11 16:54:53 +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
rtyr
b32c97ea76
Added Ender-3 Pro. 2022-03-11 10:55:47 +01:00
rtyr
d9e17c73dd
Merge pull request #7995 from nberardi/master
Creality Bundle Enhancements for Ender-3 Pro
2022-03-11 10:53:51 +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
Lukas Matena
f196294da5 Bumped up version number to 2.4.1 2022-03-10 11:35:03 +01:00
enricoturri1966
fb38d80458 Fixed conflicts after merge with master 2022-03-10 11:33:59 +01:00
enricoturri1966
a9465ddedc A few small refactorings 2022-03-10 11:27:05 +01:00
enricoturri1966
b9b8406ad8 Fixed conflicts after merge with master 2022-03-10 10:32:00 +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
Filip Sykala
9e1ebcf4c6 revert auto formating 2022-03-09 13:41:41 +01:00
Filip Sykala
c8e3836177 Fix merge 2022-03-09 12:59:20 +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
Filip Sykala
5ffab4069a Merge branch 'tm_deps_update_v2.5' into fs_emboss_with_CGAL_5_4
# Conflicts:
#	deps/CGAL/CGAL.cmake
2022-03-09 11:09:34 +01:00
Filip Sykala
f75f326f8e Merge branch 'master' into fs_emboss_with_CGAL_5_4
# Conflicts:
#	src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp
2022-03-09 11:08:39 +01:00
Filip Sykala
70b94d592b Merge branch 'et_world_coordinates' into fs_emboss_with_CGAL_5_4
# Conflicts:
#	src/libslic3r/Technologies.hpp
#	src/slic3r/GUI/Gizmos/GLGizmoBase.hpp
#	src/slic3r/GUI/Gizmos/GLGizmosManager.cpp
2022-03-09 11:06:58 +01:00
Filip Sykala
57c75395c6 fix test 2022-03-09 10:59:22 +01:00
Filip Sykala
4a399789f4 Add vojta test 2022-03-09 09:41:03 +01:00
enricoturri1966
46283cfde3 Tech ENABLE_GLBEGIN_GLEND_SHADERS_ATTRIBUTES renamed as ENABLE_GL_SHADERS_ATTRIBUTES 2022-03-09 08:22:07 +01:00
Filip Sykala
e8cfe35f78 Do not use RaycastManager inside job
Separate Jobs for Creation of volume from creation of Object
2022-03-08 19:15:56 +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