Commit graph

194 commits

Author SHA1 Message Date
YuSanka
fdaca50d4b Cut WIP: Implemented flip of the upper part after performing of the cut 2022-03-23 09:26:15 +01:00
YuSanka
301d0d5288 Cut WIP:
* Processed Auto/Manual connetor's mode
* Processed Dowel type of connectors
* Added TriangeMesh::its_make_frustum_dowel
2022-03-22 11:25:48 +01:00
enricoturri1966
76d1d4949b Tech ENABLE_GL_SHADERS_ATTRIBUTES - Added shaders for glsl version 140 2022-03-21 13:10:47 +01:00
YuSanka
861187997b Cut: Pt connectors to the cut plane 2022-03-18 11:31:10 +01:00
YuSanka
e785a66a01 Cut: Added possibility to delete a selected connector
+ Save connector position in object's local coordinates
+ Added missed cut_.svg
2022-03-17 17:41:36 +01:00
YuSanka
09249e3b8d Cut: Perform cut with connectors 2022-03-15 17:08:15 +01:00
YuSanka
b204f05809 Cut: ObjectList: Show info about added cut connectors.
+ Some code refactoring: Put CutConnectorsType, CutConnectorsStyle and CutConnectorsShape to the Model.hpp.
2022-03-14 16:54:50 +01:00
YuSanka
01aa99f67f After merge fixes 2022-03-14 14:09:10 +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
f8ce187262 Tech ENABLE_LEGACY_OPENGL_REMOVAL - Refactoring of GLModel to automatically detect the data type to use into the index buffer in dependence of vertices count 2022-03-09 11:51: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
661ecdc142 Tech ENABLE_GLBEGIN_GLEND_SHADERS_ATTRIBUTES - Use vertex attributes and matrices in shaders.
Shader: gouraud_light - Gizmo Cut
2022-03-03 13:10:47 +01:00
enricoturri1966
f4cf9494d0 Tech ENABLE_GLBEGIN_GLEND_SHADERS_ATTRIBUTES - Some refactoring 2022-03-01 12:00:29 +01:00
YuSanka
5d83781780 Fixes after merge with master 2022-02-28 16:56:10 +01:00
enricoturri1966
7c9ac342de Tech ENABLE_GLBEGIN_GLEND_SHADERS_ATTRIBUTES - Use vertex attributes and matrices in shaders.
Shader: flat - Gizmo Cut
2022-02-28 14:55:08 +01:00
YuSanka
ba7b0839f2 Merge remote-tracking branch 'origin/master' into ys_cut 2022-02-28 13:36:10 +01:00
YuSanka
bf6abf71d0 Cut:
+ Code refactoring: grabbers to move cut plane by Axes are changed to one "plane grabber"
+ Code cleaning in GizmoMove3D: reverted changes from c45c0045
2022-02-28 12:06:56 +01:00
Lukas Matena
e058f794d9 Merge branch 'stable' 2022-02-24 13:05:05 +01:00
YuSanka
1b9f42d71b Cut improvements:
* Added new cut() function witch respects to the rotation of the cut plane
* Added revert buttons to the GizmoCutDialog
* Fixed GLGizmoCenterMove::bounding_box(). Pad and supports don't added to the bb now
2022-02-23 13:24:06 +01:00
Lukas Matena
d3e7a9613e Fix of cut gizmo: contour placed incorrectly with elevated objects 2022-02-23 11:01:02 +01:00
Lukas Matena
9917b8e58b Cut: fixed clipping plane when it is not horizonal 2022-02-17 15:16:47 +01:00
YuSanka
af03bed094 Cut: Implemented update_clipper() 2022-02-17 14:32:08 +01:00
YuSanka
1e5d5ae2f5 Merge remote-tracking branch 'origin/lm_cut_gizmo' into ys_cut 2022-02-16 14:00:26 +01:00
Lukas Matena
a8564bf289 Cut gizmo is now able to see clicks on the clipping plane 2022-02-16 13:42:34 +01:00
Lukas Matena
7fef26527b Cut gizmo uses the common ObjectClipper to show the cut and contour 2022-02-16 13:42:34 +01:00
YuSanka
c45c004545 Cut: next improvements.
Rewrite GLGizmoCut3D as a new GLGizmoBase which contained GLGizmoRotation3D and GLGizmoMove3D
2022-02-16 12:37:42 +01:00
YuSanka
76784441be Cut: next UI improvements 2022-02-16 12:37:42 +01:00
YuSanka
f7284a6569 Cut: Extensions for Dialog of CutGizmo 2022-02-16 12:37:42 +01:00
Filip Sykala
74cf6649f3 Merge branch 'master' into fs_mouse 2022-02-10 10:26:04 +01:00
Filip Sykala
576a63cd20 Fix for cut gizmo during move of object 2022-02-10 08:50:38 +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
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
YuSanka
8c4688194a Merge remote-tracking branch 'origin/master' into dev 2022-01-24 10:40:12 +01:00
enricoturri1966
39fa0b3c46 Fixed wrong cut contours shown by gizmo cut (SPE-1177) 2022-01-24 09:36:44 +01:00
enricoturri1966
18e2cc2298 Tech ENABLE_SHOW_NON_MANIFOLD_EDGES - 1st installment - Calculate and show in 3D view non-manifold edges as lines 2022-01-20 13:32:24 +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
71f08841f9 Tech ENABLE_GLBEGIN_GLEND_REMOVAL - Gizmo cut plane and grabber connection 2022-01-19 13:32:46 +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
enricoturri1966
243f5c38ee Tech ENABLE_ENHANCED_IMGUI_SLIDER_FLOAT set as default 2022-01-12 13:36:31 +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
123903f317 Clean up GLGizmoManagaer
Clean up GLGizmoBase
2021-12-10 14:58:06 +01:00
Filip Sykala
c751d6327d Separate GizmoManager on_move into gizmo itself 2021-12-10 09:09:53 +01:00
enricoturri1966
f7662682c8 Tech ENABLE_ENHANCED_IMGUI_SLIDER_FLOAT - Modified ImGuiWrapper::slider_float() to create a compound widget where an additional button can be used to set the keyboard focus into the slider to allow the user to type in the desired value 2021-11-05 14:46:44 +01:00
enricoturri1966
4103086a6e #7056 - Gizmo cut input set to use current locale 2021-10-04 11:12:29 +02:00
Vojtech Bubnik
8a2a9dba2f Eradicated admesh from TriangleMesh:
TriangleMesh newly only holds indexed_triangle_set and
TriangleMeshStats. TriangleMeshStats contains an excerpt of stl_stats.
TriangleMeshStats are updated when initializing with indexed_triangle_set.

Admesh triangle mesh fixing is newly only used when loading an STL.
AMF / 3MF / OBJ file formats are already indexed triangle sets, thus
they are no more converted to admesh stl_file format, nor fixed
through admesh repair machinery. When importing AMF / 3MF / OBJ files,
volume is calculated and if negative, all faces are flipped. Also
a bounding box and number of open edges is calculated.

Implemented its_number_of_patches(), its_num_open_edges()
Optimized its_split(), its_is_splittable() using a visitor pattern.

Reworked QHull integration into TriangleMesh:
    1) Face normals were not right.
    2) Indexed triangle set is newly emitted instead of duplicating
       vertices for each face.

Fixed cut_mesh(): Orient the triangulated faces correctly.
2021-09-20 17:12:22 +02:00