3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
22792 commits 1 branch 1 tag 249 MiB
Commit graph

664 commits

Author SHA1 Message Date
enricoturri1966
ca34518bcc Fixed conflicts after merge with master 2022-07-21 08:55:52 +02:00
enricoturri1966
520261925f Fixed conflicts after merge with master 2022-07-21 08:14:44 +02:00
Filip Sykala - NTB T15p
79a7f588b9 Merge branch 'et_world_coordinates' into fs_emboss 
# Conflicts:
#	src/libslic3r/CMakeLists.txt
#	src/libslic3r/Format/3mf.cpp
#	src/libslic3r/Model.hpp
#	src/libslic3r/Technologies.hpp
#	src/slic3r/GUI/GLCanvas3D.cpp
#	src/slic3r/GUI/GUI_App.cpp
#	src/slic3r/GUI/Gizmos/GLGizmoBase.cpp
#	src/slic3r/GUI/Gizmos/GLGizmoBase.hpp
#	src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp
#	src/slic3r/GUI/Selection.cpp
#	src/slic3r/GUI/Selection.hpp
 2022-07-20 13:02:07 +02:00
enricoturri1966
90c49f4c1a Added filtering of key auto repeat for SHIFT and CTRL keys in GLCanvas3D 2022-07-20 08:15:38 +02:00
enricoturri1966
2a2d442b28 Tech ENABLE_RAYCAST_PICKING - Gizmo flatten: fixed update of raycasters transformations 2022-07-14 09:59:20 +02:00
tamasmeszaros
e58a15bdf8 Prepare arrange for variable bed distance 2022-07-07 15:51:41 +02:00
enricoturri1966
39b1222b22 Tech ENABLE_RAYCAST_PICKING - Rendering for rectangle selection made only inside the rectangle, on systems supporting framebuffers 2022-06-29 12:14:41 +02:00
enricoturri1966
ae76468f7c Tech ENABLE_RAYCAST_PICKING - Partial revert of 89ac932628 - Restored rectangle selection using encoded colors rendering 2022-06-28 14:12:57 +02:00
enricoturri1966
6d97de14d9 Tech ENABLE_RAYCAST_PICKING - Removal of all remaining code related to old OpenGL based picking 2022-06-21 09:16:36 +02:00
enricoturri1966
255d8657dd Tech ENABLE_RAYCAST_PICKING - Small refactoring 2022-06-21 08:26:39 +02:00
enricoturri1966
63890b5f8d Do know allow picking while dragging gizmos 2022-06-20 13:58:06 +02:00
enricoturri1966
f45711e7e5 Removed tech ENABLE_RENDER_PICKING_PASS 2022-06-15 14:29:29 +02:00
enricoturri1966
c5c5c23ed2 Tech ENABLE_RAYCAST_PICKING - Raytraced picking of Gizmo Hollow 2022-06-15 09:01:13 +02:00
enricoturri1966
9ac5ab857b Tech ENABLE_RAYCAST_PICKING - Refactoring to allow for easier update of raycasters transform 2022-06-14 10:44:14 +02:00
enricoturri1966
df47ba7122 Tech ENABLE_RAYCAST_PICKING - Raytraced picking of gizmos - Move Gizmo 2022-06-13 13:09:24 +02:00
enricoturri1966
cfc3988b9f Tech ENABLE_RAYCAST_PICKING - 1st installment - Raytraced picking of printbed 2022-06-10 13:20:52 +02:00
enricoturri1966
cd6155293b Fixed conflicts after merge with master 2022-06-07 11:10:19 +02:00
enricoturri1966
00878fb330 Tech ENABLE_TRANSFORMATIONS_BY_MATRICES merged into ENABLE_WORLD_COORDINATE 
Fixed conflicts during rebase with master
 2022-06-06 13:36:29 +02:00
enricoturri1966
9efeb0b9e5 Tech ENABLE_TRANSFORMATIONS_BY_MATRICES - Fixed missing update of object manipulator panel after selecting an object in the 3D scene 2022-06-06 10:18:04 +02:00
enricoturri1966
19712749c3 Tech ENABLE_TRANSFORMATIONS_BY_MATRICES - Added reset button to remove skew, when detected, in object manipulator panel 
Fixed conflicts during rebase with master
 2022-06-06 10:00:28 +02:00
enricoturri1966
1a1cf108fc Tech ENABLE_GL_SHADERS_ATTRIBUTES merged into ENABLE_LEGACY_OPENGL_REMOVAL 
Fixed conflicts during rebase with master
 2022-05-26 10:50:32 +02:00
Filip Sykala
34304a40bf Merge branch 'master' into fs_emboss 2022-05-11 16:05:40 +02:00
tamasmeszaros
fed317f27b Change std::nan("") to proper nan constants 2022-05-11 10:35:12 +02:00
enricoturri1966
05b65c3a43 Fixed conflicts after merge with branch et_world_coordinates 2022-03-10 13:22:20 +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
enricoturri1966
46283cfde3 Tech ENABLE_GLBEGIN_GLEND_SHADERS_ATTRIBUTES renamed as ENABLE_GL_SHADERS_ATTRIBUTES 2022-03-09 08:22:07 +01:00
enricoturri1966
05efb88e3f Tech ENABLE_GLBEGIN_GLEND_REMOVAL renamed as ENABLE_LEGACY_OPENGL_REMOVAL 2022-03-08 14:08:11 +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
14f4345389 Tech ENABLE_GLBEGIN_GLEND_SHADERS_ATTRIBUTES - Use vertex attributes and matrices in shaders. 
Shader: gouraud_light - Thumbnails render
 2022-03-03 12:36:44 +01:00
enricoturri1966
278ec6fe93 Tech ENABLE_GLBEGIN_GLEND_SHADERS_ATTRIBUTES - Use vertex attributes and matrices in shaders. 
Shader: flat - Layers editing
 2022-03-02 10:12:44 +01:00
Filip Sykala
8022c64209 Fix Retina coordinate for stored popup menu position 2022-02-25 11:58:15 +01:00
Filip Sykala
0d48cf5ab9 Merge branch 'master' into fs_mouse 2022-02-23 14:43:42 +01:00
Filip Sykala
24207403ea Merge branch 'master' into fs_emboss 2022-02-22 13:51:04 +01:00
enricoturri1966
5089d1460d Removed obsolete member variable GLCanvas3D::m_color_by 2022-02-11 11:47:29 +01:00
enricoturri1966
c9ff260d13 Tech ENABLE_GLBEGIN_GLEND_REMOVAL - SLA caps rendered using GLModel 2022-02-11 09:15:56 +01:00
Filip Sykala
faa63f3182 Merge branch 'master' into fs_emboss 
# Conflicts:
#	src/libslic3r/Format/3mf.cpp
 2022-02-10 14:04:02 +01:00
Filip Sykala
74cf6649f3 Merge branch 'master' into fs_mouse 2022-02-10 10:26:04 +01:00
enricoturri1966
92aa6540f5 Tech ENABLE_SHOW_TOOLPATHS_COG - Show toolpaths center of gravity 2022-02-08 12:57:56 +01:00
Filip Sykala
0c40e2f8c8 Merge branch 'master' into fs_mouse 
# Conflicts:
#	src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp
#	src/slic3r/GUI/Gizmos/GLGizmoRotate.hpp
 2022-02-08 10:43:29 +01:00
Filip Sykala
a50d93cd66 Merge branch 'master' into fs_emboss 
# Conflicts:
#	src/libslic3r/Geometry.cpp
#	src/slic3r/GUI/Gizmos/GLGizmoBase.cpp
#	src/slic3r/GUI/Gizmos/GLGizmoMove.cpp
#	src/slic3r/GUI/Gizmos/GLGizmoMove.hpp
#	src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp
#	src/slic3r/GUI/Gizmos/GLGizmoRotate.hpp
#	src/slic3r/GUI/Gizmos/GLGizmoScale.cpp
#	src/slic3r/GUI/Gizmos/GLGizmoScale.hpp
#	src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp
#	src/slic3r/GUI/ImGuiWrapper.cpp
#	src/slic3r/GUI/ImGuiWrapper.hpp
#	src/slic3r/GUI/Selection.cpp
#	tests/slic3rutils/slic3r_jobs_tests.cpp
 2022-02-02 15:27:25 +01:00
enricoturri1966
eda55701a2 Tech ENABLE_GLBEGIN_GLEND_REMOVAL - Background rendering 2022-01-28 11:30:04 +01:00
enricoturri1966
a939d8e4c0 Tech ENABLE_GLBEGIN_GLEND_REMOVAL - Layers editing profile's background texture rendering 2022-01-27 15:45:55 +01:00
enricoturri1966
8c807dbcc4 Tech ENABLE_GLBEGIN_GLEND_REMOVAL - A few fixes in layers editing profile rendering 2022-01-27 15:19:29 +01:00
enricoturri1966
9d764bfeac Code cleanup in Selection and GLCanvas3D 2022-01-27 13:17:32 +01:00
enricoturri1966
afcac6e2ea Tech ENABLE_GLBEGIN_GLEND_REMOVAL - Refactoring of GLModel to: 
1) allow for custom vertex data layout

2) allow for custom index data format

3) allow for any OpenGL primitive type
 2022-01-27 12:00:51 +01:00
enricoturri1966
35dd03e8cb Tech ENABLE_GLBEGIN_GLEND_REMOVAL - Camera target 2022-01-21 12:07:54 +01:00
enricoturri1966
2673994471 Tech ENABLE_GLBEGIN_GLEND_REMOVAL - LayersEditing profile 2022-01-21 11:03:25 +01:00
Filip Sykala
f23c356507 Merge branch 'dev' into fs_mouse 
# Conflicts:
#	src/slic3r/GUI/GLCanvas3D.cpp
#	src/slic3r/GUI/Gizmos/GLGizmoBase.cpp
#	src/slic3r/GUI/Gizmos/GLGizmoBase.hpp
#	src/slic3r/GUI/Gizmos/GLGizmoScale.cpp
#	src/slic3r/GUI/Gizmos/GLGizmoScale.hpp
 2022-01-20 09:25:06 +01:00
enricoturri1966
bebb5505a3 Tech ENABLE_GLBEGIN_GLEND_REMOVAL - Selection layers hints 2022-01-18 13:47:19 +01:00
enricoturri1966
22f38235ea Tech ENABLE_GLBEGIN_GLEND_REMOVAL - 1st installment - Selection bounding box 2022-01-18 10:42:46 +01:00