GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-07-12 23:21:48 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
18,886 Commits 131 Branches 318 Tags
Commit Graph

82 Commits

Author SHA1 Message Date
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
enricoturri1966
2d72931fac Tech ENABLE_GLBEGIN_GLEND_SHADERS_ATTRIBUTES - Use vertex attributes and matrices in shaders. 
Shader: gouraud_light - Gizmo Scale hovered grabbers
 2022-03-03 13:30:22 +01:00
enricoturri1966
14c23a6526 Tech ENABLE_GLBEGIN_GLEND_SHADERS_ATTRIBUTES - Use vertex attributes and matrices in shaders. 
Shader: gouraud_light - GLGizmoBase grabbers
 2022-03-03 13:04:00 +01:00
Filip Sykala
fdf8ebed7f Fix of commit 95fc0545907a8e533e6e8343d0ebb0843eacbb95 
Revert back previous deleted assert. It is usefull
 2022-03-01 08:39:02 +01:00
enricoturri1966
8c8f0b32a7 Tech ENABLE_GLBEGIN_GLEND_SHADERS_ATTRIBUTES - Use vertex attributes and matrices in shaders. 
Shader: flat - Picking for base gizmo grabbers and gizmo rotate grabber extensions
 2022-02-28 14:33:49 +01:00
enricoturri1966
7d971b15a3 Fixed conflicts after merge with master 2022-02-25 12:02:44 +01:00
enricoturri1966
1e9951dec5 Follow-up of 5b5fdfba012aecb79429638d0ea514b060dea6a9 - Removed member variable Selection::m_dragging 
It was used only in ObjectManipulation::update_if_dirty() to avoid the update the sidebar reset and mirror button, which results in a slow down of the GUI, while dragging objects/gizmos in the 3D scene

A call to GLCanvas3D::is_dragging() is used instead
 2022-02-25 11:42:42 +01:00
enricoturri1966
071888c284 Port of 5b5fdfba012aecb79429638d0ea514b060dea6a9 into tech ENABLE_WORLD_COORDINATE_SCALE_REVISITED 2022-02-24 14:56:24 +01:00
enricoturri1966
d84853c732 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_world_coordinates 2022-02-24 14:53:18 +01:00
enricoturri1966
5b5fdfba01 Follow-up of 3cd15ac005287f1d12aa63c6fb072fb8acc3170b - Fixed update of dragging state of selection 2022-02-24 14:49:53 +01:00
enricoturri1966
68dae1d166 Fixed conflicts after merge with master 2022-02-24 12:54:57 +01:00
Filip Sykala
576a63cd20 Fix for cut gizmo during move of object 2022-02-10 08:50:38 +01:00
Filip Sykala
5f51811a3c Fix dragging out of window 2022-02-09 15:16:17 +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
enricoturri1966
5db3c66cf7 Tech ENABLE_GLBEGIN_GLEND_REMOVAL - Added method void init_from(const TriangleMesh& mesh) to GLModel 2022-01-27 13:45:30 +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
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
6201dad245 Tech ENABLE_COLOR_CLASSES set as default 2022-01-14 08:19:00 +01:00
enricoturri1966
cd4094743e Tech ENABLE_COLOR_CLASSES - 1st installment -> Introduction of classes ColorRGB and ColorRGBA to unify color data definition and manipulation 2021-12-22 10:45:35 +01:00
Filip Sykala
d08e6d8c1b fix update data 2021-12-15 14:26:31 +01:00
Lukas Matena
1216e593f0 Added a missing forward declaration, fixed some warnings 2021-12-14 17:08:56 +01:00
Filip Sykala
03d0e36f2f Merge branch 'dev' into fs_mouse 
# Conflicts:
#	src/slic3r/GUI/Gizmos/GLGizmoBase.cpp
#	src/slic3r/GUI/Gizmos/GLGizmoBase.hpp
#	src/slic3r/GUI/Gizmos/GLGizmoPainterBase.hpp
#	src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp
#	src/slic3r/GUI/Gizmos/GLGizmoRotate.hpp
 2021-12-14 11:13:42 +01:00
Filip Sykala
291a21445c Fix do not render fot picking druring dragging 2021-12-13 10:49:16 +01:00
Filip Sykala
3c7390e34e remove GLModel from base class 
- only 2 gizmo use cone
 2021-12-10 15:51:07 +01:00
Filip Sykala
123903f317 Clean up GLGizmoManagaer 
Clean up GLGizmoBase
 2021-12-10 14:58:06 +01:00
enricoturri1966
e3d5cd445c Gizmos refactoring - Removed GLModels defined into GLGizmoBase, and mostly unused, to avoid wasting GPU memory. Use a shared GLModel for Gizmos inheriting from GLGizmoPainterBase. Initialization of GLModels moved from constructor to render methods 2021-12-10 11:28:12 +01:00
Filip Sykala
c751d6327d Separate GizmoManager on_move into gizmo itself 2021-12-10 09:09:53 +01:00
Filip Sykala
95fc054590 fix for getting name of gizmo without key(like simplify) 2021-09-29 18:17:19 +02:00
Vojtech Bubnik
9d29eddf16 WIP: admesh eradication 
follow-up to 58d8ab3deaaac1049439728d5a0f46c4b6a592f5
 2021-09-14 14:51:40 +02:00
Lukas Matena
a4300b8e64 Naming of the entering/leaving snapshots is now more generic, 
it uses the actual name of the gizmo. Also, the keyboard shortcut
is now appended to the name, instead of being duplicated in it.
 2021-09-03 13:53:07 +02:00
enricoturri1966
39ec1a6318 Fixed conflicts after merge with master 2021-08-26 12:39:28 +02:00
Filip Sykala
6d895872b0 call render in main thread by function callAfter(hint by @Vojtech) 2021-08-20 14:29:52 +02:00
Filip Sykala
8fab4885c7 Add dirty state into Gizmo (hint by @DavidKocik) 2021-08-20 09:13:09 +02:00
enricoturri1966
66d43b882e Fixed calls set_uniform(emission_factor, xx) to use floats 2021-08-04 11:58:50 +02:00
enricoturri1966
fd5cf8d0cc Refactoring in GLModel::render() to simplify client code 2021-07-20 12:36:56 +02:00
enricoturri1966
c61785f775 Tech ENABLE_SEQUENTIAL_LIMITS set as default 2021-07-20 12:05:15 +02:00
enricoturri1966
f0354b43c1 Fixed conflicts after merge with master + fixed rendering of hovered gizmo grabbers 2021-05-31 12:54:48 +02:00
Lukas Matena
8c560522a3 Fixed rendering of gizmo grabbers 2021-05-28 16:44:13 +02:00
enricoturri1966
f69bd75464 Fixed rendering of gizmos' grabbers 2021-05-28 16:44:13 +02:00
enricoturri1966
9605d10caa Unified color definition 2021-05-28 16:44:13 +02:00
enricoturri1966
e648368934 Removed unneeded calls to GL_LIGHTING 2021-05-28 16:44:13 +02:00
enricoturri1966
b63de990d4 Removed static members from GLGizmoBase and GLGizmoBase::Grabber to fix OpenGL error when closing the application 2021-05-28 16:44:13 +02:00
Lukas Matena
2e24e689fa Grabbers and support points appearence tweaking, some refactoring 2021-05-28 16:44:13 +02:00
Lukas Matena
97b7ef7dc0 Removed GLU calls from all the gizmos 2021-05-28 16:44:13 +02:00
Lukas Matena
94b0ab603f Include cleanup: Selection.hpp 
It does not need 3DScene.hpp and Model.hpp
And it does not to be included by GLGizmoBase.hpp
 2020-05-26 13:46:59 +02:00