enricoturri1966
028dfb5d9e
Tech ENABLE_LEGACY_OPENGL_REMOVAL set as default
2022-12-06 12:17:01 +01:00
enricoturri1966
6f18f8f784
Tech ENABLE_RAYCAST_PICKING set as default
2022-12-05 10:24:30 +01:00
Filip Sykala - NTB T15p
ed6a1b18f3
Merge branch 'master' into fs_emboss
...
# Conflicts:
# src/slic3r/GUI/GLCanvas3D.cpp
# src/slic3r/GUI/Selection.cpp
2022-09-14 11:28:36 +02:00
enricoturri1966
369e08aed1
Small optimization in rendering of selection rectangle
2022-09-14 10:46:05 +02:00
Filip Sykala - NTB T15p
c549c6afbe
Merge branch 'master' into fs_emboss
...
# Conflicts:
# src/libslic3r/CMakeLists.txt
# src/libslic3r/Format/3mf.cpp
# src/libslic3r/Model.hpp
# src/libslic3r/Point.hpp
# src/libslic3r/Technologies.hpp
# src/slic3r/CMakeLists.txt
# src/slic3r/GUI/GLCanvas3D.cpp
# src/slic3r/GUI/GLSelectionRectangle.cpp
# src/slic3r/GUI/GUI_Factories.hpp
# src/slic3r/GUI/Gizmos/GLGizmoBase.cpp
# src/slic3r/GUI/Gizmos/GLGizmoBase.hpp
# 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/MeshUtils.cpp
# src/slic3r/GUI/MeshUtils.hpp
# src/slic3r/GUI/ObjectDataViewModel.cpp
# src/slic3r/GUI/ObjectDataViewModel.hpp
# src/slic3r/GUI/Selection.cpp
2022-08-31 15:22:10 +02:00
enricoturri1966
bb36f0df0c
Tech ENABLE_OPENGL_ES - 1st installment
2022-07-21 15:43:11 +02:00
enricoturri1966
d836a187d0
Merge remote-tracking branch 'origin/et_raycast_picking_rebase' into et_opengl_es_rebase
2022-06-30 12:44:03 +02:00
enricoturri1966
ae76468f7c
Tech ENABLE_RAYCAST_PICKING - Partial revert of 89ac9326280083de5325bc19950299842902d5b1 - Restored rectangle selection using encoded colors rendering
2022-06-28 14:12:57 +02:00
enricoturri1966
bcbde32678
Tech ENABLE_GL_CORE_PROFILE - Fixed rendering of rectangle selection with dashed lines
2022-06-22 11:27:40 +02:00
enricoturri1966
8d0780aabe
Tech ENABLE_GL_CORE_PROFILE - Added command line option '--opengl-core=M.m' which allows the user to select a specific OpenGL version supporting core profile
2022-05-30 16:15:25 +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
enricoturri1966
914a66e2c3
Tech ENABLE_GL_CORE_PROFILE - Thick lines shader enhanced to render dashed lines
...
Fixed conflicts while rebase with master
2022-05-26 08:11:04 +02:00
enricoturri1966
017784c38e
Tech ENABLE_GL_CORE_PROFILE - Use thick_lines shader where needed
...
Fixed conflicts during rebase with master
2022-05-25 15:55:39 +02:00
enricoturri1966
389dc36053
Tech ENABLE_GL_CORE_PROFILE - Use OpenGL core profile context - 1st installment
...
Fixed conflicts during rebase with master
2022-05-25 15:29:10 +02:00
Filip Sykala
68c34210d2
Fix
...
../src/slic3r/GUI/GLSelectionRectangle.cpp:48:26: warning: comparison of integer expressions of different signedness: 'int' and 'std::vector<Eigen::Matrix<double, 3, 1, 2> >::size_type' {aka 'long unsigned int'} [-Wsign-compare]
2022-04-05 17:16:21 +02:00
Filip Sykala
65909c74c4
Merge branch 'master' into fs_emboss
...
# Conflicts:
# src/libslic3r/Technologies.hpp
2022-03-22 12:52:16 +01:00
Filip Sykala
fec171d14e
Merge branch 'master' into fs_emboss
...
# Conflicts:
# src/libslic3r/Technologies.hpp
2022-03-21 21:40:37 +01:00
enricoturri1966
76d1d4949b
Tech ENABLE_GL_SHADERS_ATTRIBUTES - Added shaders for glsl version 140
2022-03-21 13:10:47 +01:00
enricoturri1966
4a5ad304ad
Fixed conflicts after merge with master
2022-03-11 09:35:02 +01:00
enricoturri1966
05b65c3a43
Fixed conflicts after merge with branch et_world_coordinates
2022-03-10 13:22:20 +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
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
31013fb6df
Tech ENABLE_GLBEGIN_GLEND_SHADERS_ATTRIBUTES - Use vertex attributes and matrices in shaders.
...
Refactoring of flat vertex shader
2022-03-04 08:54:23 +01:00
enricoturri1966
0d001ce84f
Tech ENABLE_GLBEGIN_GLEND_SHADERS_ATTRIBUTES - Use vertex attributes and matrices in shaders.
...
Shader: flat - Rectangle selection
2022-03-01 15:39:00 +01:00
enricoturri1966
cd32254190
Fixed conflicts after merge with master
2022-02-24 13:17:30 +01:00
enricoturri1966
1eac357739
Tech ENABLE_GLINDEXEDVERTEXARRAY_REMOVAL - Replace GLIndexedVertexArray with GLModel: GLVolume geometry + removed class GLIndexedVertexArray from codebase
2022-02-23 13:39:54 +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
enricoturri1966
be6b6590be
Tech ENABLE_GLBEGIN_GLEND_REMOVAL - Refactoring to simplify client code of GLModel::Geometry
2022-02-09 09:15:20 +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
238516a660
Fixed conflicts after merge with dev branch
2022-01-29 09:50:55 +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
f6f95808cc
Tech ENABLE_GLBEGIN_GLEND_REMOVAL - GLSelectionRectangle rectangle
2022-01-20 14:34:19 +01:00
enricoturri1966
acd225cee2
Techs ENABLE_NEW_CAMERA_MOVEMENTS_XXXX - 1st installment - Modified camera manipulation and selection by mouse
2022-01-11 09:09:09 +01:00
Filip Sykala
43230b2709
Move projection into separate utils to not slow down translation of files using Camera.hpp
2021-11-04 13:19:43 +01:00
Filip Sykala
d3dd025833
Draw text convex hull
2021-11-04 12:41:53 +01:00
Lukas Matena
fd024eadcd
Removed gluProject and gluUnProject calls
2021-05-28 16:44:13 +02:00
Lukas Matena
48c186331a
Includes cleanup:
...
GUI_App.hpp (should not include) MainFrame.hpp
MainFrame.hpp Plater.hpp
ModelArrange.hpp Model.hpp
Slicing.hpp PrintConfig.hpp
FillBase.hpp PrintConfig.hpp
GUI_App.hpp PrintConfig.hpp
OptionsGroup.hpp GUI_App.hpp
2020-05-27 14:01:47 +02:00
enricoturri1966
0bb56736a1
Tech ENABLE_NON_STATIC_CANVAS_MANAGER set as default
2020-05-06 12:19:34 +02:00
enricoturri1966
a54d77699b
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_canvas_manager
2020-03-25 14:54:10 +01:00
bubnikv
c27297f6cc
64bit coord_t
...
Vec3i as a vertex index to TriangleMesh constructor
2020-03-25 14:35:41 +01:00
Enrico Turri
0b629eb905
GLCanvas3DManager moved from being a static member of _3DScene to be a normal member of GUI_App
2020-03-02 10:58:46 +01:00
Enrico Turri
3f2ccf08d2
3Dconnexion devices translation linearly dependent on zoom
2020-01-16 10:17:07 +01:00
Enrico Turri
2f806dedc7
Fixed rendering of selection rectangle with perspective camera
2019-06-25 09:51:43 +02:00
Enrico Turri
da8179d9c7
More camera related functionalities moved from GLCanvas3D to Camera
2019-06-19 14:18:51 +02:00
Enrico Turri
11490dfb06
Rectangle selection in 3D scene -> hovering detection
2019-04-25 09:46:26 +02:00
Enrico Turri
9d070410c2
Refactoring of GLSelectionRectangle
2019-04-24 16:01:27 +02:00
Enrico Turri
d79a2b8d2d
GLCanvas3D -> added support for cursor change and change cursor when using SLA support gizmo rectangle selection
2019-04-24 15:43:52 +02:00
Lukas Matena
ae692635da
Selection rectangle moved into a separate class
2019-04-24 13:25:41 +02:00