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

67 Commits

Author SHA1 Message Date
enricoturri1966
5b5fdfba01 Follow-up of 3cd15ac005287f1d12aa63c6fb072fb8acc3170b - Fixed update of dragging state of selection 2022-02-24 14:49:53 +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
enricoturri1966
a0ed240af1 Generate gizmos' tooltip on demand 2020-03-16 16:37:22 +01:00
enricoturri1966
ffe404fc5b Fixed gizmos' tooltips 2020-03-16 12:45:39 +01:00
Lukas Matena
5a2da9597b Shared data for SLA gizmos have been removed from GLGizmoBase 
This commit introduces no functional changes, only code-shuffling
 2020-02-27 15:18:15 +01:00
Lukas Matena
a3869736ba SLA gizmos can now be opened when any instance is selected 
This was broken - only first instance worked
 2020-02-27 15:18:15 +01:00
Lukas Matena
4c22023762 SLA gizmo clipping plane resetting 
Clipping plane direction is now initialized when the plane is first moved, not when the gizmo is opened. This is how previous versions worked.
This is a minimal-effort solution before the clipping plane is refactored properly.
 2020-02-21 09:46:40 +01:00
Lukas Matena
4df6a645f2 AABB trees for SLA gizmos are not calculated when the object is selected, but only after one of the gizmos is opened 2020-02-21 09:46:40 +01:00
Lukas Matena
665bc9e960 Hollowing: allow to place drain holes on the inner surface of a hollowed cavity 
Drain holes are not allowed to be placed on its own inner surface. This was recently (0e3ebb3)
done by forcing invalidation of the slaposDrillHoles, which also invalidates and therefore
hides the drilled mesh. However, that also hides the hollowed mesh and it is not possible
to place holes inside the cavity.

This change does not dump the drilled mesh, but checks that no raycast hit ends up in a hole.
 2020-02-06 17:58:26 +01:00
Lukas Matena
58b5e75a9c SlaSupports gizmo - show holes position even when user did not Preview the drilled mesh 2020-02-04 15:03:10 +01:00
Lukas Matena
227cc4dc33 Fixed conflicts after merge 
slaposHollowing was divided into slaposHollowing and slaposDrillHoles on master
This commit takes this into account on the code that was merged from lm_drilling_backend_rebased
 2020-02-03 15:42:54 +01:00
Lukas Matena
79da3a95e1 Clipping plane is now common for Hollowing and SLA supports gizmos 2020-02-03 15:17:18 +01:00
Lukas Matena
a6f7fc93f4 Gizmo updates - forget everything about the loaded mesh when an object is deselected 2020-01-30 15:26:23 +01:00
Lukas Matena
4f43c6d3f8 SlaSupports gizmo - most of updating now assumes that common data struct is updated properly 2020-01-30 14:31:52 +01:00
Lukas Matena
08dcbd0271 Hollowing gizmo - most of updating now assumes that common data struct is updated properly 2020-01-30 14:31:39 +01:00
Lukas Matena
3f73261fdb Fixed transformation of the hollowed mesh to be used at frontend 
Common gizmos data update is called from GLGizmoManager
 2020-01-29 10:08:26 +01:00
Lukas Matena
46fdce1169 SLA gizmos can now fetch hollowed and drilled mesh from the backend 2020-01-29 10:08:26 +01:00