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

81 commits

Author SHA1 Message Date
enricoturri1966
68dae1d166 Fixed conflicts after merge with master 2022-02-24 12:54:57 +01:00
Filip Sykala
0d48cf5ab9 Merge branch 'master' into fs_mouse 2022-02-23 14:43:42 +01:00
enricoturri1966
44252074b4 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_world_coordinates 2022-02-14 14:23:31 +01:00
enricoturri1966
5fcb618f96 Tech ENABLE_GLBEGIN_GLEND_REMOVAL - Fixed bug in rendering gizmo rotate 2022-02-14 14:23:07 +01:00
enricoturri1966
a1f43f0611 Tech ENABLE_INSTANCE_COORDINATES_FOR_VOLUMES merged into tech ENABLE_WORLD_COORDINATE 2022-02-14 11:06:16 +01:00
enricoturri1966
6a7e32ad3e Fixed conflicts after merge with master 2022-02-14 09:20:37 +01:00
Filip Sykala
74cf6649f3 Merge branch 'master' into fs_mouse 2022-02-10 10:26:04 +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
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
9bfab29bc1 Fixed conflicts after merge with dev branch 2022-01-29 11:17:33 +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
0e3a3aa522 Tech ENABLE_GLBEGIN_GLEND_REMOVAL - GLGizmoPainterBase circle 2022-01-21 09:33:52 +01:00
enricoturri1966
08a2711034 Tech ENABLE_GLBEGIN_GLEND_REMOVAL - Gizmo rotate 2022-01-21 08:34:42 +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
1c3c7696a6 Merge branch 'dev' of https://github.com/prusa3d/PrusaSlicer into et_world_coordinates 2022-01-14 11:46:47 +01:00
enricoturri1966
6201dad245 Tech ENABLE_COLOR_CLASSES set as default 2022-01-14 08:19:00 +01:00
enricoturri1966
a2dc1cd446 Fixed conflicts after merge with dev branch 2022-01-12 15:54:48 +01:00
tamasmeszaros
17f4b1bea3 Avoid issue with invisible status indication. 2022-01-11 11:26:26 +01:00
tamasmeszaros
3be7d5f0dc Make a PlaterWorker to handle PlaterJobs 2022-01-11 11:26:26 +01:00
tamasmeszaros
b53ff75cf4 Rework UI jobs to make them more understandable and flexible. 2022-01-11 11:26:18 +01:00
enricoturri1966
aaaea68d99 Fixed conflicts after merge with dev branch 2022-01-03 10:33:16 +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
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
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
enricoturri1966
ad72e29612 Fixed conflicts after merge with master 2021-11-30 13:58:06 +01:00
tamasmeszaros
86afffa692 Don't let UI jobs overlap. 2021-11-30 12:07:52 +01:00
enricoturri1966
f69e557e20 Tech ENABLE_INSTANCE_COORDINATES_FOR_VOLUMES - Mirror transform in local system for volumes and a few fixes in rotation 2021-11-15 13:00:12 +01:00
enricoturri1966
1dadc4f90d Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_world_coordinates 2021-11-11 15:25:48 +01:00
tamasmeszaros
c49ba9f7f0 Round up rotation optimizer gizmo. 2021-11-10 16:35:47 +01:00
enricoturri1966
7a263764e1 Tech ENABLE_INSTANCE_COORDINATES_FOR_VOLUMES - Volumes rotation in all reference systems using Rotate gizmo and part manipulator fields 2021-11-04 12:46:22 +01:00
enricoturri1966
41fc0be32a Tech ENABLE_INSTANCE_COORDINATES_FOR_VOLUMES - 1st installment: introduction of instance reference system in part manipulation 2021-11-03 14:50:30 +01:00
enricoturri1966
d3faf9435c Tech ENABLE_WORLD_COORDINATE - Fixed center of Move and Scale gizmos 2021-11-03 12:03:13 +01:00
enricoturri1966
8c30ddc54f Tech ENABLE_WORLD_COORDINATE - Fixed Move and Rotate Gizmo size when the selected instance is scaled 2021-10-13 13:11:59 +02:00
enricoturri1966
e1619944ad Tech ENABLE_WORLD_COORDINATE - Resize Move and Rotate gizmos in dependence of the selected coordinate system 2021-10-12 13:42:55 +02:00
enricoturri1966
7f6f5dab83 Tech ENABLE_WORLD_COORDINATE - Gizmo rotate oriented in dependence of the selected coordinate system 2021-10-12 11:07:31 +02:00
enricoturri1966
116f928903 Tech ENABLE_WORLD_COORDINATE - 1st installment 
1) Added combo to select world/local coordinate to part manipulator in sidebar

2) Gizmo move oriented in dependence of the selected coordinate system

3) Sidebar hints for position oriented in dependence of the selected coordinate system
 2021-10-08 14:32:02 +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
tamasmeszaros
1a2e58e521 Add better defined names for orientation optimizer goals 2021-08-17 15:35:52 +02:00
tamasmeszaros
900814ff47 Add tooltips for combo items in rotation optimization dialog 2021-08-16 16:03:20 +02:00
enricoturri1966
66d43b882e Fixed calls set_uniform(emission_factor, xx) to use floats 2021-08-04 11:58:50 +02:00
enricoturri1966
b24488ce51 Tech ENABLE_SINKING_CONTOURS -> Sinking contours shown while dragging Move/Rotate/Scale gizmos and show contours for gizmo cut 2021-07-27 13:02:06 +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
Vojtech Bubnik
033d9f3a5e Merge remote-tracking branch 'remotes/origin/master' into vb_print_regions 2021-05-31 14:05:53 +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