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

60 Commits

Author SHA1 Message Date
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
f944595d3d Tech ENABLE_WORLD_COORDINATE - Fixed constrained scaling of volumes in local coordinates 2022-06-02 13:39:01 +02:00
enricoturri1966
cf90ad699f Tech ENABLE_WORLD_COORDINATE - Fixed unconstrained scaling of volumes in local coordinates 
Fixed conflicts during rebase with master
 2022-06-02 13:38:47 +02:00
enricoturri1966
ad6dcf3f10 Tech ENABLE_WORLD_COORDINATE - Fixed constrained scaling of instances in local coordinates 
Fixed conflicts during rebase with master
 2022-06-02 13:30:23 +02:00
enricoturri1966
0eaa4c5dea Tech ENABLE_WORLD_COORDINATE - Fixed unconstrained scaling in world coordinates for volumes 
Fixed conflicts during rebase with master
 2022-06-02 13:21:24 +02:00
enricoturri1966
9074407196 Follow-up of 86b44b48005e3ddb96e851e19f8e2ccd1a38b667 - Constrained uniform scaling in world coordinates for rotated instances 2022-06-02 13:09:43 +02:00
enricoturri1966
1191ab42cb Tech ENABLE_WORLD_COORDINATE - Added constrained uniform scaling in world coordinates for instances 
Fixed conflicts during rebase with master
 2022-06-02 13:09:30 +02:00
enricoturri1966
d7753fc476 Tech ENABLE_WORLD_COORDINATE - Fixed constrained non-uniform scaling in world coordinates for rotated instances 
Fixed conflicts during rebase with master
 2022-06-02 13:05:12 +02:00
enricoturri1966
d5a02e617a Partial revert of 7e5c214b91ae14740fc188413948818a1b49928a to restore code mistakenly removed and needed when tech ENABLE_WORLD_COORDINATE is disabled 
Fixed conflicts during rebase with master
 2022-06-02 12:58:35 +02:00
enricoturri1966
b2a7c84c85 Tech ENABLE_WORLD_COORDINATE - Fixed gizmo Scale in world coordinates 
Fixed conflicts during rebase with master
 2022-06-02 11:34:53 +02:00
enricoturri1966
c4ad8bc41a Other refactoring plus some fixes into GLGizmoScale3D 
Fixed conflicts during rebase with master
 2022-06-02 11:29:47 +02:00
enricoturri1966
4946466633 Fixed color of the line connecting the grabbers while hovering one grabber and pressing CTRL key in Gizmo Scale 2022-06-02 11:27:27 +02:00
enricoturri1966
d50ce6c69c Another small refactoring into GLGizmoScale3D 
Fixed conflicts during rebase with master
 2022-06-02 11:27:09 +02:00
enricoturri1966
567162a647 Refactoring into GLGizmoScale3D 
Fixed conflicts during rebase with master
 2022-06-02 11:25:03 +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
2d72931fac Tech ENABLE_GLBEGIN_GLEND_SHADERS_ATTRIBUTES - Use vertex attributes and matrices in shaders. 
Shader: gouraud_light - Gizmo Scale hovered grabbers
 2022-03-03 13:30:22 +01:00
enricoturri1966
f4cf9494d0 Tech ENABLE_GLBEGIN_GLEND_SHADERS_ATTRIBUTES - Some refactoring 2022-03-01 12:00:29 +01:00
enricoturri1966
a5ef78b8fd Tech ENABLE_GLBEGIN_GLEND_SHADERS_ATTRIBUTES - Use vertex attributes and matrices in shaders. 
Shader: flat - Gizmo Scale
 2022-03-01 11:01:12 +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
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
81edc7d752 Tech ENABLE_GLBEGIN_GLEND_REMOVAL - Gizmo scale grabber connections 2022-01-20 08:28:50 +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
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
66d43b882e Fixed calls set_uniform(emission_factor, xx) to use floats 2021-08-04 11:58:50 +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
f0354b43c1 Fixed conflicts after merge with master + fixed rendering of hovered gizmo grabbers 2021-05-31 12:54:48 +02:00
enricoturri1966
9605d10caa Unified color definition 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
Lukas Matena
32a353058f Fixed few warnings 2020-05-26 16:06:11 +02:00
enricoturri1966
a0ed240af1 Generate gizmos' tooltip on demand 2020-03-16 16:37:22 +01:00
Enrico Turri
dad09c737c ENABLE_GIZMO_ICONS_NON_ACTIVABLE_STATE set as default 2020-01-17 10:34:32 +01:00
Enrico Turri
57d069bd0a Some rework on layout of imgui dialogs 2019-12-11 15:30:25 +01:00
Enrico Turri
a7b12f97db Gray icons for gizmos in disabled state 2019-12-09 15:21:18 +01:00
Enrico Turri
308f601a99 Removed another bunch of compile warnings 2019-09-04 10:46:51 +02:00
bubnikv
2d7f478dac Finished picking by color with a checksum in the alpha channel 
to guard against unwanted alpha blending and / or multi sampling.
 2019-08-07 14:15:38 +02:00
Enrico Turri
da1fa0b6e3 Refactoring of GLGizmosXX classes to cleanup their interface 2019-07-17 12:06:23 +02:00
Enrico Turri
cc70c8dff9 Tech ENABLE_SVG_ICONS set as default 2019-07-12 10:13:35 +02:00
Enrico Turri
2356fe5a13 Added member BoundingBoxf3 m_bounding_box to GLIndexedVertexArray and removed member BoundingBoxf3 bounding_box from GLVolume 2019-07-01 13:26:06 +02:00
Enrico Turri
f55e494899 Constrained gizmo-scaling -> Fixed grabbers offsets transformation for volumes 2019-05-13 09:02:33 +02:00
Enrico Turri
11c7accabf Constrained gizmo-scaling -> small refactoring 2019-05-10 14:44:10 +02:00