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

159 commits

Author SHA1 Message Date
YuSanka
94f3aaacd4 Cut WIP: Undo/Redo implementation 2022-05-02 12:44:47 +02:00
YuSanka
73469ffa21 Merge remote-tracking branch 'origin/master' into ys_cut 2022-04-28 13:25:00 +02:00
enricoturri1966
8a36c12f13 Fixed conflicts after merge with master 2022-04-20 11:53:51 +02:00
enricoturri1966
f504236734 Tech ENABLE_GIZMO_GRABBER_REFACTOR - Refactoring of GLGizmoBase::Grabber to have a single static instance of the cube and cone models to be shared by all grabbers 2022-04-14 15:15:14 +02:00
YuSanka
91a1cd30a0 Merge remote-tracking branch 'origin/master' into ys_cut 2022-04-14 10:04:45 +02:00
YuSanka
463e9ab530 Cut WIP: 
+ Added CutObjectBase class which contains cut attributes for object
+ ObjectList and ManipulationPanel :
    * Disable all ManipulationEditors for solid/negative volumes of cut object
    * Disable Scale/Size ManipulationEditors for objects/instances of objects which are CutParts of initial object
+ Scale/Rotation/Move gizmos are disabled for solid/negative volumes of cut object
+ Select whole CutParts of initial object when ScaleGizmo is active
 2022-04-11 11:20:00 +02:00
enricoturri1966
2b8f8a2842 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_world_coordinates 2022-03-28 14:14:12 +02:00
Vojtech Bubnik
fe71e7c597 Merge branch 'master' into et_world_coordinates 2022-03-23 14:05:33 +01:00
enricoturri1966
76d1d4949b Tech ENABLE_GL_SHADERS_ATTRIBUTES - Added shaders for glsl version 140 2022-03-21 13:10:47 +01:00
YuSanka
e5b10ae289 Merge remote-tracking branch 'origin/master' into ys_cut 2022-03-11 15:58:14 +01:00
enricoturri1966
2c80ecca41 Tech ENABLE_GL_SHADERS_ATTRIBUTES - Fixed rendering of gizmo rotate 2022-03-11 08:43:07 +01:00
enricoturri1966
3dddfa919a Debug tech ENABLE_GLMODEL_STATISTICS - Shows an imgui dialog with GLModel statistics data 2022-03-10 15:55:15 +01:00
enricoturri1966
fb38d80458 Fixed conflicts after merge with master 2022-03-10 11:33:59 +01:00
enricoturri1966
a9465ddedc A few small refactorings 2022-03-10 11:27:05 +01:00
enricoturri1966
b9b8406ad8 Fixed conflicts after merge with master 2022-03-10 10:32:00 +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
d6b0a9858b Tech ENABLE_GLBEGIN_GLEND_SHADERS_ATTRIBUTES - Use vertex attributes and matrices in shaders. 
Shader: gouraud_light - Selection sidebar hints
 2022-03-04 10:52:30 +01:00
enricoturri1966
d71ad7177e Tech ENABLE_GLBEGIN_GLEND_SHADERS_ATTRIBUTES - Use vertex attributes and matrices in shaders. 
Shader: gouraud_light - Gizmo Rotate grabber extensions
 2022-03-04 09:08:15 +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
76f3829ecb Tech ENABLE_GLBEGIN_GLEND_SHADERS_ATTRIBUTES - Use vertex attributes and matrices in shaders. 
Shader: flat - Gizmo Rotate
 2022-03-01 10:48:38 +01:00
YuSanka
5d83781780 Fixes after merge with master 2022-02-28 16:56:10 +01:00
enricoturri1966
8c8f0b32a7 Tech ENABLE_GLBEGIN_GLEND_SHADERS_ATTRIBUTES - Use vertex attributes and matrices in shaders. 
Shader: flat - Picking for base gizmo grabbers and gizmo rotate grabber extensions
 2022-02-28 14:33:49 +01:00
YuSanka
ba7b0839f2 Merge remote-tracking branch 'origin/master' into ys_cut 2022-02-28 13:36:10 +01:00
enricoturri1966
2379588196 Tech ENABLE_GLBEGIN_GLEND_REMOVAL - Fix in GLGizmoRotate::render_angle_arc(): 
Tech ENABLE_GLINDEXEDVERTEXARRAY_REMOVAL - Fix in GLModel::render()
 2022-02-28 10:21:03 +01:00
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
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
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