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

77 Commits

Author SHA1 Message Date
enricoturri1966
1a1cf108fc Tech ENABLE_GL_SHADERS_ATTRIBUTES merged into ENABLE_LEGACY_OPENGL_REMOVAL 
Fixed conflicts during rebase with master
 2022-05-26 10:50:32 +02:00
enricoturri1966
914a66e2c3 Tech ENABLE_GL_CORE_PROFILE - Thick lines shader enhanced to render dashed lines 
Fixed conflicts while rebase with master
 2022-05-26 08:11:04 +02:00
enricoturri1966
017784c38e Tech ENABLE_GL_CORE_PROFILE - Use thick_lines shader where needed 
Fixed conflicts during rebase with master
 2022-05-25 15:55:39 +02:00
enricoturri1966
389dc36053 Tech ENABLE_GL_CORE_PROFILE - Use OpenGL core profile context - 1st installment 
Fixed conflicts during rebase with master
 2022-05-25 15:29:10 +02:00
enricoturri1966
76d1d4949b Tech ENABLE_GL_SHADERS_ATTRIBUTES - Added shaders for glsl version 140 2022-03-21 13:10:47 +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
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
Lukas Matena
e058f794d9 Merge branch 'stable' 2022-02-24 13:05:05 +01:00
Lukas Matena
d3e7a9613e Fix of cut gizmo: contour placed incorrectly with elevated objects 2022-02-23 11:01:02 +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
enricoturri1966
f132ca9c3c Tech ENABLE_SINKING_CONTOURS set as default 2021-09-14 15:45:21 +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
Lukas Matena
8a5278354e Fixed updating of cut contour in cut gizmo by comparing ObjectIDs, 
for consistency with other gizmos and hopefully more robustness
 2021-08-18 11:49:30 +02:00
Lukas Matena
3cf6d1c888 Revert 740067c and e645f4a 
740067c: "Fixed cut contours in gizmo cut after deleting an object"
e645f4a: "Fixed cut contours after cutting an object in gizmo cut"
 2021-08-18 11:44:21 +02:00
enricoturri1966
740067c576 Fixed cut contours in gizmo cut after deleting an object 2021-08-18 10:23:18 +02:00
enricoturri1966
e645f4a4ee Fixed cut contours after cutting an object in gizmo cut 2021-08-18 08:59:56 +02:00
enricoturri1966
66d43b882e Fixed calls set_uniform(emission_factor, xx) to use floats 2021-08-04 11:58:50 +02:00
enricoturri1966
f1cd3e22c4 Tech ENABLE_SINKING_CONTOURS -> Cut gizmo: contours updated during render pass 2021-07-28 13:03:48 +02:00
enricoturri1966
d99ea7c20f Tech ENABLE_SINKING_CONTOURS -> Sinking contours rendered using triangles 2021-07-28 11:21:59 +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
802d675784 Follow-up of 18c8003a0fc7f919e20fb404b0a6f67880443c46 -> Fixed bounding box of selected volumes 2021-07-14 15:32:09 +02:00
enricoturri1966
18c8003a0f Fixes into Cut gizmo 2021-07-14 11:39:09 +02:00
Vojtech Bubnik
e4e8c5df12 As an example of using the enum_bitmask infrastructure for type safe 
sets of optional boolean parameters, the cut function "keep upper",
"keep lower" and "flip lower" boolean parameters were converted into
a single type safe enum_bitmask. Such a coding style is certainly
wordier than the original code, but much safer and more readable
than the error prone "boolean, boolean, boolean" function call
parameter list.
 2021-06-27 17:36:25 +02:00
enricoturri1966
f69bd75464 Fixed rendering of gizmos' grabbers 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
enricoturri1966
3f44f8177d Disable [Perform cut] button in Cut Gizmo dialog when the value of Z is not valid 2020-12-15 10:44:51 +01:00