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
|
e28f9daf1e
|
Merge branch 'master' into fs_emboss
# Conflicts:
# src/libslic3r/Point.hpp
# src/slic3r/GUI/GLCanvas3D.cpp
# src/slic3r/GUI/Gizmos/GLGizmoBase.cpp
# src/slic3r/GUI/Selection.cpp
|
2022-11-25 11:03:50 +01:00 |
|
enricoturri1966
|
569db9689f
|
Removal of calls to Geometry::assemble_transform()
|
2022-11-24 14:58:20 +01:00 |
|
YuSanka
|
fbcdd4191b
|
Merge remote-tracking branch 'PRIVATE/master' into ys_emboss_with_master
|
2022-10-27 13:09:55 +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 |
|
YuSanka
|
79e9df4b64
|
Merge remote-tracking branch 'PRIVATE/master' into ys_cut
|
2022-08-17 10:05:44 +02:00 |
|
Lukas Matena
|
deac513faa
|
Fixed conflicts after merge
|
2022-08-15 15:23:59 +02:00 |
|
Lukas Matena
|
bce2b148f4
|
Merged 2.5.0-beta1 into master (NO CONFLICTS FIXED)
|
2022-08-15 13:41:40 +02:00 |
|
YuSanka
|
df8f7e1069
|
Cut WIP: Raycasters for picking are applied
+ Added snapping for rotation of the cut plane
|
2022-08-10 13:42:36 +02:00 |
|
YuSanka
|
dda346b70a
|
After merge fixes
|
2022-08-08 14:58:13 +02:00 |
|
YuSanka
|
2ac3861b2a
|
Merge remote-tracking branch 'PRIVATE/master' into ys_cut
|
2022-08-08 10:57:38 +02:00 |
|
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
|
9690919028
|
Fixed GLGizmoBase::render_input_window() to properly require for an extra frame the first time an imgui window is shown
|
2022-07-19 13:12:13 +02:00 |
|
enricoturri1966
|
de635f9088
|
Fixed GLGizmoBase::render_input_window() to properly require for an extra frame the first time an imgui window is shown
|
2022-07-19 12:57:26 +02:00 |
|
YuSanka
|
15418bfb76
|
Cut WIP: Extensions for grabbers
+ Some code refactoring (RotationGizmo isn't used anymore)
+ A reversion from 63890b5f8d is putted back
|
2022-07-19 10:54:41 +02:00 |
|
YuSanka
|
07d455a125
|
Cut WIP: some UI improvements
+ partially reverted 63890b5f8d
|
2022-07-11 10:42:57 +02:00 |
|
YuSanka
|
89a7f6bdb1
|
Merge remote-tracking branch 'origin/ys_wx317_master' into ys_cut
|
2022-06-29 11:44:11 +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
|
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
|
9ac5ab857b
|
Tech ENABLE_RAYCAST_PICKING - Refactoring to allow for easier update of raycasters transform
|
2022-06-14 10:44:14 +02:00 |
|
enricoturri1966
|
9962a5a873
|
Tech ENABLE_RAYCAST_PICKING - Raytraced picking of Rotate Gizmo
|
2022-06-13 14:17:19 +02:00 |
|
enricoturri1966
|
df47ba7122
|
Tech ENABLE_RAYCAST_PICKING - Raytraced picking of gizmos - Move Gizmo
|
2022-06-13 13:09:24 +02:00 |
|
enricoturri1966
|
36ec839767
|
Tech ENABLE_GIZMO_GRABBER_REFACTOR set as default
|
2022-06-10 15:46:28 +02:00 |
|
enricoturri1966
|
cd6155293b
|
Fixed conflicts after merge with master
|
2022-06-07 11:10:19 +02:00 |
|
enricoturri1966
|
e4fb142afc
|
Tech ENABLE_WORLD_COORDINATE_SCALE_REVISITED merged into tech ENABLE_WORLD_COORDINATE
Fixed conflicts during rebase with master
|
2022-06-06 12:01:44 +02:00 |
|
enricoturri1966
|
88ce6ccdef
|
Tech ENABLE_TRANSFORMATIONS_BY_MATRICES - Reworked method void Selection::scale(const Vec3d& scale, TransformationType transformation_type) to use matrix multiplication
Fixed conflicts during rebase with master
|
2022-06-06 09:54:19 +02:00 |
|
enricoturri1966
|
7da94fb07d
|
Fixed differences after rebase with master
|
2022-05-26 13:20:56 +02:00 |
|
enricoturri1966
|
c468dcbed7
|
Tech ENABLE_LEGACY_OPENGL_REMOVAL - Fixed calculation of normal matrices sent to shaders
Fixed conflicts during rebase with master
|
2022-05-26 12:25:55 +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 |
|
YuSanka
|
73469ffa21
|
Merge remote-tracking branch 'origin/master' into ys_cut
|
2022-04-28 13:25:00 +02:00 |
|
Filip Sykala
|
7ec422d12f
|
Merge branch 'et_world_coordinates' into fs_emboss
# Conflicts:
# src/libslic3r/Model.hpp
# src/libslic3r/Technologies.hpp
# src/slic3r/GUI/Gizmos/GLGizmoBase.hpp
|
2022-04-20 12:13:17 +02:00 |
|
enricoturri1966
|
8a36c12f13
|
Fixed conflicts after merge with master
|
2022-04-20 11:53:51 +02:00 |
|
enricoturri1966
|
f504236734
|
Tech ENABLE_GIZMO_GRABBER_REFACTOR - Refactoring of GLGizmoBase::Grabber to have a single static instance of the cube and cone models to be shared by all grabbers
|
2022-04-14 15:15:14 +02:00 |
|
YuSanka
|
91a1cd30a0
|
Merge remote-tracking branch 'origin/master' into ys_cut
|
2022-04-14 10:04:45 +02:00 |
|
enricoturri1966
|
2b8f8a2842
|
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_world_coordinates
|
2022-03-28 14:14:12 +02:00 |
|
Filip Sykala
|
65909c74c4
|
Merge branch 'master' into fs_emboss
# Conflicts:
# src/libslic3r/Technologies.hpp
|
2022-03-22 12:52:16 +01:00 |
|
enricoturri1966
|
76d1d4949b
|
Tech ENABLE_GL_SHADERS_ATTRIBUTES - Added shaders for glsl version 140
|
2022-03-21 13:10:47 +01:00 |
|
YuSanka
|
e5b10ae289
|
Merge remote-tracking branch 'origin/master' into ys_cut
|
2022-03-11 15:58:14 +01:00 |
|
YuSanka
|
0fba32fa53
|
Cut: Add connectors. WIP
|
2022-03-11 15:16:38 +01:00 |
|
enricoturri1966
|
05b65c3a43
|
Fixed conflicts after merge with branch et_world_coordinates
|
2022-03-10 13:22:20 +01:00 |
|
enricoturri1966
|
b9b8406ad8
|
Fixed conflicts after merge with master
|
2022-03-10 10:32:00 +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 |
|