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

93 Commits

Author SHA1 Message Date
enricoturri1966
c99e93c357 Fixed differences after rebase with master 2022-06-06 14:55:38 +02:00
enricoturri1966
00878fb330 Tech ENABLE_TRANSFORMATIONS_BY_MATRICES merged into ENABLE_WORLD_COORDINATE 
Fixed conflicts during rebase with master
 2022-06-06 13:36:29 +02:00
enricoturri1966
88ce6ccdef Tech ENABLE_TRANSFORMATIONS_BY_MATRICES - Reworked method void Selection::scale(const Vec3d& scale, TransformationType transformation_type) to use matrix multiplication 
Fixed conflicts during rebase with master
 2022-06-06 09:54:19 +02:00
enricoturri1966
0e3490620e Added method const GLVolume* Selection::get_first_volume() const to simplify client code 
Fixed conflicts during rebase with master
 2022-06-06 08:44:11 +02:00
enricoturri1966
9f503b95e8 Tech ENABLE_TRANSFORMATIONS_BY_MATRICES - Reworked method void Selection::rotate(const Vec3d& rotation, TransformationType transformation_type) to use matrix multiplication 
Fixed conflicts during rebase with master
 2022-06-03 15:44:45 +02:00
enricoturri1966
7e72963293 Tech ENABLE_TRANSFORMATIONS_BY_MATRICES - 1st installment. Geometry::Transformation modified to store data in a single matrix, without store the matrix components 
Fixed conflicts during rebase with master
 2022-06-03 13:58:36 +02:00
enricoturri1966
a4c0d99616 Tech ENABLE_GL_SHADERS_ATTRIBUTES - Fixed rendering of gizmo rotate 
Fixed conflicts during rebase with master
 2022-06-03 13:06:53 +02:00
enricoturri1966
90e54e5821 Tech ENABLE_INSTANCE_COORDINATES_FOR_VOLUMES merged into tech ENABLE_WORLD_COORDINATE 
Fixed conflicts during rebase with master
 2022-06-03 09:57:07 +02:00
enricoturri1966
6e92b4fc3b Tech ENABLE_INSTANCE_COORDINATES_FOR_VOLUMES - Mirror transform in local system for volumes and a few fixes in rotation 
Fixed conflicts during rebase with master
 2022-06-03 08:41:23 +02:00
enricoturri1966
65adbd5b0d Tech ENABLE_INSTANCE_COORDINATES_FOR_VOLUMES - Volumes rotation in all reference systems using Rotate gizmo and part manipulator fields 
Fixed conflicts during rebase with master
 2022-06-02 16:03:27 +02:00
enricoturri1966
79bdcefbde Tech ENABLE_INSTANCE_COORDINATES_FOR_VOLUMES - 1st installment: introduction of instance reference system in part manipulation 
Fixed conflicts during rebase with master
 2022-06-02 14:58:44 +02:00
enricoturri1966
679f8b0111 Tech ENABLE_WORLD_COORDINATE - Fixed center of Move and Scale gizmos 
Fixed conflicts during rebase with master
 2022-06-02 14:20:26 +02:00
enricoturri1966
e76b5875b7 Tech ENABLE_WORLD_COORDINATE - Fixed Move and Rotate Gizmo size when the selected instance is scaled 
Fixed conflicts during rebase with master
 2022-06-02 11:20:09 +02:00
enricoturri1966
c968ba05fb Tech ENABLE_WORLD_COORDINATE - Resize Move and Rotate gizmos in dependence of the selected coordinate system 
Fixed conflicts during rebase with master
 2022-06-02 10:50:22 +02:00
enricoturri1966
ca5742c401 Tech ENABLE_WORLD_COORDINATE - Gizmo rotate oriented in dependence of the selected coordinate system 
Fixed conflicts during rebase with master
 2022-06-02 10:16:07 +02:00
tamasmeszaros
4326e083eb Fix sla rotation gizmo menu not being remembered 2022-05-30 11:15:23 +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
enricoturri1966
76d1d4949b Tech ENABLE_GL_SHADERS_ATTRIBUTES - Added shaders for glsl version 140 2022-03-21 13:10:47 +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
a9465ddedc A few small refactorings 2022-03-10 11:27:05 +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
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
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
Filip Sykala
0d48cf5ab9 Merge branch 'master' into fs_mouse 2022-02-23 14:43:42 +01:00
enricoturri1966
5fcb618f96 Tech ENABLE_GLBEGIN_GLEND_REMOVAL - Fixed bug in rendering gizmo rotate 2022-02-14 14:23:07 +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
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
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
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
tamasmeszaros
86afffa692 Don't let UI jobs overlap. 2021-11-30 12:07:52 +01:00