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

128 commits

Author SHA1 Message Date
enricoturri1966
4a5ad304ad Fixed conflicts after merge with master 2022-03-11 09:35:02 +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
f9cabee382 Tech ENABLE_GLBEGIN_GLEND_SHADERS_ATTRIBUTES - Use vertex attributes and matrices in shaders. 
Shader: gouraud_light - Gizmo SLA Supports
 2022-03-03 14:28:43 +01:00
enricoturri1966
919730e969 Tech ENABLE_GLBEGIN_GLEND_SHADERS_ATTRIBUTES - Use vertex attributes and matrices in shaders. 
Shader: gouraud_light - Gizmo Hollow
 2022-03-03 14:01:34 +01:00
enricoturri1966
a6e84aec20 Tech ENABLE_GLBEGIN_GLEND_SHADERS_ATTRIBUTES - Use vertex attributes and matrices in shaders. 
Shader: flat - Gizmo SLA Supports points
 2022-03-02 15:10:34 +01:00
enricoturri1966
93afbd551b Tech ENABLE_GLBEGIN_GLEND_SHADERS_ATTRIBUTES - Use vertex attributes and matrices in shaders. 
Shader: flat - Gizmo Hollow picking
 2022-03-02 11:56:09 +01:00
enricoturri1966
5f9aeb1e38 Removed unneeded pairs glPushMatrix()/glPopMatrix() 2022-03-02 08:30:00 +01:00
enricoturri1966
cd32254190 Fixed conflicts after merge with master 2022-02-24 13:17:30 +01:00
Filip Sykala
ff713c23ac Remove warning 
Remove unused right_up event call
 2022-02-11 10:12:57 +01:00
Filip Sykala
1fa3a236a5 Fix hollowing mouse click 2022-02-10 14:58:41 +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
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
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
72b8b75c4c Merge branch 'dev' of https://github.com/prusa3d/PrusaSlicer into et_new_camera_movements 2022-01-14 11:24:31 +01:00
enricoturri1966
2549b5ff48 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_new_camera_movements 2022-01-14 08:28:11 +01:00
enricoturri1966
6201dad245 Tech ENABLE_COLOR_CLASSES set as default 2022-01-14 08:19:00 +01:00
enricoturri1966
7ab39f6255 Fixed warning 2022-01-13 08:08:40 +01:00
enricoturri1966
a677f7f881 Merge branch 'dev' of https://github.com/prusa3d/PrusaSlicer into et_color_class 2022-01-12 15:54:55 +01:00
enricoturri1966
980c66ab4f Fixed conflicts after merge with master 2022-01-12 15:52:34 +01:00
enricoturri1966
d9c7855c39 Fixed tooltips for imgui sliders in GLGizmoHollow 2022-01-12 15:49:13 +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
enricoturri1966
9596b2d8b4 Fixed warning 2021-12-22 11:45:26 +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
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
0d6f2df268 Tech ENABLE_ENHANCED_IMGUI_SLIDER_FLOAT - Fixed missing tooltips passed as parameter to ImGuiWrapper::slider_float 2021-12-09 09:00:58 +01:00
Lukas Matena
06fd732b57 Fixed behaviour of float sliders in SLA gizmos, 
which was broken after the 'Edit' button was added.
This is a bit hacky fix, it might be worth improving later.
 2021-12-08 16:19:08 +01:00
Hannes Hauswedell
97d3c3e00a GLGizmoHollow: Increase hole diameter slider range (PR #6101) 2021-10-20 21:42:54 +02:00
Lukáš Hejl
5a1809579e Fixed unintended space after ImGui::SliderFloat in the hollow and sla supports gizmos. 2021-10-19 12:54:46 +02:00
Lukáš Hejl
b2fc50c9d9 Small refactoring of showing tooltips in gizmos. 2021-10-18 10:56:50 +02:00
Lukas Matena
6a5feb818f Revert "Fixed volume transformations in SLA:": 
The fix is not complete, it is better not to break it more than it was.

This reverts commit 6b25a9c836.
 2021-09-24 13:03:56 +02:00
Lukas Matena
6b25a9c836 Fixed volume transformations in SLA: 
Volume transformations were ignored in SLA mode. This did not matter for plain STLs
and PS own 3MF, because in those cases, the volume trafo was identity. Importing
a 3rd party 3MF leads to issues with support/holes placement and generation.
Fixes #6100 and #6744.
 2021-09-24 12:14:44 +02:00
Vojtech Bubnik
9d29eddf16 WIP: admesh eradication 
follow-up to 58d8ab3dea
 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
9a5f61c306 Added missing vertical alignments of labels in imgui dialogs 2021-08-31 08:53:40 +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
Lukas Matena
e93c5d4f20 ImGui sliders clamping: 
ImGuiWrapper::slider_float now clamps the value returned by imgui by default. Bare ImGui::SliderFloat
allows entering off-scale values when entered by keyboard, which is not nice. The protection can
be turned off by the last optional parameter.
 2021-07-22 15:50:48 +02:00
enricoturri1966
1f3252dd78 Revert of b140709fa8 and new implementation of fixing picking for sinking objects 2021-07-21 11:56:39 +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
enricoturri1966
e648368934 Removed unneeded calls to GL_LIGHTING 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
tamasmeszaros
96ac6ff2fa Fix undrillable hole color and picking 2021-03-16 09:31:03 +01:00
tamasmeszaros
4b9de0398f Drill holes one by one and display warning of any of them fails 
Drill with cgal::minus for now
 2021-03-16 09:31:03 +01:00